diff options
Diffstat (limited to 'mysql-test/suite/sys_vars/r/character_set_database_func.result')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/character_set_database_func.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/sys_vars/r/character_set_database_func.result b/mysql-test/suite/sys_vars/r/character_set_database_func.result index efdb9233652..b1c2db1efc2 100644 --- a/mysql-test/suite/sys_vars/r/character_set_database_func.result +++ b/mysql-test/suite/sys_vars/r/character_set_database_func.result @@ -29,14 +29,14 @@ CREATE DATABASE db1; USE db1; SHOW CREATE DATABASE db1; Database Create Database -db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 */ +db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci */ CREATE TABLE t1(a INT, b VARCHAR(40)); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(40) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci DROP TABLE t1; DROP DATABASE db1; '--ascii character set specified--' @@ -44,14 +44,14 @@ CREATE DATABASE db1 CHARACTER SET ascii; USE db1; SHOW CREATE DATABASE db1; Database Create Database -db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET ascii */ +db1 CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET ascii COLLATE ascii_general_ci */ CREATE TABLE t1(a INT, b VARCHAR(40)); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `b` varchar(40) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=ascii +) ENGINE=MyISAM DEFAULT CHARSET=ascii COLLATE=ascii_general_ci DROP TABLE t1; DROP DATABASE db1; '------Check if load data uses character_set_database----------' |