database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/data0/mysqldev/my/mysql-4.1.20-release

Browse Source 
into  mysql.com:/data0/mysqldev/my/mysql-4.1


sql/sql_lex.cc:
  Auto merged
This commit is contained in:
unknown
2006-05-26 18:31:25 +02:00
parent c12d80151a 80e7938736
commit a3040aa74a
4 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/ctype_sjis.result
View File

@ -172,6 +172,6 @@ c2h
ab_def
drop table t1;
SET NAMES sjis;
SELECT HEX('<27><><EFBFBD><EFBFBD><EFBFBD>@\<EFBFBD>\') FROM DUAL;
HEX('<27><><EFBFBD><EFBFBD><EFBFBD>@<40>_<EFBFBD>\')
SELECT HEX('<27><><EFBFBD><EFBFBD><EFBFBD>@<40>\') FROM DUAL;
HEX('<27><><EFBFBD><EFBFBD><EFBFBD>@<40>\')
8DB2939181408C5C

2
mysql-test/t/ctype_sjis.test
View File

@ -78,6 +78,6 @@ SET collation_connection='sjis_bin';
--character_set sjis
SET NAMES sjis;
SELECT HEX('<27><><EFBFBD><EFBFBD><EFBFBD>@\<EFBFBD>\') FROM DUAL;
SELECT HEX('<27><><EFBFBD><EFBFBD><EFBFBD>@<40>\') FROM DUAL;
# End of 4.1 tests