diff options
| author | unknown <jpipes@shakedown.(none)> | 2006-11-27 14:46:48 -0500 |
|---|---|---|
| committer | unknown <jpipes@shakedown.(none)> | 2006-11-27 14:46:48 -0500 |
| commit | b022aef7cb03284d7a66e9da78e6259f53281ab9 (patch) | |
| tree | 8675dc7902c72d482e2d0e3bfa01a9335bcbb6f9 /mysql-test/t/mysql.test | |
| parent | 77be0c92a8725f277a42e3b875b9a82288f1b9f5 (diff) | |
| parent | 89220d074773ce768c044ba6042c9bebe7935acb (diff) | |
| download | mariadb-git-b022aef7cb03284d7a66e9da78e6259f53281ab9.tar.gz | |
Merge shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
into shakedown.(none):/home/jpipes/dev/mysql-5.1-new-maint2
BitKeeper/etc/ignore:
auto-union
client/mysql.cc:
Auto merged
mysql-test/r/func_misc.result:
Auto merged
mysql-test/r/mysql.result:
Manually merged
mysql-test/t/mysql.test:
Manually merged
sql/item_func.h:
Manually merged
Diffstat (limited to 'mysql-test/t/mysql.test')
| -rw-r--r-- | mysql-test/t/mysql.test | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index c06e52e2d78..5f3f1140d4a 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,23 @@ 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 |