summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqlbinlog.result
diff options
context:
space:
mode:
authorSven Sandberg <sven.sandberg@oracle.com>2011-03-25 15:35:45 +0100
committerSven Sandberg <sven.sandberg@oracle.com>2011-03-25 15:35:45 +0100
commit0907c91314fe98833d12e5a44882505c6f4939ad (patch)
treed213422c9847924f7fb0aefc823ccf3c9fcc6566 /mysql-test/r/mysqlbinlog.result
parent494174556d8172494ba178b4dd667170eede6997 (diff)
parentf1b638d33cdf95b70fa925cce304864c96fdf7ee (diff)
downloadmariadb-git-0907c91314fe98833d12e5a44882505c6f4939ad.tar.gz
Merged BUG#11766427, BUG#59539 from 5.1 to 5.5.
No conflicts.
Diffstat (limited to 'mysql-test/r/mysqlbinlog.result')
-rw-r--r--mysql-test/r/mysqlbinlog.result12
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result
index 0b9f6db05b8..5a47b6700c0 100644
--- a/mysql-test/r/mysqlbinlog.result
+++ b/mysql-test/r/mysqlbinlog.result
@@ -903,3 +903,15 @@ master-bin.000002 # Query # # CREATE DATABASE test1
master-bin.000002 # Query # # use `test1`; CREATE TABLE t1(id int)
master-bin.000002 # Query # # use `test1`; DROP TABLE `t1` /* generated by server */
master-bin.000002 # Query # # DROP DATABASE test1
+RESET MASTER;
+USE test;
+CREATE TABLE t1 (a INT);
+SET GLOBAL SERVER_ID = 2;
+DROP TABLE t1;
+FLUSH LOGS;
+SHOW TABLES IN test;
+Tables_in_test
+t1
+SHOW TABLES IN test;
+Tables_in_test
+SET GLOBAL SERVER_ID = 1;