auto-merge

mysql-test/r/create.result

@@ -1754,8 +1754,8 @@ create table t1 like information_schema.character_sets;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
   `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
   `MAXLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8

mysql-test/r/information_schema.result

@@ -517,8 +517,8 @@ drop table t1;
 SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
 Table	Create Table
 CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
   `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
   `MAXLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
@@ -526,8 +526,8 @@ set names latin2;
 SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
 Table	Create Table
 CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
   `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
   `MAXLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
@@ -541,8 +541,8 @@ alter table t1 default character set utf8;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
   `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
   `MAXLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -716,8 +716,8 @@ select column_type from information_schema.columns
 where table_schema="information_schema" and table_name="COLUMNS" and
 (column_name="character_set_name" or column_name="collation_name");
 column_type
-varchar(64)
-varchar(64)
+varchar(32)
+varchar(32)
 select TABLE_ROWS from information_schema.tables where 
 table_schema="information_schema" and table_name="COLUMNS";
 TABLE_ROWS
@@ -764,7 +764,6 @@ information_schema	PARTITIONS	PARTITION_DESCRIPTION
 information_schema	PLUGINS	PLUGIN_DESCRIPTION
 information_schema	PROCESSLIST	INFO
 information_schema	ROUTINES	ROUTINE_DEFINITION
-information_schema	ROUTINES	SQL_MODE
 information_schema	TRIGGERS	ACTION_CONDITION
 information_schema	TRIGGERS	ACTION_STATEMENT
 information_schema	VIEWS	VIEW_DEFINITION
@@ -1652,4 +1651,51 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 explain select count(*) from information_schema.views;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	views	ALL	NULL	NULL	NULL	NULL	NULL	Open_frm_only; Scanned all databases
+set global init_connect="drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;";
+select * from information_schema.global_variables where variable_name='init_connect';
+VARIABLE_NAME	VARIABLE_VALUE
+INIT_CONNECT	drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists t1;
+drop table if exists t1;drop table if exists
+Warnings:
+Warning	1265	Data truncated for column 'VARIABLE_VALUE' at row 1
+set global init_connect="";
 End of 5.1 tests.

mysql-test/r/information_schema_part.result

@@ -145,3 +145,9 @@ table_schema = "test" AND table_name = "t1";
 PARTITION_DESCRIPTION
 10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53
 drop table t1;
+drop table if exists t1;
+create table t1 (f1 int key) partition by key(f1) partitions 2;
+select create_options from information_schema.tables where table_schema="test";
+create_options
+partitioned
+drop table t1;

mysql-test/r/mysqlcheck.result

@@ -98,6 +98,12 @@ drop view v_bug25347;
 drop table t_bug25347;
 drop database d_bug25347;
 use test;
+create view v1 as select * from information_schema.routines;
+check table v1, information_schema.routines;
+Table	Op	Msg_type	Msg_text
+test.v1	check	status	OK
+information_schema.routines	check	note	The storage engine for the table doesn't support check
+drop view v1;
 End of 5.0 tests
 create table t1(a int);
 create view v1 as select * from t1;

mysql-test/r/show_check.result

@@ -100,19 +100,19 @@ drop table t1;
 show variables like "wait_timeout%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def			VARIABLES	VARIABLE_NAME	Variable_name	253	64	12	N	1	0	8
-def			VARIABLES	VARIABLE_VALUE	Value	253	20480	5	Y	0	0	8
+def			VARIABLES	VARIABLE_VALUE	Value	253	1024	5	Y	0	0	8
 Variable_name	Value
 wait_timeout	28800
 show variables like "WAIT_timeout%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def			VARIABLES	VARIABLE_NAME	Variable_name	253	64	12	N	1	0	8
-def			VARIABLES	VARIABLE_VALUE	Value	253	20480	5	Y	0	0	8
+def			VARIABLES	VARIABLE_VALUE	Value	253	1024	5	Y	0	0	8
 Variable_name	Value
 wait_timeout	28800
 show variables like "this_doesn't_exists%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def			VARIABLES	VARIABLE_NAME	Variable_name	253	64	0	N	1	0	8
-def			VARIABLES	VARIABLE_VALUE	Value	253	20480	0	Y	0	0	8
+def			VARIABLES	VARIABLE_VALUE	Value	253	1024	0	Y	0	0	8
 Variable_name	Value
 show table status from test like "this_doesn't_exists%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
@@ -130,7 +130,7 @@ def			TABLES	AUTO_INCREMENT	Auto_increment	8	21	0	Y	32800	0	63
 def			TABLES	CREATE_TIME	Create_time	12	19	0	Y	128	0	63
 def			TABLES	UPDATE_TIME	Update_time	12	19	0	Y	128	0	63
 def			TABLES	CHECK_TIME	Check_time	12	19	0	Y	128	0	63
-def			TABLES	TABLE_COLLATION	Collation	253	64	0	Y	0	0	8
+def			TABLES	TABLE_COLLATION	Collation	253	32	0	Y	0	0	8
 def			TABLES	CHECKSUM	Checksum	8	21	0	Y	32800	0	63
 def			TABLES	CREATE_OPTIONS	Create_options	253	255	0	Y	0	0	8
 def			TABLES	TABLE_COMMENT	Comment	253	80	0	N	1	0	8
@@ -858,17 +858,17 @@ set names utf8;
 ----------------------------------------------------------------
 SHOW CHARACTER SET LIKE 'utf8';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def			CHARACTER_SETS	CHARACTER_SET_NAME	Charset	253	192	4	N	1	0	33
+def			CHARACTER_SETS	CHARACTER_SET_NAME	Charset	253	96	4	N	1	0	33
 def			CHARACTER_SETS	DESCRIPTION	Description	253	180	13	N	1	0	33
-def			CHARACTER_SETS	DEFAULT_COLLATE_NAME	Default collation	253	192	15	N	1	0	33
+def			CHARACTER_SETS	DEFAULT_COLLATE_NAME	Default collation	253	96	15	N	1	0	33
 def			CHARACTER_SETS	MAXLEN	Maxlen	8	3	1	N	32769	0	63
 Charset	Description	Default collation	Maxlen
 utf8	UTF-8 Unicode	utf8_general_ci	3
 ----------------------------------------------------------------
 SHOW COLLATION LIKE 'latin1_bin';
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def			COLLATIONS	COLLATION_NAME	Collation	253	192	10	N	1	0	33
-def			COLLATIONS	CHARACTER_SET_NAME	Charset	253	192	6	N	1	0	33
+def			COLLATIONS	COLLATION_NAME	Collation	253	96	10	N	1	0	33
+def			COLLATIONS	CHARACTER_SET_NAME	Charset	253	96	6	N	1	0	33
 def			COLLATIONS	ID	Id	8	11	2	N	32769	0	63
 def			COLLATIONS	IS_DEFAULT	Default	253	9	0	N	1	0	33
 def			COLLATIONS	IS_COMPILED	Compiled	253	9	3	N	1	0	33
@@ -935,7 +935,7 @@ def			TABLES	TABLE_NAME	TABLE_NAME	253	192	2	N	1	0	33
 def			TABLES	TABLE_TYPE	TABLE_TYPE	253	192	10	N	1	0	33
 def			TABLES	ENGINE	ENGINE	253	192	6	Y	0	0	33
 def			TABLES	ROW_FORMAT	ROW_FORMAT	253	30	5	Y	0	0	33
-def			TABLES	TABLE_COLLATION	TABLE_COLLATION	253	192	17	Y	0	0	33
+def			TABLES	TABLE_COLLATION	TABLE_COLLATION	253	96	17	Y	0	0	33
 def			TABLES	CREATE_OPTIONS	CREATE_OPTIONS	253	765	0	Y	0	0	33
 def			TABLES	TABLE_COMMENT	TABLE_COMMENT	253	240	0	N	1	0	33
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	ROW_FORMAT	TABLE_COLLATION	CREATE_OPTIONS	TABLE_COMMENT
@@ -966,8 +966,8 @@ def			COLUMNS	COLUMN_NAME	COLUMN_NAME	253	192	1	N	1	0	33
 def			COLUMNS	COLUMN_DEFAULT	COLUMN_DEFAULT	252	589815	0	Y	16	0	33
 def			COLUMNS	IS_NULLABLE	IS_NULLABLE	253	9	2	N	1	0	33
 def			COLUMNS	DATA_TYPE	DATA_TYPE	253	192	3	N	1	0	33
-def			COLUMNS	CHARACTER_SET_NAME	CHARACTER_SET_NAME	253	192	0	Y	0	0	33
-def			COLUMNS	COLLATION_NAME	COLLATION_NAME	253	192	0	Y	0	0	33
+def			COLUMNS	CHARACTER_SET_NAME	CHARACTER_SET_NAME	253	96	0	Y	0	0	33
+def			COLUMNS	COLLATION_NAME	COLLATION_NAME	253	96	0	Y	0	0	33
 def			COLUMNS	COLUMN_TYPE	COLUMN_TYPE	252	589815	7	N	17	0	33
 def			COLUMNS	COLUMN_KEY	COLUMN_KEY	253	9	3	N	1	0	33
 def			COLUMNS	EXTRA	EXTRA	253	81	0	N	1	0	33
@@ -1125,7 +1125,7 @@ def			ROUTINES	IS_DETERMINISTIC	IS_DETERMINISTIC	253	9	2	N	1	0	33
 def			ROUTINES	SQL_DATA_ACCESS	SQL_DATA_ACCESS	253	192	12	N	1	0	33
 def			ROUTINES	SQL_PATH	SQL_PATH	253	192	0	Y	0	0	33
 def			ROUTINES	SECURITY_TYPE	SECURITY_TYPE	253	21	7	N	1	0	33
-def			ROUTINES	SQL_MODE	SQL_MODE	252	589815	0	N	17	0	33
+def			ROUTINES	SQL_MODE	SQL_MODE	253	24576	0	N	1	0	33
 def			ROUTINES	ROUTINE_COMMENT	ROUTINE_COMMENT	253	192	0	N	1	0	33
 def			ROUTINES	DEFINER	DEFINER	253	231	14	N	1	0	33
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	SQL_MODE	ROUTINE_COMMENT	DEFINER
@@ -1180,7 +1180,7 @@ def			ROUTINES	IS_DETERMINISTIC	IS_DETERMINISTIC	253	9	2	N	1	0	33
 def			ROUTINES	SQL_DATA_ACCESS	SQL_DATA_ACCESS	253	192	12	N	1	0	33
 def			ROUTINES	SQL_PATH	SQL_PATH	253	192	0	Y	0	0	33
 def			ROUTINES	SECURITY_TYPE	SECURITY_TYPE	253	21	7	N	1	0	33
-def			ROUTINES	SQL_MODE	SQL_MODE	252	589815	0	N	17	0	33
+def			ROUTINES	SQL_MODE	SQL_MODE	253	24576	0	N	1	0	33
 def			ROUTINES	ROUTINE_COMMENT	ROUTINE_COMMENT	253	192	0	N	1	0	33
 def			ROUTINES	DEFINER	DEFINER	253	231	14	N	1	0	33
 SPECIFIC_NAME	ROUTINE_CATALOG	ROUTINE_SCHEMA	ROUTINE_NAME	ROUTINE_TYPE	DTD_IDENTIFIER	ROUTINE_BODY	ROUTINE_DEFINITION	EXTERNAL_NAME	EXTERNAL_LANGUAGE	PARAMETER_STYLE	IS_DETERMINISTIC	SQL_DATA_ACCESS	SQL_PATH	SECURITY_TYPE	SQL_MODE	ROUTINE_COMMENT	DEFINER

mysql-test/suite/funcs_1/datadict/is_tables.inc

@@ -346,6 +346,7 @@ WHERE table_name = 't1_my_tablex';
 #   Enforce a time difference bigger than the smallest unit (1 second).
 --real_sleep 1.1
 INSERT INTO db_datadict.t1_my_tablex SET f1 = 3;
+FLUSH TABLES;
 SELECT UPDATE_TIME > @UPDATE_TIME
     AS "Is current UPDATE_TIME bigger than before last INSERT?"
 FROM information_schema.tables

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

@@ -28,22 +28,22 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.CHARACTER_SETS;
 Field	Type	Null	Key	Default	Extra
-CHARACTER_SET_NAME	varchar(64)	NO			
-DEFAULT_COLLATE_NAME	varchar(64)	NO			
+CHARACTER_SET_NAME	varchar(32)	NO			
+DEFAULT_COLLATE_NAME	varchar(32)	NO			
 DESCRIPTION	varchar(60)	NO			
 MAXLEN	bigint(3)	NO		0	
 SHOW CREATE TABLE information_schema.CHARACTER_SETS;
 Table	Create Table
 CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL DEFAULT '',
   `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
   `MAXLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.CHARACTER_SETS;
 Field	Type	Null	Key	Default	Extra
-CHARACTER_SET_NAME	varchar(64)	NO			
-DEFAULT_COLLATE_NAME	varchar(64)	NO			
+CHARACTER_SET_NAME	varchar(32)	NO			
+DEFAULT_COLLATE_NAME	varchar(32)	NO			
 DESCRIPTION	varchar(60)	NO			
 MAXLEN	bigint(3)	NO		0	
 # Testcases 3.2.2.2 and 3.2.2.3 are checked in suite/funcs_1/t/charset_collation*.test

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

@@ -28,18 +28,18 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.COLLATION_CHARACTER_SET_APPLICABILITY;
 Field	Type	Null	Key	Default	Extra
-COLLATION_NAME	varchar(64)	NO			
-CHARACTER_SET_NAME	varchar(64)	NO			
+COLLATION_NAME	varchar(32)	NO			
+CHARACTER_SET_NAME	varchar(32)	NO			
 SHOW CREATE TABLE information_schema.COLLATION_CHARACTER_SET_APPLICABILITY;
 Table	Create Table
 COLLATION_CHARACTER_SET_APPLICABILITY	CREATE TEMPORARY TABLE `COLLATION_CHARACTER_SET_APPLICABILITY` (
-  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT ''
+  `COLLATION_NAME` varchar(32) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.COLLATION_CHARACTER_SET_APPLICABILITY;
 Field	Type	Null	Key	Default	Extra
-COLLATION_NAME	varchar(64)	NO			
-CHARACTER_SET_NAME	varchar(64)	NO			
+COLLATION_NAME	varchar(32)	NO			
+CHARACTER_SET_NAME	varchar(32)	NO			
 # Testcases 3.2.4.2 and 3.2.4.3 are checked in suite/funcs_1/t/charset_collation*.test
 ########################################################################
 # Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and

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

@@ -28,8 +28,8 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.COLLATIONS;
 Field	Type	Null	Key	Default	Extra
-COLLATION_NAME	varchar(64)	NO			
-CHARACTER_SET_NAME	varchar(64)	NO			
+COLLATION_NAME	varchar(32)	NO			
+CHARACTER_SET_NAME	varchar(32)	NO			
 ID	bigint(11)	NO		0	
 IS_DEFAULT	varchar(3)	NO			
 IS_COMPILED	varchar(3)	NO			
@@ -37,8 +37,8 @@ SORTLEN	bigint(3)	NO		0
 SHOW CREATE TABLE information_schema.COLLATIONS;
 Table	Create Table
 COLLATIONS	CREATE TEMPORARY TABLE `COLLATIONS` (
-  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLLATION_NAME` varchar(32) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(32) NOT NULL DEFAULT '',
   `ID` bigint(11) NOT NULL DEFAULT '0',
   `IS_DEFAULT` varchar(3) NOT NULL DEFAULT '',
   `IS_COMPILED` varchar(3) NOT NULL DEFAULT '',
@@ -46,8 +46,8 @@ COLLATIONS	CREATE TEMPORARY TABLE `COLLATIONS` (
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.COLLATIONS;
 Field	Type	Null	Key	Default	Extra
-COLLATION_NAME	varchar(64)	NO			
-CHARACTER_SET_NAME	varchar(64)	NO			
+COLLATION_NAME	varchar(32)	NO			
+CHARACTER_SET_NAME	varchar(32)	NO			
 ID	bigint(11)	NO		0	
 IS_DEFAULT	varchar(3)	NO			
 IS_COMPILED	varchar(3)	NO			

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

@@ -40,8 +40,8 @@ CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned	YES		NULL
 CHARACTER_OCTET_LENGTH	bigint(21) unsigned	YES		NULL	
 NUMERIC_PRECISION	bigint(21) unsigned	YES		NULL	
 NUMERIC_SCALE	bigint(21) unsigned	YES		NULL	
-CHARACTER_SET_NAME	varchar(64)	YES		NULL	
-COLLATION_NAME	varchar(64)	YES		NULL	
+CHARACTER_SET_NAME	varchar(32)	YES		NULL	
+COLLATION_NAME	varchar(32)	YES		NULL	
 COLUMN_TYPE	longtext	NO		NULL	
 COLUMN_KEY	varchar(3)	NO			
 EXTRA	varchar(27)	NO			
@@ -62,8 +62,8 @@ COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
   `CHARACTER_OCTET_LENGTH` bigint(21) unsigned DEFAULT NULL,
   `NUMERIC_PRECISION` bigint(21) unsigned DEFAULT NULL,
   `NUMERIC_SCALE` bigint(21) unsigned DEFAULT NULL,
-  `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
-  `COLLATION_NAME` varchar(64) DEFAULT NULL,
+  `CHARACTER_SET_NAME` varchar(32) DEFAULT NULL,
+  `COLLATION_NAME` varchar(32) DEFAULT NULL,
   `COLUMN_TYPE` longtext NOT NULL,
   `COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
   `EXTRA` varchar(27) NOT NULL DEFAULT '',
@@ -84,8 +84,8 @@ CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned	YES		NULL
 CHARACTER_OCTET_LENGTH	bigint(21) unsigned	YES		NULL	
 NUMERIC_PRECISION	bigint(21) unsigned	YES		NULL	
 NUMERIC_SCALE	bigint(21) unsigned	YES		NULL	
-CHARACTER_SET_NAME	varchar(64)	YES		NULL	
-COLLATION_NAME	varchar(64)	YES		NULL	
+CHARACTER_SET_NAME	varchar(32)	YES		NULL	
+COLLATION_NAME	varchar(32)	YES		NULL	
 COLUMN_TYPE	longtext	NO		NULL	
 COLUMN_KEY	varchar(3)	NO			
 EXTRA	varchar(27)	NO			

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

@@ -45,7 +45,7 @@ SQL_PATH	varchar(64)	YES		NULL
 SECURITY_TYPE	varchar(7)	NO			
 CREATED	datetime	NO		0000-00-00 00:00:00	
 LAST_ALTERED	datetime	NO		0000-00-00 00:00:00	
-SQL_MODE	longtext	NO		NULL	
+SQL_MODE	varchar(8192)	NO			
 ROUTINE_COMMENT	varchar(64)	NO			
 DEFINER	varchar(77)	NO			
 CHARACTER_SET_CLIENT	varchar(32)	NO			
@@ -71,7 +71,7 @@ ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
   `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
   `CREATED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `LAST_ALTERED` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `SQL_MODE` longtext NOT NULL,
+  `SQL_MODE` varchar(8192) NOT NULL DEFAULT '',
   `ROUTINE_COMMENT` varchar(64) NOT NULL DEFAULT '',
   `DEFINER` varchar(77) NOT NULL DEFAULT '',
   `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
@@ -97,7 +97,7 @@ SQL_PATH	varchar(64)	YES		NULL
 SECURITY_TYPE	varchar(7)	NO			
 CREATED	datetime	NO		0000-00-00 00:00:00	
 LAST_ALTERED	datetime	NO		0000-00-00 00:00:00	
-SQL_MODE	longtext	NO		NULL	
+SQL_MODE	varchar(8192)	NO			
 ROUTINE_COMMENT	varchar(64)	NO			
 DEFINER	varchar(77)	NO			
 CHARACTER_SET_CLIENT	varchar(32)	NO			

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

@@ -30,24 +30,24 @@ DESCRIBE          information_schema.SCHEMATA;
 Field	Type	Null	Key	Default	Extra
 CATALOG_NAME	varchar(512)	YES		NULL	
 SCHEMA_NAME	varchar(64)	NO			
-DEFAULT_CHARACTER_SET_NAME	varchar(64)	NO			
-DEFAULT_COLLATION_NAME	varchar(64)	NO			
+DEFAULT_CHARACTER_SET_NAME	varchar(32)	NO			
+DEFAULT_COLLATION_NAME	varchar(32)	NO			
 SQL_PATH	varchar(512)	YES		NULL	
 SHOW CREATE TABLE information_schema.SCHEMATA;
 Table	Create Table
 SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
   `CATALOG_NAME` varchar(512) DEFAULT NULL,
   `SCHEMA_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
-  `DEFAULT_COLLATION_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
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.SCHEMATA;
 Field	Type	Null	Key	Default	Extra
 CATALOG_NAME	varchar(512)	YES		NULL	
 SCHEMA_NAME	varchar(64)	NO			
-DEFAULT_CHARACTER_SET_NAME	varchar(64)	NO			
-DEFAULT_COLLATION_NAME	varchar(64)	NO			
+DEFAULT_CHARACTER_SET_NAME	varchar(32)	NO			
+DEFAULT_COLLATION_NAME	varchar(32)	NO			
 SQL_PATH	varchar(512)	YES		NULL	
 SELECT catalog_name, schema_name, sql_path
 FROM information_schema.schemata

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

@@ -45,7 +45,7 @@ AUTO_INCREMENT	bigint(21) unsigned	YES		NULL
 CREATE_TIME	datetime	YES		NULL	
 UPDATE_TIME	datetime	YES		NULL	
 CHECK_TIME	datetime	YES		NULL	
-TABLE_COLLATION	varchar(64)	YES		NULL	
+TABLE_COLLATION	varchar(32)	YES		NULL	
 CHECKSUM	bigint(21) unsigned	YES		NULL	
 CREATE_OPTIONS	varchar(255)	YES		NULL	
 TABLE_COMMENT	varchar(80)	NO			
@@ -69,7 +69,7 @@ TABLES	CREATE TEMPORARY TABLE `TABLES` (
   `CREATE_TIME` datetime DEFAULT NULL,
   `UPDATE_TIME` datetime DEFAULT NULL,
   `CHECK_TIME` datetime DEFAULT NULL,
-  `TABLE_COLLATION` varchar(64) DEFAULT NULL,
+  `TABLE_COLLATION` varchar(32) DEFAULT NULL,
   `CHECKSUM` bigint(21) unsigned DEFAULT NULL,
   `CREATE_OPTIONS` varchar(255) DEFAULT NULL,
   `TABLE_COMMENT` varchar(80) NOT NULL DEFAULT ''
@@ -93,7 +93,7 @@ AUTO_INCREMENT	bigint(21) unsigned	YES		NULL
 CREATE_TIME	datetime	YES		NULL	
 UPDATE_TIME	datetime	YES		NULL	
 CHECK_TIME	datetime	YES		NULL	
-TABLE_COLLATION	varchar(64)	YES		NULL	
+TABLE_COLLATION	varchar(32)	YES		NULL	
 CHECKSUM	bigint(21) unsigned	YES		NULL	
 CREATE_OPTIONS	varchar(255)	YES		NULL	
 TABLE_COMMENT	varchar(80)	NO			
@@ -310,6 +310,7 @@ SELECT UPDATE_TIME, checksum INTO @UPDATE_TIME, @checksum
 FROM information_schema.tables
 WHERE table_name = 't1_my_tablex';
 INSERT INTO db_datadict.t1_my_tablex SET f1 = 3;
+FLUSH TABLES;
 SELECT UPDATE_TIME > @UPDATE_TIME
 AS "Is current UPDATE_TIME bigger than before last INSERT?"
 FROM information_schema.tables

mysql-test/t/federated_innodb.test

-source include/federated.inc;
+# NOTE:  Keep any include/ files that will kill / skip a test BEFORE any others
+# having federated.inc before have_innodb.inc allows for an orphaned database
+# that can cause other tests to fail.
+# See Bug #40645 Test main.federated_innodb does not always clean up after itself
+
 source include/have_innodb.inc;
+source include/federated.inc;
 
 #
 # Bug#25513 Federated transaction failures

mysql-test/t/information_schema.test

@@ -1346,4 +1346,31 @@ explain select count(*) from information_schema.tables;
 explain select count(*) from information_schema.columns;
 explain select count(*) from information_schema.views;
 
+#
+# Bug#39955 SELECT on INFORMATION_SCHEMA.GLOBAL_VARIABLES takes too long
+#
+set global init_connect="drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;\
+drop table if exists t1;drop table if exists t1;";
+select * from information_schema.global_variables where variable_name='init_connect';
+set global init_connect="";
+
 --echo End of 5.1 tests.

mysql-test/t/information_schema_part.test

@@ -121,3 +121,13 @@ SHOW CREATE TABLE t1;
 SELECT PARTITION_DESCRIPTION FROM information_schema.partitions WHERE
 table_schema = "test" AND table_name = "t1";
 drop table t1;
+
+#
+# Bug#38909 CREATE_OPTIONS in information_schema produces wrong results
+#
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+create table t1 (f1 int key) partition by key(f1) partitions 2;
+select create_options from information_schema.tables where table_schema="test";
+drop table t1;

mysql-test/t/mysqlcheck.test

@@ -71,6 +71,13 @@ drop table t_bug25347;
 drop database d_bug25347;
 use test;
 
+#
+# Bug#39541 CHECK TABLE on information_schema myisam tables produces error
+#
+create view v1 as select * from information_schema.routines;
+check table v1, information_schema.routines;
+drop view v1;
+
 --echo End of 5.0 tests
 
 #

mysys/my_init.c

@@ -320,8 +320,6 @@ static void my_win_init(void)
   const char *targetKey = "Software\\MySQL" ;
   DBUG_ENTER("my_win_init");
 
-  setlocale(LC_CTYPE, "");             /* To get right sortorder */
-
 #if defined(_MSC_VER)
 #if _MSC_VER < 1300
   /* 

sql/sql_table.cc

@@ -4293,6 +4293,12 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
       goto send_result;
     }
 
+    if (table->schema_table)
+    {
+      result_code= HA_ADMIN_NOT_IMPLEMENTED;
+      goto send_result;
+    }
+
     if ((table->table->db_stat & HA_READ_ONLY) && open_for_modify)
     {
       /* purecov: begin inspected */