diff options
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_ctype_ldml.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_ctype_ldml-master.opt | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_ctype_ldml.result b/mysql-test/suite/innodb/r/innodb_ctype_ldml.result index fefadb2ecb0..8bb20410bb4 100644 --- a/mysql-test/suite/innodb/r/innodb_ctype_ldml.result +++ b/mysql-test/suite/innodb/r/innodb_ctype_ldml.result @@ -5,7 +5,7 @@ with all Unicode character sets set names utf8; show variables like 'character_sets_dir%'; Variable_name Value -character_sets_dir MYSQL_TEST_DIR/std_data/ +character_sets_dir MYSQL_TEST_DIR/std_data/ldml/ show collation like 'utf8_phone_ci'; Collation Charset Id Default Compiled Sortlen utf8_phone_ci utf8 352 8 @@ -390,10 +390,13 @@ select "foo" = "foo " collate latin1_test; The following tests check that two-byte collation IDs work select * from information_schema.collations where id>256 and is_compiled<>'Yes' order by id; COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN +ascii2_general_ci ascii2 320 Yes 1 +ascii2_bin ascii2 321 1 utf8mb4_test_ci utf8mb4 326 8 utf16_test_ci utf16 327 8 utf8mb4_test_400_ci utf8mb4 328 8 latin1_test2 latin1 332 1 +latin1_test2_cs latin1 333 1 utf8_bengali_standard_ci utf8 336 8 utf8_bengali_traditional_ci utf8 337 8 utf8_implicit_weights_ci utf8 338 8 @@ -414,6 +417,7 @@ show collation like '%test%'; Collation Charset Id Default Compiled Sortlen latin1_test latin1 99 Yes 1 latin1_test2 latin1 332 1 +latin1_test2_cs latin1 333 1 utf8_test_ci utf8 353 8 ucs2_test_ci ucs2 358 8 utf8mb4_test_ci utf8mb4 326 8 diff --git a/mysql-test/suite/innodb/t/innodb_ctype_ldml-master.opt b/mysql-test/suite/innodb/t/innodb_ctype_ldml-master.opt index cddf744de98..25eed3eb299 100644 --- a/mysql-test/suite/innodb/t/innodb_ctype_ldml-master.opt +++ b/mysql-test/suite/innodb/t/innodb_ctype_ldml-master.opt @@ -1,3 +1,3 @@ ---character-sets-dir=$MYSQL_TEST_DIR/std_data/ +--character-sets-dir=$MYSQL_TEST_DIR/std_data/ldml/ --default-storage-engine=InnoDB |