cosmetics: make unix socket mouse selectable in terminal

[packages/mysql.git] / log_warnings_suppress.patch

diff --git a/log_warnings_suppress.patch b/log_warnings_suppress.patch
index cf41b7fe09718990eefccee20bb351546eb9e048..9d03cdcc5e48127bbd7a49054c7bbc1dec8156d8 100644 (file)
--- a/log_warnings_suppress.patch
+++ b/log_warnings_suppress.patch
@@ -19,7 +19,7 @@
 +2011-02-21 rename patch log_warning_silence.patch to log_warnings_suppress.patch. Also rename variable "log_warning_silence" to "log_warning_suppress".
 --- a/sql/mysqld.cc
 +++ b/sql/mysqld.cc
-@@ -628,6 +628,8 @@
+@@ -632,6 +632,8 @@
  SHOW_COMP_OPTION have_crypt, have_compress;
  SHOW_COMP_OPTION have_profiling;
  
@@ -30,7 +30,7 @@
  pthread_key(MEM_ROOT**,THR_MALLOC);
 --- a/sql/mysqld.h
 +++ b/sql/mysqld.h
-@@ -228,6 +228,8 @@
+@@ -229,6 +229,8 @@
  extern TYPELIB thread_handling_typelib;
  extern my_decimal decimal_zero;
  
@@ -41,7 +41,7 @@
    using my_pthread_setspecific_ptr()/my_thread_getspecific_ptr().
 --- a/sql/sql_class.cc
 +++ b/sql/sql_class.cc
-@@ -4854,7 +4854,7 @@
+@@ -5029,7 +5029,7 @@
                            ER_BINLOG_UNSAFE_STATEMENT,
                            ER(ER_BINLOG_UNSAFE_STATEMENT),
                            ER(LEX::binlog_stmt_unsafe_errcode[unsafe_type]));
@@ -52,7 +52,7 @@
          sprintf(buf, ER(ER_BINLOG_UNSAFE_STATEMENT),
 --- a/sql/sql_class.h
 +++ b/sql/sql_class.h
-@@ -90,6 +90,7 @@
+@@ -87,6 +87,7 @@
    SLOG_F_TMP_TABLE, SLOG_F_TMP_DISK, SLOG_F_FILESORT,
    SLOG_F_FILESORT_DISK
  };
@@ -62,7 +62,7 @@
                              SLAVE_EXEC_MODE_LAST_BIT};
 --- a/sql/sys_vars.cc
 +++ b/sql/sys_vars.cc
-@@ -1470,6 +1470,15 @@
+@@ -1572,6 +1572,15 @@
         READ_ONLY GLOBAL_VAR(mysqld_port), CMD_LINE(REQUIRED_ARG, 'P'),
         VALID_RANGE(0, UINT_MAX32), DEFAULT(0), BLOCK_SIZE(1));
  
@@ -166,3 +166,23 @@
 +  print "Occurrences: $count\n";
 +  close(FILE);
 +EOF
+--- a/mysql-test/r/mysqld--help-notwin.result
++++ b/mysql-test/r/mysqld--help-notwin.result
+@@ -281,6 +281,9 @@
+  --log-tc-size=#     Size of transaction coordinator log.
+  -W, --log-warnings[=#] 
+  Log some not critical warnings to the log file
++ --log-warnings-suppress=name 
++ disable logging of enumerated warnings: 1592: unsafe
++ statements for binary logging; possible values : [1592]
+  --long-query-time=# Log all queries that have taken more than long_query_time
+  seconds to execute to file. The argument will be treated
+  as a decimal value with microsecond precision
+@@ -865,6 +868,7 @@
+ log-tc tc.log
+ log-tc-size 24576
+ log-warnings 1
++log-warnings-suppress 
+ long-query-time 10
+ low-priority-updates FALSE
+ lower-case-table-names 1