]>
Commit | Line | Data |
---|---|---|
79d7efe9 AM |
1 | --- mysql-4.0.30/sql/log_event.cc~ 2007-02-12 20:38:46.000000000 +0100 |
2 | +++ mysql-4.0.30/sql/log_event.cc 2015-06-24 21:08:16.873356668 +0200 | |
3 | @@ -1386,7 +1386,7 @@ void Load_log_event::print(FILE* file, b | |
4 | { | |
5 | if (i) | |
6 | fputc(',', file); | |
7 | - fprintf(file, field); | |
8 | + fprintf(file, "%s", field); | |
9 | ||
10 | field += field_lens[i] + 1; | |
11 | } | |
12 | --- mysql-4.0.30/innobase/include/ut0dbg.h~ 2007-02-12 20:38:39.000000000 +0100 | |
13 | +++ mysql-4.0.30/innobase/include/ut0dbg.h 2015-06-24 21:13:37.501397909 +0200 | |
14 | @@ -46,9 +46,9 @@ extern ibool panic_shutdown; | |
15 | } while (0) | |
16 | #define ut_error do {\ | |
17 | ut_print_timestamp(stderr);\ | |
18 | - fprintf(stderr, ut_dbg_msg_assert_fail,\ | |
19 | + fprintf(stderr, "%s", ut_dbg_msg_assert_fail,\ | |
20 | os_thread_pf(os_thread_get_curr_id()), __FILE__, (ulint)__LINE__);\ | |
21 | - fprintf(stderr, ut_dbg_msg_trap);\ | |
22 | + fprintf(stderr, "%s", ut_dbg_msg_trap);\ | |
23 | ut_dbg_stop_threads = TRUE;\ | |
24 | if(!panic_shutdown){panic_shutdown = TRUE;\ | |
25 | innobase_shutdown_for_mysql();}\ | |
26 | --- mysql-4.0.30/innobase/include/ut0dbg.h~ 2015-06-24 21:13:55.000000000 +0200 | |
27 | +++ mysql-4.0.30/innobase/include/ut0dbg.h 2015-06-24 21:17:21.340368316 +0200 | |
28 | @@ -74,9 +74,9 @@ extern ibool panic_shutdown; | |
29 | ||
30 | #define ut_error do {\ | |
31 | ut_print_timestamp(stderr);\ | |
32 | - fprintf(stderr, ut_dbg_msg_assert_fail,\ | |
33 | + fprintf(stderr, "%s", ut_dbg_msg_assert_fail,\ | |
34 | os_thread_pf(os_thread_get_curr_id()), __FILE__, (ulint)__LINE__);\ | |
35 | - fprintf(stderr, ut_dbg_msg_trap);\ | |
36 | + fprintf(stderr, "%s", ut_dbg_msg_trap);\ | |
37 | ut_dbg_stop_threads = TRUE;\ | |
38 | if (*(ut_dbg_null_ptr)) ut_dbg_null_ptr = NULL;\ | |
39 | } while (0) |