bzr push into mysql-6.0 branch (sven:2874 to 2876) Bug#39812

[Sven Sandberg]

 2876 Sven Sandberg	2008-10-22 [merge]
      Merged test case for BUG#39812 from 5.1-5.1.29-rc to 6.0-5.1.29-rc, and
      changed the expected default binlog format in the result file to MIXED.
modified:
  mysql-test/r/binlog_format_basic.result
  mysql-test/t/binlog_format_basic.test

 2875 Sven Sandberg	2008-10-22
      BUG#39812: Make statement replication default for 5.1 (to match 5.0)
      Reverted default binlog format in 6.0 to MIXED. It should default to
      STATEMENT only in 5.1.
modified:
  sql/mysqld.cc

 2874 Georgi Kodinov	2008-10-15
      fixed a failing test case because of the change in the default replication
      format to STATEMENT.
modified:
  mysql-test/suite/falcon/r/rpl_falcon_bug_37221.result
  mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test

=== 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-13 14:10:00 +0000
+++ b/sql/mysqld.cc	2008-10-22 13:56:41 +0000
@@ -4026,12 +4026,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);