diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-02-15 01:39:37 +0530 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-05-19 06:48:36 +0200 |
| commit | 2fdb556e045e9918410086eeaac5a94a4c028626 (patch) | |
| tree | 1420013b4e76b3192cb8ac33406c818d3ecfc3af /mysql-test/suite/funcs_1/r/is_tables_mysql.result | |
| parent | c366845a0b5c08285c958cf1500b3b7906ecf8d4 (diff) | |
| download | mariadb-git-2fdb556e045e9918410086eeaac5a94a4c028626.tar.gz | |
MDEV-8334: Rename utf8 to utf8mb3
This patch changes the main name of 3 byte character set from utf8 to
utf8mb3. New old_mode UTF8_IS_UTF8MB3 is added and set TRUE by default,
so that utf8 would mean utf8mb3. If not set, utf8 would mean utf8mb4.
Diffstat (limited to 'mysql-test/suite/funcs_1/r/is_tables_mysql.result')
| -rw-r--r-- | mysql-test/suite/funcs_1/r/is_tables_mysql.result | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/mysql-test/suite/funcs_1/r/is_tables_mysql.result b/mysql-test/suite/funcs_1/r/is_tables_mysql.result index be432e2422a..7cfef92c09d 100644 --- a/mysql-test/suite/funcs_1/r/is_tables_mysql.result +++ b/mysql-test/suite/funcs_1/r/is_tables_mysql.result @@ -27,7 +27,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_bin +TABLE_COLLATION utf8mb3_bin CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -52,7 +52,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_bin +TABLE_COLLATION utf8mb3_bin CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -77,7 +77,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_bin +TABLE_COLLATION utf8mb3_bin CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -102,7 +102,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -127,7 +127,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_bin +TABLE_COLLATION utf8mb3_bin CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -152,7 +152,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -177,7 +177,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_bin +TABLE_COLLATION utf8mb3_bin CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -227,7 +227,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -252,7 +252,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -277,7 +277,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -302,7 +302,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -327,7 +327,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_bin +TABLE_COLLATION utf8mb3_bin CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -352,7 +352,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_bin +TABLE_COLLATION utf8mb3_bin CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -377,7 +377,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_bin +TABLE_COLLATION utf8mb3_bin CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -402,7 +402,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -427,7 +427,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -452,7 +452,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_bin +TABLE_COLLATION utf8mb3_bin CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -477,7 +477,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_bin +TABLE_COLLATION utf8mb3_bin CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -502,7 +502,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_bin +TABLE_COLLATION utf8mb3_bin CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -527,7 +527,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -552,7 +552,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -577,7 +577,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_bin +TABLE_COLLATION utf8mb3_bin CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -602,7 +602,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_bin +TABLE_COLLATION utf8mb3_bin CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -627,7 +627,7 @@ AUTO_INCREMENT 6 CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -652,7 +652,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -677,7 +677,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -702,7 +702,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -727,7 +727,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci +TABLE_COLLATION utf8mb3_general_ci CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# @@ -752,7 +752,7 @@ AUTO_INCREMENT NULL CREATE_TIME #CRT# UPDATE_TIME #UT# CHECK_TIME #CT# -TABLE_COLLATION utf8_bin +TABLE_COLLATION utf8mb3_bin CHECKSUM NULL CREATE_OPTIONS #CO# TABLE_COMMENT #TC# |