diff options
| author | unknown <serg@mysql.com> | 2006-05-24 14:37:18 +0200 |
|---|---|---|
| committer | unknown <serg@mysql.com> | 2006-05-24 14:37:18 +0200 |
| commit | 723eed2401533b5ef2f0ba5cea5c79c2a958b944 (patch) | |
| tree | 97a5037a420d7ee0a901d89aed222ad6327661ae /mysql-test | |
| parent | 4cf24a5160129c6f8d292417e81539f2faf6b2c8 (diff) | |
| parent | 6355f74e4d35d457771fe45f8f5331a3174226a4 (diff) | |
| download | mariadb-git-723eed2401533b5ef2f0ba5cea5c79c2a958b944.tar.gz | |
Merge mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
into mysql.com:/data0/mysqldev/my/mysql-5.1-release
extra/comp_err.c:
Auto merged
mysql-test/r/ctype_sjis.result:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
configure.in:
merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ctype_sjis.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/ctype_sjis.test | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/ctype_sjis.result b/mysql-test/r/ctype_sjis.result index eaea2e7479a..1c9d540d574 100644 --- a/mysql-test/r/ctype_sjis.result +++ b/mysql-test/r/ctype_sjis.result @@ -172,6 +172,6 @@ c2h ab_def drop table t1; SET NAMES sjis; -SELECT HEX('@\\') FROM DUAL; -HEX('@_\') +SELECT HEX('@\') FROM DUAL; +HEX('@\') 8DB2939181408C5C diff --git a/mysql-test/t/ctype_sjis.test b/mysql-test/t/ctype_sjis.test index 1d807b5e9a8..01e0b334554 100644 --- a/mysql-test/t/ctype_sjis.test +++ b/mysql-test/t/ctype_sjis.test @@ -78,6 +78,6 @@ SET collation_connection='sjis_bin'; --character_set sjis SET NAMES sjis; -SELECT HEX('@\\') FROM DUAL; +SELECT HEX('@\') FROM DUAL; # End of 4.1 tests |