From 01b331592228de4dd0d10f9597bb47c4bc4b5bf0 Mon Sep 17 00:00:00 2001
From: Sven Sandberg <sven@mysql.com>
Date: Wed, 22 Oct 2008 16:00:45 +0200
Subject: [PATCH] BUG#39812: Make statement replication default for 5.1 (to
 match 5.0) Added test case to check the default value of @@binlog_format.

---
 mysql-test/r/binlog_format_basic.result | 3 +++
 mysql-test/t/binlog_format_basic.test   | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/mysql-test/r/binlog_format_basic.result b/mysql-test/r/binlog_format_basic.result
index 3fee9bade7e..72ba35cd753 100644
--- a/mysql-test/r/binlog_format_basic.result
+++ b/mysql-test/r/binlog_format_basic.result
@@ -1,3 +1,6 @@
+SELECT @@GLOBAL.binlog_format;
+@@GLOBAL.binlog_format
+STATEMENT
 '#---------------------BS_STVARS_002_01----------------------#'
 SELECT COUNT(@@GLOBAL.binlog_format);
 COUNT(@@GLOBAL.binlog_format)
diff --git a/mysql-test/t/binlog_format_basic.test b/mysql-test/t/binlog_format_basic.test
index e9dfade8f56..819ad047c1b 100644
--- a/mysql-test/t/binlog_format_basic.test
+++ b/mysql-test/t/binlog_format_basic.test
@@ -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                                       #