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

Merge mysqldev@production.mysql.com:my/mysql-5.1-release

Browse Source 
into mysql.com:/home/hf/work/mysql-5.1-release
This commit is contained in:
unknown
2006-06-02 16:23:49 +05:00
parent bd1d3ebbd6 81467f2b23
commit e44b6be9cb
6 changed files with 24 additions and 38 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/r/innodb.result
View File

@ -1822,7 +1822,7 @@ Variable_name Value
innodb_sync_spin_loops 20
show variables like "innodb_thread_concurrency";
Variable_name Value
innodb_thread_concurrency 20
innodb_thread_concurrency 8
set global innodb_thread_concurrency=1001;
show variables like "innodb_thread_concurrency";
Variable_name Value

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