diff options
| author | unknown <bar@mysql.com> | 2006-12-29 17:12:59 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-12-29 17:12:59 +0400 |
| commit | 56a0d0762856379c35e57861f20e4600783db61b (patch) | |
| tree | be2302634dbd00d91473e55b408e9a2ad1b7ef11 | |
| parent | 08a3b2027a6768c3ff7356b81e23346a3a816fa5 (diff) | |
| download | mariadb-git-56a0d0762856379c35e57861f20e4600783db61b.tar.gz | |
After merge fix:
Adding "flush log" before running mysqlbinlog.
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_stm_charset.test | 1 | ||||
| -rw-r--r-- | mysql-test/r/rpl_stm_charset.result | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_stm_charset.test b/mysql-test/extra/rpl_tests/rpl_stm_charset.test index 10b4310127f..5657b06e88f 100644 --- a/mysql-test/extra/rpl_tests/rpl_stm_charset.test +++ b/mysql-test/extra/rpl_tests/rpl_stm_charset.test @@ -156,6 +156,7 @@ select hex(c1), hex(c2) from t1; connection master; # Let's have a look at generated SETs. +flush logs; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 drop table t1; diff --git a/mysql-test/r/rpl_stm_charset.result b/mysql-test/r/rpl_stm_charset.result index 7f4a732eb53..f1691608bc7 100644 --- a/mysql-test/r/rpl_stm_charset.result +++ b/mysql-test/r/rpl_stm_charset.result @@ -174,6 +174,7 @@ CDF32C20E7E020F0FBE1E0EBEAF3 CDF32C20E7E020F0FBE1E0EBEAF3 select hex(c1), hex(c2) from t1; hex(c1) hex(c2) CDF32C20E7E020F0FBE1E0EBEAF3 CDF32C20E7E020F0FBE1E0EBEAF3 +flush logs; /*!40019 SET @@session.max_insert_delayed_threads=0*/; /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; DELIMITER /*!*/; |