bzr commit into mysql-5.1 branch (sven:2683) Bug#39812

[Sven Sandberg]

#At file:///home/sven/bzr/debug-max/5.1-rpl/

 2683 Sven Sandberg	2008-10-22
      BUG#39812: Make statement replication default for 5.1 (to match 5.0)
      Adding test case.
modified:
  mysql-test/r/binlog_format_basic.result
  mysql-test/t/binlog_format_basic.test

per-file messages:
  mysql-test/t/binlog_format_basic.test
    Verify that the default binlog format is STATEMENT in 5.1 and MIXED in 6.0.
=== modified file 'mysql-test/r/binlog_format_basic.result'
--- a/mysql-test/r/binlog_format_basic.result	2008-09-10 10:50:39 +0000
+++ b/mysql-test/r/binlog_format_basic.result	2008-10-22 10:48:18 +0000
@@ -1,3 +1,6 @@
+SELECT @@GLOBAL.binlog_format;
+@@GLOBAL.binlog_format
+MIXED
 '#---------------------BS_STVARS_002_01----------------------#'
 SET @start_value= @@global.binlog_format;
 SELECT COUNT(@@GLOBAL.binlog_format);

=== modified file 'mysql-test/t/binlog_format_basic.test'
--- a/mysql-test/t/binlog_format_basic.test	2008-09-10 10:50:39 +0000
+++ b/mysql-test/t/binlog_format_basic.test	2008-10-22 10:48:18 +0000
@@ -20,6 +20,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                                       #