bzr commit into mysql-6.0 branch (alik:2739) Bug#39812

[Alexander Nozdrin]

#At file:///mnt/raid/alik/MySQL/bzr/6.0.merge/

 2739 Alexander Nozdrin	2008-10-23 [merge]
      Merged from 6.0-5.1.29-rc up to revno:2876 -- Sven's fix & test case for
Bug#39812
modified:
  mysql-test/r/binlog_format_basic.result
  mysql-test/t/binlog_format_basic.test
  sql/mysqld.cc

=== modified file 'mysql-test/r/binlog_format_basic.result'
--- a/mysql-test/r/binlog_format_basic.result	2008-04-10 13:14:28 +0000
+++ b/mysql-test/r/binlog_format_basic.result	2008-10-22 14:08:10 +0000
@@ -1,3 +1,6 @@
+SELECT @@GLOBAL.binlog_format;
+@@GLOBAL.binlog_format
+MIXED
 '#---------------------BS_STVARS_002_01----------------------#'
 SELECT COUNT(@@GLOBAL.binlog_format);
 COUNT(@@GLOBAL.binlog_format)

=== modified file 'mysql-test/t/binlog_format_basic.test'
--- a/mysql-test/t/binlog_format_basic.test	2008-04-10 13:14:28 +0000
+++ b/mysql-test/t/binlog_format_basic.test	2008-10-22 14:00:45 +0000
@@ -22,6 +22,13 @@
 #                                                                             #
 ###############################################################################
 
+###################################################################
+# BUG#39812: Make statement replication default for 5.1 (to match 5.0)
+# We just verify that the default binlog_format is STATEMENT in 5.1.
+# In 6.0, it should be MIXED.
+###################################################################
+SELECT @@GLOBAL.binlog_format;
+
 --echo '#---------------------BS_STVARS_002_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-10-20 12:25:30 +0000
+++ b/sql/mysqld.cc	2008-10-23 11:57:08 +0000
@@ -4027,12 +4027,12 @@ with --log-bin instead.");
     }
     else
     {
-      global_system_variables.binlog_format= BINLOG_FORMAT_STMT;
+      global_system_variables.binlog_format= BINLOG_FORMAT_MIXED;
     }
   }
   else
     if (opt_binlog_format_id == BINLOG_FORMAT_UNSPEC)
-      global_system_variables.binlog_format= BINLOG_FORMAT_STMT;
+      global_system_variables.binlog_format= BINLOG_FORMAT_MIXED;
     else
     {
       DBUG_ASSERT(global_system_variables.binlog_format != BINLOG_FORMAT_UNSPEC);