Skip to content

Commit 29db3b5

Browse files
author
Alexander Barkov
committed
Clean-ups for MDEV-10132 utf8_thai_520_w2 collation:
- Changing strnxfrm_multiply from 8 to 4, as agreed with Pruet Boonma - Adjusting tests
1 parent d930d07 commit 29db3b5

9 files changed

+37
-1
lines changed

‎mysql-test/r/ctype_uca_th.result

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
SELECT ID, SORTLEN, COLLATION_NAME, CHARACTER_SET_NAME
2+
FROM INFORMATION_SCHEMA.COLLATIONS
3+
WHERE COLLATION_NAME LIKE 'utf8_thai_520_w2';
4+
ID SORTLEN COLLATION_NAME CHARACTER_SET_NAME
5+
578 4 utf8_thai_520_w2 utf8
16
SET NAMES utf8;
27
#
38
# Testing strnxfrm

‎mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ utf8_vietnamese_ci utf8 215 # #
8484
utf8_general_mysql500_ci utf8 223 # #
8585
utf8_croatian_ci utf8 576 # #
8686
utf8_myanmar_ci utf8 577 # #
87+
utf8_thai_520_w2 utf8 578 # #
8788
ucs2_general_ci ucs2 35 Yes # #
8889
ucs2_bin ucs2 90 # #
8990
ucs2_unicode_ci ucs2 128 # #

‎mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ utf8_vietnamese_ci utf8 215 # #
8484
utf8_general_mysql500_ci utf8 223 # #
8585
utf8_croatian_ci utf8 576 # #
8686
utf8_myanmar_ci utf8 577 # #
87+
utf8_thai_520_w2 utf8 578 # #
8788
ucs2_general_ci ucs2 35 Yes # #
8889
ucs2_bin ucs2 90 # #
8990
ucs2_unicode_ci ucs2 128 # #

‎mysql-test/suite/sys_vars/inc/collation_basic.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ eval SET $collation_variable = utf8_esperanto_ci;
152152
eval SELECT $collation_variable;
153153
eval SET $collation_variable = utf8_hungarian_ci;
154154
eval SELECT $collation_variable;
155+
eval SET $collation_variable = utf8_thai_520_w2;
156+
eval SELECT $collation_variable;
155157
eval SET $collation_variable = ucs2_general_ci;
156158
eval SELECT $collation_variable;
157159
eval SET $collation_variable = ucs2_bin;

‎mysql-test/suite/sys_vars/r/collation_connection_basic.result

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,10 @@ SET @@session.collation_connection = utf8_hungarian_ci;
374374
SELECT @@session.collation_connection;
375375
@@session.collation_connection
376376
utf8_hungarian_ci
377+
SET @@session.collation_connection = utf8_thai_520_w2;
378+
SELECT @@session.collation_connection;
379+
@@session.collation_connection
380+
utf8_thai_520_w2
377381
SET @@session.collation_connection = ucs2_general_ci;
378382
SELECT @@session.collation_connection;
379383
@@session.collation_connection
@@ -883,6 +887,10 @@ SET @@global.collation_connection = utf8_hungarian_ci;
883887
SELECT @@global.collation_connection;
884888
@@global.collation_connection
885889
utf8_hungarian_ci
890+
SET @@global.collation_connection = utf8_thai_520_w2;
891+
SELECT @@global.collation_connection;
892+
@@global.collation_connection
893+
utf8_thai_520_w2
886894
SET @@global.collation_connection = ucs2_general_ci;
887895
SELECT @@global.collation_connection;
888896
@@global.collation_connection

‎mysql-test/suite/sys_vars/r/collation_database_basic.result

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,10 @@ SET @@session.collation_database = utf8_hungarian_ci;
376376
SELECT @@session.collation_database;
377377
@@session.collation_database
378378
utf8_hungarian_ci
379+
SET @@session.collation_database = utf8_thai_520_w2;
380+
SELECT @@session.collation_database;
381+
@@session.collation_database
382+
utf8_thai_520_w2
379383
SET @@session.collation_database = ucs2_general_ci;
380384
SELECT @@session.collation_database;
381385
@@session.collation_database
@@ -885,6 +889,10 @@ SET @@global.collation_database = utf8_hungarian_ci;
885889
SELECT @@global.collation_database;
886890
@@global.collation_database
887891
utf8_hungarian_ci
892+
SET @@global.collation_database = utf8_thai_520_w2;
893+
SELECT @@global.collation_database;
894+
@@global.collation_database
895+
utf8_thai_520_w2
888896
SET @@global.collation_database = ucs2_general_ci;
889897
SELECT @@global.collation_database;
890898
@@global.collation_database

‎mysql-test/suite/sys_vars/r/collation_server_basic.result

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,10 @@ SET @@session.collation_server = utf8_hungarian_ci;
373373
SELECT @@session.collation_server;
374374
@@session.collation_server
375375
utf8_hungarian_ci
376+
SET @@session.collation_server = utf8_thai_520_w2;
377+
SELECT @@session.collation_server;
378+
@@session.collation_server
379+
utf8_thai_520_w2
376380
SET @@session.collation_server = ucs2_general_ci;
377381
SELECT @@session.collation_server;
378382
@@session.collation_server
@@ -882,6 +886,10 @@ SET @@global.collation_server = utf8_hungarian_ci;
882886
SELECT @@global.collation_server;
883887
@@global.collation_server
884888
utf8_hungarian_ci
889+
SET @@global.collation_server = utf8_thai_520_w2;
890+
SELECT @@global.collation_server;
891+
@@global.collation_server
892+
utf8_thai_520_w2
885893
SET @@global.collation_server = ucs2_general_ci;
886894
SELECT @@global.collation_server;
887895
@@global.collation_server

‎mysql-test/t/ctype_uca_th.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11

2+
SELECT ID, SORTLEN, COLLATION_NAME, CHARACTER_SET_NAME
3+
FROM INFORMATION_SCHEMA.COLLATIONS
4+
WHERE COLLATION_NAME LIKE 'utf8_thai_520_w2';
25

36
SET NAMES utf8;
47

‎strings/ctype-uca.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35954,7 +35954,7 @@ struct charset_info_st my_charset_utf8_thai_520_w2=
3595435954
&my_unicase_unicode520,/* caseinfo */
3595535955
NULL, /* state_map */
3595635956
NULL, /* ident_map */
35957-
8, /* strxfrm_multiply */
35957+
4, /* strxfrm_multiply */
3595835958
1, /* caseup_multiply */
3595935959
1, /* casedn_multiply */
3596035960
1, /* mbminlen */

0 commit comments

Comments
 (0)