diff options
| author | jpipes@shakedown.(none) <> | 2006-11-27 14:58:57 -0500 |
|---|---|---|
| committer | jpipes@shakedown.(none) <> | 2006-11-27 14:58:57 -0500 |
| commit | 03a5dcd7ce51e12de9a1e2224ad0e4f3ea4d5f20 (patch) | |
| tree | 8000ea4cede29d098cc2e485d08d1f337ec4fa9f /mysql-test/t/mysql.test | |
| parent | 699898c82c34a273721e54b1eaac24e75acd2e2c (diff) | |
| parent | b57051381a4dbd7c7f933b28582c496047e2f139 (diff) | |
| download | mariadb-git-03a5dcd7ce51e12de9a1e2224ad0e4f3ea4d5f20.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
Diffstat (limited to 'mysql-test/t/mysql.test')
| -rw-r--r-- | mysql-test/t/mysql.test | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index c06e52e2d78..5fc0692c70e 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". @@ -223,4 +223,22 @@ drop table t17583; --error 1 --exec $MYSQL test -e "\r test cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" 2>&1 +# +# Bug #21412: mysql cmdline client allows backslash(es) +# as delimiter but can't recognize them +# + +# This should work just fine... +--exec echo "DELIMITER /" > $MYSQLTEST_VARDIR/tmp/bug21412.sql +--exec echo "SELECT 1/" >> $MYSQLTEST_VARDIR/tmp/bug21412.sql +--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug21412.sql 2>&1 + +# This should give an error... +--exec echo "DELIMITER \\" > $MYSQLTEST_VARDIR/tmp/bug21412.sql +--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug21412.sql 2>&1 + +# As should this... +--exec echo "DELIMITER \\\\" > $MYSQLTEST_VARDIR/tmp/bug21412.sql +--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug21412.sql 2>&1 + --echo End of 5.0 tests |