diff options
9 files changed, 37 insertions, 1 deletions
diff --git a/mysql-test/r/ctype_uca_th.result b/mysql-test/r/ctype_uca_th.result index 6da8840ad75..f41e0b7cc7c 100644 --- a/mysql-test/r/ctype_uca_th.result +++ b/mysql-test/r/ctype_uca_th.result @@ -1,3 +1,8 @@ +SELECT ID, SORTLEN, COLLATION_NAME, CHARACTER_SET_NAME +FROM INFORMATION_SCHEMA.COLLATIONS +WHERE COLLATION_NAME LIKE 'utf8_thai_520_w2'; +ID SORTLEN COLLATION_NAME CHARACTER_SET_NAME +578 4 utf8_thai_520_w2 utf8 SET NAMES utf8; # # Testing strnxfrm diff --git a/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result b/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result index 02805c41cf7..a37a9218aa2 100644 --- a/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result +++ b/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result @@ -84,6 +84,7 @@ utf8_vietnamese_ci utf8 215 # # utf8_general_mysql500_ci utf8 223 # # utf8_croatian_ci utf8 576 # # utf8_myanmar_ci utf8 577 # # +utf8_thai_520_w2 utf8 578 # # ucs2_general_ci ucs2 35 Yes # # ucs2_bin ucs2 90 # # ucs2_unicode_ci ucs2 128 # # diff --git a/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result b/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result index 501bd95cf55..66b6a63121e 100644 --- a/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result +++ b/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result @@ -84,6 +84,7 @@ utf8_vietnamese_ci utf8 215 # # utf8_general_mysql500_ci utf8 223 # # utf8_croatian_ci utf8 576 # # utf8_myanmar_ci utf8 577 # # +utf8_thai_520_w2 utf8 578 # # ucs2_general_ci ucs2 35 Yes # # ucs2_bin ucs2 90 # # ucs2_unicode_ci ucs2 128 # # diff --git a/mysql-test/suite/sys_vars/inc/collation_basic.inc b/mysql-test/suite/sys_vars/inc/collation_basic.inc index be8ae36eeb8..14b9ae4af2a 100644 --- a/mysql-test/suite/sys_vars/inc/collation_basic.inc +++ b/mysql-test/suite/sys_vars/inc/collation_basic.inc @@ -152,6 +152,8 @@ eval SET $collation_variable = utf8_esperanto_ci; eval SELECT $collation_variable; eval SET $collation_variable = utf8_hungarian_ci; eval SELECT $collation_variable; +eval SET $collation_variable = utf8_thai_520_w2; +eval SELECT $collation_variable; eval SET $collation_variable = ucs2_general_ci; eval SELECT $collation_variable; eval SET $collation_variable = ucs2_bin; diff --git a/mysql-test/suite/sys_vars/r/collation_connection_basic.result b/mysql-test/suite/sys_vars/r/collation_connection_basic.result index c8ce41cfe88..5f8d64e8fa3 100644 --- a/mysql-test/suite/sys_vars/r/collation_connection_basic.result +++ b/mysql-test/suite/sys_vars/r/collation_connection_basic.result @@ -374,6 +374,10 @@ SET @@session.collation_connection = utf8_hungarian_ci; SELECT @@session.collation_connection; @@session.collation_connection utf8_hungarian_ci +SET @@session.collation_connection = utf8_thai_520_w2; +SELECT @@session.collation_connection; +@@session.collation_connection +utf8_thai_520_w2 SET @@session.collation_connection = ucs2_general_ci; SELECT @@session.collation_connection; @@session.collation_connection @@ -883,6 +887,10 @@ SET @@global.collation_connection = utf8_hungarian_ci; SELECT @@global.collation_connection; @@global.collation_connection utf8_hungarian_ci +SET @@global.collation_connection = utf8_thai_520_w2; +SELECT @@global.collation_connection; +@@global.collation_connection +utf8_thai_520_w2 SET @@global.collation_connection = ucs2_general_ci; SELECT @@global.collation_connection; @@global.collation_connection diff --git a/mysql-test/suite/sys_vars/r/collation_database_basic.result b/mysql-test/suite/sys_vars/r/collation_database_basic.result index efe9638c5f6..5a218167bdb 100644 --- a/mysql-test/suite/sys_vars/r/collation_database_basic.result +++ b/mysql-test/suite/sys_vars/r/collation_database_basic.result @@ -376,6 +376,10 @@ SET @@session.collation_database = utf8_hungarian_ci; SELECT @@session.collation_database; @@session.collation_database utf8_hungarian_ci +SET @@session.collation_database = utf8_thai_520_w2; +SELECT @@session.collation_database; +@@session.collation_database +utf8_thai_520_w2 SET @@session.collation_database = ucs2_general_ci; SELECT @@session.collation_database; @@session.collation_database @@ -885,6 +889,10 @@ SET @@global.collation_database = utf8_hungarian_ci; SELECT @@global.collation_database; @@global.collation_database utf8_hungarian_ci +SET @@global.collation_database = utf8_thai_520_w2; +SELECT @@global.collation_database; +@@global.collation_database +utf8_thai_520_w2 SET @@global.collation_database = ucs2_general_ci; SELECT @@global.collation_database; @@global.collation_database diff --git a/mysql-test/suite/sys_vars/r/collation_server_basic.result b/mysql-test/suite/sys_vars/r/collation_server_basic.result index e60f3a3041a..352aeb9ce15 100644 --- a/mysql-test/suite/sys_vars/r/collation_server_basic.result +++ b/mysql-test/suite/sys_vars/r/collation_server_basic.result @@ -373,6 +373,10 @@ SET @@session.collation_server = utf8_hungarian_ci; SELECT @@session.collation_server; @@session.collation_server utf8_hungarian_ci +SET @@session.collation_server = utf8_thai_520_w2; +SELECT @@session.collation_server; +@@session.collation_server +utf8_thai_520_w2 SET @@session.collation_server = ucs2_general_ci; SELECT @@session.collation_server; @@session.collation_server @@ -882,6 +886,10 @@ SET @@global.collation_server = utf8_hungarian_ci; SELECT @@global.collation_server; @@global.collation_server utf8_hungarian_ci +SET @@global.collation_server = utf8_thai_520_w2; +SELECT @@global.collation_server; +@@global.collation_server +utf8_thai_520_w2 SET @@global.collation_server = ucs2_general_ci; SELECT @@global.collation_server; @@global.collation_server diff --git a/mysql-test/t/ctype_uca_th.test b/mysql-test/t/ctype_uca_th.test index 19094962380..ac344fc6fad 100644 --- a/mysql-test/t/ctype_uca_th.test +++ b/mysql-test/t/ctype_uca_th.test @@ -1,4 +1,7 @@ +SELECT ID, SORTLEN, COLLATION_NAME, CHARACTER_SET_NAME +FROM INFORMATION_SCHEMA.COLLATIONS +WHERE COLLATION_NAME LIKE 'utf8_thai_520_w2'; SET NAMES utf8; diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index 46d87a040c1..c49dff6f6a9 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -35954,7 +35954,7 @@ struct charset_info_st my_charset_utf8_thai_520_w2= &my_unicase_unicode520,/* caseinfo */ NULL, /* state_map */ NULL, /* ident_map */ - 8, /* strxfrm_multiply */ + 4, /* strxfrm_multiply */ 1, /* caseup_multiply */ 1, /* casedn_multiply */ 1, /* mbminlen */ |