Skip to content

M
MariaDB
Commit ab52a9b0 authored by Nuno Carvalho's avatar Nuno Carvalho
Browse files
Options

Automerge from mysql-5.1 to mysql-5.5.

parents 5dcdccd1 2abdbe3a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
mysql-test/extra/rpl_tests/rpl_extra_col_master.test
View file @ ab52a9b0
...@@ -59,6 +59,8 @@ ...@@ -59,6 +59,8 @@
#VARCHAR(M) #VARCHAR(M)
# #
--let $_saved_conn= $CURRENT_CONNECTION
let $binformat = `SHOW VARIABLES LIKE '%binlog_format%'`; let $binformat = `SHOW VARIABLES LIKE '%binlog_format%'`;
--echo --echo
--echo *********************************************************** --echo ***********************************************************
...@@ -1017,3 +1019,5 @@ SELECT c1,hex(c4),c5 FROM t5 ORDER BY c1; ...@@ -1017,3 +1019,5 @@ SELECT c1,hex(c4),c5 FROM t5 ORDER BY c1;
connection master; connection master;
DROP TABLE t5; DROP TABLE t5;
sync_slave_with_master; sync_slave_with_master;
--connection $_saved_conn
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7