← Back to branch summary

~percona-dev/percona-server/release-5.5.11-20.2-fix-bug-764138

« back to all changes in this revision

Viewing changes to log_warnings_suppress.patch

  • Committer: Ignacio Nin
  • Date: 2011-03-27 18:30:06 UTC
  • mfrom: (88.2.3 5.5.10)
  • Revision ID: ignacio.nin@percona.com-20110327183006-ij0o2pdyhzaerish
Merge 5.5.10 changes

Merge 5.5.10 changes to release-5.5.9-20.1 in order to create release-5.5.10-20.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
log_warnings_suppress.patch
21
21
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
22
22
--- a/sql/mysqld.cc     2011-01-05 20:31:33.000000000 +0300
23
23
+++ b/sql/mysqld.cc     2011-01-05 20:32:34.000000000 +0300
24
 
@@ -620,6 +620,8 @@
 
24
@@ -621,6 +621,8 @@
25
25
 SHOW_COMP_OPTION have_crypt, have_compress;
26
26
 SHOW_COMP_OPTION have_profiling;
27
27
 
45
45
diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc
46
46
--- a/sql/sql_class.cc  2011-01-05 20:31:32.000000000 +0300
47
47
+++ b/sql/sql_class.cc  2011-01-05 20:32:34.000000000 +0300
48
 
@@ -4578,7 +4578,7 @@
 
48
@@ -4579,7 +4579,7 @@
49
49
                           ER_BINLOG_UNSAFE_STATEMENT,
50
50
                           ER(ER_BINLOG_UNSAFE_STATEMENT),
51
51
                           ER(LEX::binlog_stmt_unsafe_errcode[unsafe_type]));