bzr commit into mysql-6.0 branch (sven:2875) Bug#39812

[Sven Sandberg]

#At file:///home/sven/bzr/b39812-statement_default/6.0-5.1.29-rc/

 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

per-file messages:
  sql/mysqld.cc
    Reverted default binlog format in 6.0 to MIXED.
=== 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);