database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Automerge from mysql-5.1 to mysql-5.5.

Browse Source
This commit is contained in:
Nuno Carvalho
2012-01-16 10:02:29 +00:00
parent b9692a96be 9b0fdd650f
commit 09319cde93
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/extra/rpl_tests/rpl_extra_col_master.test
View File

@@ -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;
connection master; connection master;
DROP TABLE t5; DROP TABLE t5;
sync_slave_with_master; sync_slave_with_master;
--connection $_saved_conn