summaryrefslogtreecommitdiff
path: root/mysql-test/extra
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-04-05 12:01:52 +0200
committerSergei Golubchik <sergii@pisem.net>2012-04-05 12:01:52 +0200
commitcbd52a42ee9b93675e5cdaa043df878c423b6571 (patch)
treef7159b893a8dc1d5efd540ef2b3b21227aaf2b6d /mysql-test/extra
parent70a3cafe4d1aa28e1b6c36d9001bc0d487262976 (diff)
parentdea3544b2d9bd68961b8e84c3772deda435f15b5 (diff)
downloadmariadb-git-cbd52a42ee9b93675e5cdaa043df878c423b6571.tar.gz
merge
Diffstat (limited to 'mysql-test/extra')
-rw-r--r--mysql-test/extra/rpl_tests/rpl_extra_col_master.test4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test
index 1c103512318..07a0f2c9557 100644
--- a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test
+++ b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test
@@ -59,6 +59,8 @@
#VARCHAR(M)
#
+--let $_saved_conn= $CURRENT_CONNECTION
+
let $binformat = `SHOW VARIABLES LIKE '%binlog_format%'`;
--echo
--echo ***********************************************************
@@ -1018,3 +1020,5 @@ SELECT c1,hex(c4),c5 FROM t5 ORDER BY c1;
connection master;
DROP TABLE t5;
sync_slave_with_master;
+
+--connection $_saved_conn