projects / packages / mysql.git / blame
| Commit | Line | Data |
|---|---|---|
| a9ee80b9 ER |
1 | # name : log_warnings_suppress.patch |
| 2 | # introduced : 11 or before | |
| 3 | # maintainer : Oleg | |
| 4 | # | |
| 5 | #!!! notice !!! | |
| 6 | # Any small change to this file in the main branch | |
| 7 | # should be done or reviewed by the maintainer! | |
| db82db79 AM |
8 | --- /dev/null |
| 9 | +++ b/patch_info/log_warnings_suppress.patch | |
| a9ee80b9 ER |
10 | @@ -0,0 +1,9 @@ |
| 11 | +File=log_warnings_suppress.patch | |
| 12 | +Name=Disable log warnings for enumerated warnings (old name:suppress_log_warning_1592.patch) | |
| 13 | +Version=1.0 | |
| 14 | +Author=Percona <info@percona.com> | |
| 15 | +License=GPL | |
| 16 | +Comment= | |
| 17 | +Changelog | |
| 18 | +2011-01-05 rename patch suppress_log_warning_1592.patch to log_warnings_silence.patch. Also remove boolean system variable "suppress_log_warning_1592" and add set varbile "log_warnings_silence" (possible values: 1592) | |
| 19 | +2011-02-21 rename patch log_warning_silence.patch to log_warnings_suppress.patch. Also rename variable "log_warning_silence" to "log_warning_suppress". | |
| db82db79 AM |
20 | --- a/sql/mysqld.cc |
| 21 | +++ b/sql/mysqld.cc | |
| 22 | @@ -628,6 +628,8 @@ | |
| a9ee80b9 ER |
23 | SHOW_COMP_OPTION have_crypt, have_compress; |
| 24 | SHOW_COMP_OPTION have_profiling; | |
| 25 | ||
| 26 | +ulonglong opt_log_warnings_suppress= 0; | |
| 27 | + | |
| 28 | /* Thread specific variables */ | |
| 29 | ||
| 30 | pthread_key(MEM_ROOT**,THR_MALLOC); | |
| db82db79 AM |
31 | --- a/sql/mysqld.h |
| 32 | +++ b/sql/mysqld.h | |
| adf0fb13 | 33 | @@ -228,6 +228,8 @@ |
| a9ee80b9 ER |
34 | extern TYPELIB thread_handling_typelib; |
| 35 | extern my_decimal decimal_zero; | |
| 36 | ||
| 37 | +extern ulonglong opt_log_warnings_suppress; | |
| 38 | + | |
| db82db79 AM |
39 | /* |
| 40 | THR_MALLOC is a key which will be used to set/get MEM_ROOT** for a thread, | |
| 41 | using my_pthread_setspecific_ptr()/my_thread_getspecific_ptr(). | |
| 42 | --- a/sql/sql_class.cc | |
| 43 | +++ b/sql/sql_class.cc | |
| 44 | @@ -4854,7 +4854,7 @@ | |
| a9ee80b9 ER |
45 | ER_BINLOG_UNSAFE_STATEMENT, |
| 46 | ER(ER_BINLOG_UNSAFE_STATEMENT), | |
| 47 | ER(LEX::binlog_stmt_unsafe_errcode[unsafe_type])); | |
| 48 | - if (global_system_variables.log_warnings) | |
| 49 | + if (global_system_variables.log_warnings && ((opt_log_warnings_suppress & (ULL(1) << log_warnings_suppress_1592)) == 0)) | |
| 50 | { | |
| 51 | char buf[MYSQL_ERRMSG_SIZE * 2]; | |
| 52 | sprintf(buf, ER(ER_BINLOG_UNSAFE_STATEMENT), | |
| db82db79 AM |
53 | --- a/sql/sql_class.h |
| 54 | +++ b/sql/sql_class.h | |
| a9ee80b9 ER |
55 | @@ -90,6 +90,7 @@ |
| 56 | SLOG_F_TMP_TABLE, SLOG_F_TMP_DISK, SLOG_F_FILESORT, | |
| 57 | SLOG_F_FILESORT_DISK | |
| 58 | }; | |
| 59 | +enum enum_log_warnings_suppress { log_warnings_suppress_1592 }; | |
| 60 | enum enum_slave_exec_mode { SLAVE_EXEC_MODE_STRICT, | |
| 61 | SLAVE_EXEC_MODE_IDEMPOTENT, | |
| 62 | SLAVE_EXEC_MODE_LAST_BIT}; | |
| db82db79 AM |
63 | --- a/sql/sys_vars.cc |
| 64 | +++ b/sql/sys_vars.cc | |
| adf0fb13 | 65 | @@ -1470,6 +1470,15 @@ |
| a9ee80b9 ER |
66 | READ_ONLY GLOBAL_VAR(mysqld_port), CMD_LINE(REQUIRED_ARG, 'P'), |
| 67 | VALID_RANGE(0, UINT_MAX32), DEFAULT(0), BLOCK_SIZE(1)); | |
| 68 | ||
| 69 | +const char *log_warnings_suppress_name[]= { "1592" }; | |
| 70 | +static Sys_var_set Sys_log_warnings_suppress( | |
| 71 | + "log_warnings_suppress", | |
| 72 | + "disable logging of enumerated warnings: " | |
| 73 | + "1592: unsafe statements for binary logging; " | |
| 74 | + "possible values : [1592]", | |
| 75 | + GLOBAL_VAR(opt_log_warnings_suppress), CMD_LINE(REQUIRED_ARG), | |
| 76 | + log_warnings_suppress_name, DEFAULT(0)); | |
| 77 | + | |
| 78 | static Sys_var_ulong Sys_preload_buff_size( | |
| 79 | "preload_buffer_size", | |
| 80 | "The size of the buffer that is allocated when preloading indexes", |