diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-11-29 12:49:21 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-11-29 12:49:21 -0500 |
| commit | 724e06e733b562124ea55082a8cad85ebe4da00b (patch) | |
| tree | cee91bbed5cb64073201415627960722a8f91974 /mysql-test/t/mysql.test | |
| parent | b88f4ecf51b8cb00bea17af07b372a2e6eb71c28 (diff) | |
| download | mariadb-git-724e06e733b562124ea55082a8cad85ebe4da00b.tar.gz | |
Fix merges.
mysql-test/r/func_misc.result:
case change in SHOW CREATE keywords.
mysql-test/r/mysql.result:
Revert clobber of charset special chars.
mysql-test/t/mysql.test:
Revert clobber of charset special chars.
Diffstat (limited to 'mysql-test/t/mysql.test')
| -rw-r--r-- | mysql-test/t/mysql.test | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 5f3f1140d4a..e21ecd3a790 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -52,10 +52,10 @@ drop table t1; --exec $MYSQL --default-character-set=cp932 test -e "charset utf8;" # its usage to switch internally in mysql to requested charset ---exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ƒ\'; create table t1 (c_cp932 TEXT CHARACTER SET cp932); insert into t1 values('ƒ\'); select * from t1; drop table t1;" ---exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ƒ\'" ---exec $MYSQL --default-character-set=utf8 test -e "/*charset cp932 */; set character_set_client= cp932; select 'ƒ\'" ---exec $MYSQL --default-character-set=utf8 test -e "/*!\C cp932 */; set character_set_client= cp932; select 'ƒ\'" +--exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ƒ\'; create table t1 (c_cp932 TEXT CHARACTER SET cp932); insert into t1 values('ƒ\'); select * from t1; drop table t1;" +--exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ƒ\'" +--exec $MYSQL --default-character-set=utf8 test -e "/*charset cp932 */; set character_set_client= cp932; select 'ƒ\'" +--exec $MYSQL --default-character-set=utf8 test -e "/*!\C cp932 */; set character_set_client= cp932; select 'ƒ\'" # # Bug#16859 -- NULLs in columns must not truncate data as if a C-language "string". |