summaryrefslogtreecommitdiff
path: root/mysql-test/suite/binlog/r/binlog_stm_row.result
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-01-30 15:44:49 +0200
committerGeorgi Kodinov <joro@sun.com>2009-01-30 15:44:49 +0200
commit87eb2cb938382b545158987a1cc6bc170588db3a (patch)
treea6a00e2376ec5327aa29d5a5b2441a06f8d146d4 /mysql-test/suite/binlog/r/binlog_stm_row.result
parent093a6dd90e12ca41e7e415f57f5a91181bf1959e (diff)
parentf7a24d72dc7a86341da4634f6d1a71f1ea77000b (diff)
downloadmariadb-git-87eb2cb938382b545158987a1cc6bc170588db3a.tar.gz
merged 5.1-main -> 5.1-bugteam
Diffstat (limited to 'mysql-test/suite/binlog/r/binlog_stm_row.result')
-rw-r--r--mysql-test/suite/binlog/r/binlog_stm_row.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_stm_row.result b/mysql-test/suite/binlog/r/binlog_stm_row.result
index 97ec38cfb3e..d1cc55f03b3 100644
--- a/mysql-test/suite/binlog/r/binlog_stm_row.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_row.result
@@ -1,5 +1,7 @@
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
+set @saved_global_binlog_format = @@global.binlog_format;
+set @saved_local_binlog_format = @@session.binlog_format;
SET GLOBAL BINLOG_FORMAT = STATEMENT;
SET SESSION BINLOG_FORMAT = STATEMENT;
CREATE TABLE t1 (a INT);
@@ -69,3 +71,5 @@ master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Query # # use `test`; COMMIT
DROP TABLE t1;
DROP TABLE t2;
+SET GLOBAL BINLOG_FORMAT = @saved_global_binlog_format;
+SET SESSION BINLOG_FORMAT = @saved_local_binlog_format;