From d64e738396f30c28c236dbac6a2f0f8a6aa14a64 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 4 Jul 2007 14:21:29 +0500 Subject: [PATCH] Bug#29484 ctype_big5 fails on 'double whopper' in mysql-5.1-new-rpl Problem: "mysqldump" doesn exists when running "mysql-test-run --embedded-server". Fix: changing test to use "SELECT INTO OUTFILE" instead of "mysqldump -T". mysql-test/r/ctype_big5.result: Fixing tests to use "SELECT INTO OUTFILE" instead of "mysqldump -T" mysql-test/t/ctype_big5.test: Fixing tests to use "SELECT INTO OUTFILE" instead of "mysqldump -T" --- mysql-test/r/ctype_big5.result | 6 ++++-- mysql-test/t/ctype_big5.test | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mysql-test/r/ctype_big5.result b/mysql-test/r/ctype_big5.result index 3f1a87838cf..6d318a445f5 100644 --- a/mysql-test/r/ctype_big5.result +++ b/mysql-test/r/ctype_big5.result @@ -193,11 +193,13 @@ select hex(convert(_big5 0xC84041 using ucs2)); hex(convert(_big5 0xC84041 using ucs2)) 003F0041 End of 4.1 tests +set names big5; create table t1 (a blob); insert into t1 values (0xEE00); +select * into outfile 'test/t1.txt' from t1; delete from t1; -select hex(load_file('test/t1.txt')); -hex(load_file('test/t1.txt')) +select hex(load_file('MYSQLTEST_VARDIR/master-data/test/t1.txt'));; +hex(load_file('MYSQLTEST_VARDIR/master-data/test/t1.txt')) 5CEE5C300A load data infile 't1.txt' into table t1; select hex(a) from t1; diff --git a/mysql-test/t/ctype_big5.test b/mysql-test/t/ctype_big5.test index 8e17a27c550..5f3357e0406 100644 --- a/mysql-test/t/ctype_big5.test +++ b/mysql-test/t/ctype_big5.test @@ -68,15 +68,16 @@ select hex(convert(_big5 0xC84041 using ucs2)); # # Bug#26711 "binary content 0x00 sometimes becomes 0x5C 0x00 after dump/load" # +set names big5; create table t1 (a blob); insert into t1 values (0xEE00); ---exec $MYSQL_DUMP --default-character-set=big5 -T $MYSQLTEST_VARDIR/master-data/test test t1 +select * into outfile 'test/t1.txt' from t1; delete from t1; -select hex(load_file('test/t1.txt')); +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--eval select hex(load_file('$MYSQLTEST_VARDIR/master-data/test/t1.txt')); load data infile 't1.txt' into table t1; select hex(a) from t1; --exec rm $MYSQLTEST_VARDIR/master-data/test/t1.txt ---exec rm $MYSQLTEST_VARDIR/master-data/test/t1.sql drop table t1; --echo End of 5.0 tests