diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-09-30 08:35:31 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-09-30 08:35:31 +0200 |
| commit | 0f502cc5d9d21f06fdc87d3d9a60151a4bc603df (patch) | |
| tree | 7e0cf0180d7a86007916675d959c51cc218728cc /mysql-test/t/mysqlbinlog-cp932.test | |
| parent | d8aa3dbd343841b61110844e38c1114e14c230ec (diff) | |
| download | mariadb-git-0f502cc5d9d21f06fdc87d3d9a60151a4bc603df.tar.gz | |
Apply patch from Bug#46010.
This is needed to fix failures seen in Buildbot (main.ctype_gbk_binlog).
Problem is that some tests did not RESET MASTER, causing them to pick up random
binlog files depending on prior tests.
Diffstat (limited to 'mysql-test/t/mysqlbinlog-cp932.test')
| -rw-r--r-- | mysql-test/t/mysqlbinlog-cp932.test | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/t/mysqlbinlog-cp932.test b/mysql-test/t/mysqlbinlog-cp932.test index a7055bfc8ca..2a210bea0e0 100644 --- a/mysql-test/t/mysqlbinlog-cp932.test +++ b/mysql-test/t/mysqlbinlog-cp932.test @@ -5,8 +5,9 @@ -- source include/have_cp932.inc -- source include/have_log_bin.inc +RESET MASTER; + # Bug#16217 (mysql client did not know how not switch its internal charset) -flush logs; create table t3 (f text character set utf8); create table t4 (f text character set cp932); --exec $MYSQL --default-character-set=utf8 test -e "insert into t3 values(_utf8'ソ')" @@ -14,7 +15,7 @@ create table t4 (f text character set cp932); flush logs; rename table t3 to t03, t4 to t04; let $MYSQLD_DATADIR= `select @@datadir`; ---exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000002 | $MYSQL --default-character-set=utf8 +--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001 | $MYSQL --default-character-set=utf8 # original and recovered data must be equal select HEX(f) from t03; select HEX(f) from t3; |