MDEV-307 review minor edits, add yacc_ora support

mysql-test/main/comment_database.result

@@ -18,7 +18,7 @@ SET SQL_MODE='';
 CREATE DATABASE db1
 COMMENT='abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcde';
 Warnings:
-Warning	4144	Comment for database 'db1' is too long (max = 1024)
+Warning	4160	Comment for database 'db1' is too long (max = 1024)
 SHOW CREATE DATABASE db1;
 Database	Create Database
 db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET latin1 */ COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd'

mysql-test/suite/engines/funcs/r/db_alter_character_set.result

@@ -43,381 +43,381 @@ cp932	SJIS for Windows Japanese	cp932_japanese_ci	2
 eucjpms	UJIS for Windows Japanese	eucjpms_japanese_ci	3
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d8   CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	ascii	ascii_general_ci	NULL
+def	d8	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d8   CHARACTER SET utf8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	utf8	utf8_general_ci	NULL
+def	d8	utf8	utf8_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d8   CHARACTER SET binary;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	binary	binary	NULL
+def	d8	binary	binary	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d8   CHARACTER SET swe7;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	swe7	swe7_swedish_ci	NULL
+def	d8	swe7	swe7_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d8   CHARACTER SET cp1251;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	cp1251	cp1251_general_ci	NULL
+def	d8	cp1251	cp1251_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d8 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	ascii	ascii_general_ci	NULL
+def	d8	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d8 DEFAULT CHARACTER SET utf8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	utf8	utf8_general_ci	NULL
+def	d8	utf8	utf8_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d8 DEFAULT CHARACTER SET binary;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	binary	binary	NULL
+def	d8	binary	binary	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d8 DEFAULT CHARACTER SET swe7;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	swe7	swe7_swedish_ci	NULL
+def	d8	swe7	swe7_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d8 DEFAULT CHARACTER SET cp1251;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	cp1251	cp1251_general_ci	NULL
+def	d8	cp1251	cp1251_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d8   CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	ascii	ascii_general_ci	NULL
+def	d8	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d8   CHARACTER SET utf8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	utf8	utf8_general_ci	NULL
+def	d8	utf8	utf8_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d8   CHARACTER SET binary;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	binary	binary	NULL
+def	d8	binary	binary	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d8   CHARACTER SET swe7;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	swe7	swe7_swedish_ci	NULL
+def	d8	swe7	swe7_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d8   CHARACTER SET cp1251;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	cp1251	cp1251_general_ci	NULL
+def	d8	cp1251	cp1251_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d8 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	ascii	ascii_general_ci	NULL
+def	d8	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d8 DEFAULT CHARACTER SET utf8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	utf8	utf8_general_ci	NULL
+def	d8	utf8	utf8_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d8 DEFAULT CHARACTER SET binary;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	binary	binary	NULL
+def	d8	binary	binary	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d8 DEFAULT CHARACTER SET swe7;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	swe7	swe7_swedish_ci	NULL
+def	d8	swe7	swe7_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;
 CREATE DATABASE d8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	latin1	latin1_swedish_ci	NULL
+def	d8	latin1	latin1_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d8 DEFAULT CHARACTER SET cp1251;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d8	cp1251	cp1251_general_ci	NULL
+def	d8	cp1251	cp1251_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d8;

mysql-test/suite/engines/funcs/r/db_alter_character_set_collate.result

@@ -1,115 +1,115 @@
 DROP DATABASE IF EXISTS d11;
 CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d11	ascii	ascii_bin	NULL
+def	d11	ascii	ascii_bin	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d11 CHARACTER SET utf8 COLLATE utf8_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d11	utf8	utf8_general_ci	NULL
+def	d11	utf8	utf8_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d11;
 CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d11	ascii	ascii_bin	NULL
+def	d11	ascii	ascii_bin	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d11 CHARACTER SET latin2 COLLATE latin2_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d11	latin2	latin2_general_ci	NULL
+def	d11	latin2	latin2_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d11;
 CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d11	ascii	ascii_bin	NULL
+def	d11	ascii	ascii_bin	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d11 CHARACTER SET  cp1250 COLLATE cp1250_croatian_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d11	cp1250	cp1250_croatian_ci	NULL
+def	d11	cp1250	cp1250_croatian_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d11;
 CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d11	ascii	ascii_bin	NULL
+def	d11	ascii	ascii_bin	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d11 CHARACTER SET utf8 COLLATE utf8_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d11	utf8	utf8_general_ci	NULL
+def	d11	utf8	utf8_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d11;
 CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d11	ascii	ascii_bin	NULL
+def	d11	ascii	ascii_bin	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d11 CHARACTER SET latin2 COLLATE latin2_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d11	latin2	latin2_general_ci	NULL
+def	d11	latin2	latin2_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d11;
 CREATE DATABASE d11 DEFAULT CHARACTER SET ascii DEFAULT COLLATE ascii_bin;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d11	ascii	ascii_bin	NULL
+def	d11	ascii	ascii_bin	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d11 CHARACTER SET  cp1250 COLLATE cp1250_croatian_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d11	cp1250	cp1250_croatian_ci	NULL
+def	d11	cp1250	cp1250_croatian_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d11;

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

@@ -325,153 +325,153 @@ eucjpms_japanese_nopad_ci	eucjpms	1121		#	#
 eucjpms_nopad_bin	eucjpms	1122		#	#
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_general_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d9   COLLATE ascii_bin;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_bin	NULL
+def	d9	ascii	ascii_bin	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d9;
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_general_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d9 DEFAULT COLLATE ascii_bin;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_bin	NULL
+def	d9	ascii	ascii_bin	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d9;
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_general_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d9   COLLATE ascii_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_general_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d9;
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_general_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER DATABASE d9 DEFAULT COLLATE ascii_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_general_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d9;
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_general_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d9   COLLATE ascii_bin;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_bin	NULL
+def	d9	ascii	ascii_bin	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d9;
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_general_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d9 DEFAULT COLLATE ascii_bin;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_bin	NULL
+def	d9	ascii	ascii_bin	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d9;
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_general_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d9   COLLATE ascii_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_general_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d9;
 CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_general_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 ALTER SCHEMA d9 DEFAULT COLLATE ascii_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d9	ascii	ascii_general_ci	NULL
+def	d9	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d9;

mysql-test/suite/engines/funcs/r/db_create_character_set.result

@@ -1,101 +1,101 @@
 DROP DATABASE IF EXISTS d12;
 CREATE DATABASE d12 CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d12	ascii	ascii_general_ci	NULL
+def	d12	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d12;
 CREATE DATABASE d12 CHARACTER SET utf8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d12	utf8	utf8_general_ci	NULL
+def	d12	utf8	utf8_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d12;
 CREATE DATABASE d12 CHARACTER SET binary;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d12	binary	binary	NULL
+def	d12	binary	binary	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d12;
 CREATE DATABASE d12 CHARACTER SET swe7;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d12	swe7	swe7_swedish_ci	NULL
+def	d12	swe7	swe7_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d12;
 CREATE DATABASE d12 CHARACTER SET cp1251;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d12	cp1251	cp1251_general_ci	NULL
+def	d12	cp1251	cp1251_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d12;
 CREATE SCHEMA d12 CHARACTER SET ascii;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d12	ascii	ascii_general_ci	NULL
+def	d12	ascii	ascii_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP SCHEMA d12;
 CREATE SCHEMA d12 CHARACTER SET utf8;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d12	utf8	utf8_general_ci	NULL
+def	d12	utf8	utf8_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP SCHEMA d12;
 CREATE SCHEMA d12 CHARACTER SET binary;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d12	binary	binary	NULL
+def	d12	binary	binary	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP SCHEMA d12;
 CREATE SCHEMA d12 CHARACTER SET swe7;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d12	swe7	swe7_swedish_ci	NULL
+def	d12	swe7	swe7_swedish_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP SCHEMA d12;
 CREATE SCHEMA d12 CHARACTER SET cp1251;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d12	cp1251	cp1251_general_ci	NULL
+def	d12	cp1251	cp1251_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP SCHEMA d12;

mysql-test/suite/engines/funcs/r/db_create_character_set_collate.result

@@ -1,61 +1,61 @@
 DROP DATABASE IF EXISTS d13;
 CREATE DATABASE d13 CHARACTER SET utf8 COLLATE utf8_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d13	utf8	utf8_general_ci	NULL
+def	d13	utf8	utf8_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d13;
 CREATE DATABASE d13 CHARACTER SET latin2 COLLATE latin2_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d13	latin2	latin2_general_ci	NULL
+def	d13	latin2	latin2_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d13;
 CREATE DATABASE d13 CHARACTER SET  cp1250 COLLATE cp1250_croatian_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d13	cp1250	cp1250_croatian_ci	NULL
+def	d13	cp1250	cp1250_croatian_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP DATABASE d13;
 CREATE SCHEMA d13 CHARACTER SET utf8 COLLATE utf8_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d13	utf8	utf8_general_ci	NULL
+def	d13	utf8	utf8_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP SCHEMA d13;
 CREATE SCHEMA d13 CHARACTER SET latin2 COLLATE latin2_general_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d13	latin2	latin2_general_ci	NULL
+def	d13	latin2	latin2_general_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP SCHEMA d13;
 CREATE SCHEMA d13 CHARACTER SET  cp1250 COLLATE cp1250_croatian_ci;
 SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	d13	cp1250	cp1250_croatian_ci	NULL
+def	d13	cp1250	cp1250_croatian_ci	NULL	
-def	information_schema	utf8	utf8_general_ci	NULL
+def	information_schema	utf8	utf8_general_ci	NULL	
-def	mtr	latin1	latin1_swedish_ci	NULL
+def	mtr	latin1	latin1_swedish_ci	NULL	
-def	mysql	latin1	latin1_swedish_ci	NULL
+def	mysql	latin1	latin1_swedish_ci	NULL	
-def	performance_schema	utf8	utf8_general_ci	NULL
+def	performance_schema	utf8	utf8_general_ci	NULL	
-def	test	latin1	latin1_swedish_ci	NULL
+def	test	latin1	latin1_swedish_ci	NULL	
 DROP SCHEMA d13;

mysql-test/suite/funcs_1/r/is_columns_is_embedded.result

@@ -326,6 +326,7 @@ def	information_schema	ROUTINES	SQL_PATH	22	NULL	YES	varchar	64	192	NULL	NULL	NU
 def	information_schema	SCHEMATA	CATALOG_NAME	1	''	NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)					NEVER	NULL
 def	information_schema	SCHEMATA	DEFAULT_CHARACTER_SET_NAME	3	''	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)					NEVER	NULL
 def	information_schema	SCHEMATA	DEFAULT_COLLATION_NAME	4	''	NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)					NEVER	NULL
+def	information_schema	SCHEMATA	SCHEMA_COMMENT	6	''	NO	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)					NEVER	NULL
 def	information_schema	SCHEMATA	SCHEMA_NAME	2	''	NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)					NEVER	NULL
 def	information_schema	SCHEMATA	SQL_PATH	5	NULL	YES	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)					NEVER	NULL
 def	information_schema	SCHEMA_PRIVILEGES	GRANTEE	1	''	NO	varchar	190	570	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(190)					NEVER	NULL
@@ -870,6 +871,7 @@ NULL	information_schema	ROUTINES	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datet
 3.0000	information_schema	SCHEMATA	DEFAULT_CHARACTER_SET_NAME	varchar	32	96	utf8	utf8_general_ci	varchar(32)
 3.0000	information_schema	SCHEMATA	DEFAULT_COLLATION_NAME	varchar	32	96	utf8	utf8_general_ci	varchar(32)
 3.0000	information_schema	SCHEMATA	SQL_PATH	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
+3.0000	information_schema	SCHEMATA	SCHEMA_COMMENT	varchar	1024	3072	utf8	utf8_general_ci	varchar(1024)
 3.0000	information_schema	SCHEMA_PRIVILEGES	GRANTEE	varchar	190	570	utf8	utf8_general_ci	varchar(190)
 3.0000	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 3.0000	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)

mysql-test/suite/funcs_1/r/is_schemata_embedded.result

@@ -33,6 +33,7 @@ SCHEMA_NAME	varchar(64)	NO
 DEFAULT_CHARACTER_SET_NAME	varchar(32)	NO			
 DEFAULT_COLLATION_NAME	varchar(32)	NO			
 SQL_PATH	varchar(512)	YES		NULL	
+SCHEMA_COMMENT	varchar(1024)	NO			
 SHOW CREATE TABLE information_schema.SCHEMATA;
 Table	Create Table
 SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
@@ -40,7 +41,8 @@ SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
   `SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '',
   `DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
   `DEFAULT_COLLATION_NAME` varchar(32) NOT NULL DEFAULT '',
-  `SQL_PATH` varchar(512) DEFAULT NULL
+  `SQL_PATH` varchar(512) DEFAULT NULL,
+  `SCHEMA_COMMENT` varchar(1024) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.SCHEMATA;
 Field	Type	Null	Key	Default	Extra
@@ -49,6 +51,7 @@ SCHEMA_NAME	varchar(64)	NO
 DEFAULT_CHARACTER_SET_NAME	varchar(32)	NO			
 DEFAULT_COLLATION_NAME	varchar(32)	NO			
 SQL_PATH	varchar(512)	YES		NULL	
+SCHEMA_COMMENT	varchar(1024)	NO			
 SELECT catalog_name, schema_name, sql_path
 FROM information_schema.schemata
 WHERE catalog_name IS NOT NULL or sql_path IS NOT NULL
@@ -77,9 +80,9 @@ GRANT SELECT ON db_datadict_1.* to 'testuser2'@'localhost';
 GRANT SELECT ON db_datadict_2.* to 'testuser2'@'localhost';
 SELECT * FROM information_schema.schemata
 WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	db_datadict_1	latin1	latin1_swedish_ci	NULL
+def	db_datadict_1	latin1	latin1_swedish_ci	NULL	
-def	db_datadict_2	latin1	latin1_swedish_ci	NULL
+def	db_datadict_2	latin1	latin1_swedish_ci	NULL	
 SHOW DATABASES LIKE 'db_datadict_%';
 Database (db_datadict_%)
 db_datadict_1
@@ -87,9 +90,9 @@ db_datadict_2
 connect  testuser1, localhost, testuser1, , db_datadict_1;
 SELECT * FROM information_schema.schemata
 WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	db_datadict_1	latin1	latin1_swedish_ci	NULL
+def	db_datadict_1	latin1	latin1_swedish_ci	NULL	
-def	db_datadict_2	latin1	latin1_swedish_ci	NULL
+def	db_datadict_2	latin1	latin1_swedish_ci	NULL	
 SHOW DATABASES LIKE 'db_datadict_%';
 Database (db_datadict_%)
 db_datadict_1
@@ -97,9 +100,9 @@ db_datadict_2
 connect  testuser2, localhost, testuser2, , db_datadict_2;
 SELECT * FROM information_schema.schemata
 WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	db_datadict_1	latin1	latin1_swedish_ci	NULL
+def	db_datadict_1	latin1	latin1_swedish_ci	NULL	
-def	db_datadict_2	latin1	latin1_swedish_ci	NULL
+def	db_datadict_2	latin1	latin1_swedish_ci	NULL	
 SHOW DATABASES LIKE 'db_datadict_%';
 Database (db_datadict_%)
 db_datadict_1
@@ -107,9 +110,9 @@ db_datadict_2
 connect  testuser3, localhost, testuser3, , test;
 SELECT * FROM information_schema.schemata
 WHERE schema_name LIKE 'db_datadict_%' ORDER BY schema_name;
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	db_datadict_1	latin1	latin1_swedish_ci	NULL
+def	db_datadict_1	latin1	latin1_swedish_ci	NULL	
-def	db_datadict_2	latin1	latin1_swedish_ci	NULL
+def	db_datadict_2	latin1	latin1_swedish_ci	NULL	
 SHOW DATABASES LIKE 'db_datadict_%';
 Database (db_datadict_%)
 db_datadict_1
@@ -128,11 +131,11 @@ DROP DATABASE db_datadict_2;
 #################################################################################
 DROP DATABASE IF EXISTS db_datadict;
 SELECT * FROM information_schema.schemata WHERE schema_name = 'db_datadict';
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
 CREATE DATABASE db_datadict CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';
 SELECT * FROM information_schema.schemata WHERE schema_name = 'db_datadict';
-CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
+CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH	SCHEMA_COMMENT
-def	db_datadict	latin1	latin1_swedish_ci	NULL
+def	db_datadict	latin1	latin1_swedish_ci	NULL	
 SELECT schema_name, default_character_set_name
 FROM information_schema.schemata WHERE schema_name = 'db_datadict';
 schema_name	default_character_set_name

sql/handler.h

@@ -1945,7 +1945,8 @@ enum enum_stats_auto_recalc { HA_STATS_AUTO_RECALC_DEFAULT= 0,
 
   It stores the "schema_specification" part of the CREATE/ALTER statements and
   is passed to mysql_create_db() and  mysql_alter_db().
-  Currently consists of the schema default character set, collation and schema_comment.
+  Currently consists of the schema default character set, collation
+  and schema_comment.
 */
 struct Schema_specification_st
 {

sql/sql_db.cc

@@ -252,7 +252,7 @@ static my_bool get_dbopt(THD *thd, const char *dbname,
     create->default_table_charset= opt->charset;
     if (opt->comment.length)
     {
-      create->schema_comment= thd->make_clex_string(const_cast<char*>(opt->comment.str),
+      create->schema_comment= thd->make_clex_string(opt->comment.str,
                                                     opt->comment.length);
     }
     error= 0;
@@ -344,7 +344,8 @@ static void del_dbopt(const char *path)
   Create database options file:
 
   DESCRIPTION
-    Currently database default charset, default collation and comment are stored there.
+    Currently database default charset, default collation
+    and comment are stored there.
 
   RETURN VALUES
   0	ok
@@ -361,16 +362,19 @@ static bool write_db_opt(THD *thd, const char *path,
   if (create->schema_comment)
   {
     if (validate_comment_length(thd, create->schema_comment,
-                                DATABASE_COMMENT_MAXLEN, ER_TOO_LONG_DATABASE_COMMENT,
+                                DATABASE_COMMENT_MAXLEN,
+                                ER_TOO_LONG_DATABASE_COMMENT,
                                 thd->lex->name.str))
       return error;
   }
 
-  /* Use existing values of schema_comment and charset for ALTER DATABASE queries */
+  if (thd->lex->sql_command == SQLCOM_ALTER_DB &&
-  Schema_specification_st tmp;
+      (!create->schema_comment || !create->default_table_charset))
-  bzero((char*) &tmp,sizeof(tmp));
-  if (thd->lex->sql_command == SQLCOM_ALTER_DB)
   {
+    /* Use existing values of schema_comment and charset for
+       ALTER DATABASE queries */
+    Schema_specification_st tmp;
+    tmp.init();
     load_db_opt(thd, path, &tmp);
 
     if (!create->schema_comment)

sql/sql_show.cc

@@ -5323,7 +5323,8 @@ bool store_schema_schemata(THD* thd, TABLE *table, LEX_CSTRING *db_name,
   table->field[2]->store(cs->csname, strlen(cs->csname), system_charset_info);
   table->field[3]->store(cs->name, strlen(cs->name), system_charset_info);
   if (schema_comment)
-    table->field[5]->store(schema_comment->str, schema_comment->length, system_charset_info);
+    table->field[5]->store(schema_comment->str, schema_comment->length,
+                           system_charset_info);
   return schema_table_store_record(thd, table);
 }
 
@@ -5391,7 +5392,8 @@ int fill_schema_schemata(THD *thd, TABLE_LIST *tables, COND *cond)
     {
       load_db_opt_by_name(thd, db_name->str, &create);
       if (store_schema_schemata(thd, table, db_name,
-                                create.default_table_charset, create.schema_comment))
+                                create.default_table_charset,
+                                create.schema_comment))
         DBUG_RETURN(1);
     }
   }
@@ -9054,7 +9056,8 @@ ST_FIELD_INFO schema_fields_info[]=
   {"DEFAULT_COLLATION_NAME", MY_CS_NAME_SIZE, MYSQL_TYPE_STRING, 0, 0, 0,
    SKIP_OPEN_TABLE},
   {"SQL_PATH", FN_REFLEN, MYSQL_TYPE_STRING, 0, 1, 0, SKIP_OPEN_TABLE},
-  {"SCHEMA_COMMENT", DATABASE_COMMENT_MAXLEN, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE},
+  {"SCHEMA_COMMENT", DATABASE_COMMENT_MAXLEN, MYSQL_TYPE_STRING, 0, 0, 0,
+   SKIP_OPEN_TABLE},
   {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE}
 };
 

sql/sql_yacc.yy

@@ -1686,8 +1686,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
    and until NEXT_SYM / PREVIOUS_SYM.
 */
 %left   PREC_BELOW_IDENTIFIER_OPT_SPECIAL_CASE
-%left   TRANSACTION_SYM TIMESTAMP PERIOD_SYM SYSTEM USER
+%left   TRANSACTION_SYM TIMESTAMP PERIOD_SYM SYSTEM USER COMMENT_SYM
-%left   COMMENT_SYM
 
 
 /*
@@ -8046,7 +8045,8 @@ opt_ev_sql_stmt:
         ;
 
 ident_or_empty:
-          /* empty */ %prec PREC_BELOW_IDENTIFIER_OPT_SPECIAL_CASE { $$= Lex_ident_sys(); }
+          /* empty */
+          %prec PREC_BELOW_IDENTIFIER_OPT_SPECIAL_CASE { $$= Lex_ident_sys(); }
         | ident
         ;
 

sql/sql_yacc_ora.yy

@@ -1180,7 +1180,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
    and until NEXT_SYM / PREVIOUS_SYM.
 */
 %left   PREC_BELOW_IDENTIFIER_OPT_SPECIAL_CASE
-%left   TRANSACTION_SYM TIMESTAMP PERIOD_SYM SYSTEM USER
+%left   TRANSACTION_SYM TIMESTAMP PERIOD_SYM SYSTEM USER COMMENT_SYM
 
 
 /*
@@ -2313,6 +2313,7 @@ create:
         | create_or_replace DATABASE opt_if_not_exists ident
           {
             Lex->create_info.default_table_charset= NULL;
+            Lex->create_info.schema_comment= NULL;
             Lex->create_info.used_fields= 0;
             if (Lex->main_select_push())
               MYSQL_YYABORT;
@@ -6068,6 +6069,11 @@ create_database_options:
 create_database_option:
           default_collation {}
         | default_charset {}
+        | COMMENT_SYM opt_equal TEXT_STRING_sys
+          {
+            Lex->create_info.schema_comment= thd->make_clex_string($3);
+            Lex->create_info.used_fields|= HA_CREATE_USED_COMMENT;
+          }
         ;
 
 opt_if_not_exists_table_element:
@@ -7881,6 +7887,7 @@ alter:
         | ALTER DATABASE ident_or_empty
           {
             Lex->create_info.default_table_charset= NULL;
+            Lex->create_info.schema_comment= NULL;
             Lex->create_info.used_fields= 0;
             if (Lex->main_select_push())
               MYSQL_YYABORT;
@@ -7895,6 +7902,22 @@ alter:
               MYSQL_YYABORT;
             Lex->pop_select(); //main select
           }
+        | ALTER DATABASE COMMENT_SYM opt_equal TEXT_STRING_sys
+          {
+            Lex->create_info.default_table_charset= NULL;
+            Lex->create_info.used_fields= 0;
+            Lex->create_info.schema_comment= thd->make_clex_string($5);
+            Lex->create_info.used_fields|= HA_CREATE_USED_COMMENT;
+          }
+          opt_create_database_options
+          {
+            LEX *lex=Lex;
+            lex->sql_command=SQLCOM_ALTER_DB;
+            lex->name= Lex_ident_sys();
+            if (lex->name.str == NULL &&
+                unlikely(lex->copy_db_to(&lex->name)))
+              MYSQL_YYABORT;
+          }
         | ALTER DATABASE ident UPGRADE_SYM DATA_SYM DIRECTORY_SYM NAME_SYM
           {
             LEX *lex= Lex;
@@ -8139,7 +8162,8 @@ opt_ev_sql_stmt:
         ;
 
 ident_or_empty:
-          /* empty */ { $$= Lex_ident_sys(); }
+          /* empty */
+          %prec PREC_BELOW_IDENTIFIER_OPT_SPECIAL_CASE { $$= Lex_ident_sys(); }
         | ident
         ;