summaryrefslogtreecommitdiff
path: root/mysql-test/suite/funcs_1/r/is_tables.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-09-21 10:59:56 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-21 10:59:56 +0300
commit5e996fbad9e2326a197731c594c11ade8a3c2492 (patch)
tree3c3abfcd53f7d4abfe621f7cf97aa003a72f9d74 /mysql-test/suite/funcs_1/r/is_tables.result
parent5deccac4aaf1be948a0ae10f40bb5f668ac37a4d (diff)
parenta8e45404765db6bc6c57dab3cc834e92a44d0110 (diff)
downloadmariadb-git-5e996fbad9e2326a197731c594c11ade8a3c2492.tar.gz
Merge 10.9 into 10.10
Diffstat (limited to 'mysql-test/suite/funcs_1/r/is_tables.result')
-rw-r--r--mysql-test/suite/funcs_1/r/is_tables.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/funcs_1/r/is_tables.result b/mysql-test/suite/funcs_1/r/is_tables.result
index a5086b183f0..35f7d43d437 100644
--- a/mysql-test/suite/funcs_1/r/is_tables.result
+++ b/mysql-test/suite/funcs_1/r/is_tables.result
@@ -77,7 +77,7 @@ TABLES CREATE TEMPORARY TABLE `TABLES` (
`TABLE_COMMENT` varchar(2048) NOT NULL,
`MAX_INDEX_LENGTH` bigint(21) unsigned,
`TEMPORARY` varchar(1)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
SHOW COLUMNS FROM information_schema.TABLES;
Field Type Null Key Default Extra
TABLE_CATALOG varchar(512) NO NULL