diff options
| author | Nuno Carvalho <nuno.carvalho@oracle.com> | 2012-01-16 10:02:29 +0000 |
|---|---|---|
| committer | Nuno Carvalho <nuno.carvalho@oracle.com> | 2012-01-16 10:02:29 +0000 |
| commit | 790150d62f079e02a9fe26af5e9053fceea79bc2 (patch) | |
| tree | 9ce2fbdbd39604f9ef44b01cd6a23d8c88e57148 /mysql-test/extra | |
| parent | c6664c446c1fa379629c82c60aa380fac4a7a959 (diff) | |
| parent | bffc7ec82e7b161dfdcc4b361d4ac3b654d478a8 (diff) | |
| download | mariadb-git-790150d62f079e02a9fe26af5e9053fceea79bc2.tar.gz | |
Automerge from mysql-5.1 to mysql-5.5.
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_extra_col_master.test | 4 |
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 513bc949c5d..235eb858d34 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 *********************************************************** @@ -1017,3 +1019,5 @@ SELECT c1,hex(c4),c5 FROM t5 ORDER BY c1; connection master; DROP TABLE t5; sync_slave_with_master; + +--connection $_saved_conn |