diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2008-11-12 19:51:47 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2008-11-12 19:51:47 +0200 |
| commit | ca2d1846950b07115a001a37d84ce63ab2acdc6c (patch) | |
| tree | da19273bb9e832fe232c5251aa3f4d9dc29ee7f0 /mysql-test/t/binlog_format_basic.test | |
| parent | 162e550fcf986454cd1a542e98d8adc8fa81fd00 (diff) | |
| parent | 1d521f6c20881997c9162bd11cadcbc77d20520b (diff) | |
| download | mariadb-git-ca2d1846950b07115a001a37d84ce63ab2acdc6c.tar.gz | |
merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.
mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.
Diffstat (limited to 'mysql-test/t/binlog_format_basic.test')
| -rw-r--r-- | mysql-test/t/binlog_format_basic.test | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/t/binlog_format_basic.test b/mysql-test/t/binlog_format_basic.test index d7a4fb190ab..cd2b772fcb1 100644 --- a/mysql-test/t/binlog_format_basic.test +++ b/mysql-test/t/binlog_format_basic.test @@ -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 # |