Post merge fixes after

ChangeSet@1.2561, 2008-03-07 17:44:03+01:00, mleich@five.local.lan +132 -0
  Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
  into  five.local.lan:/work/merge/mysql-5.1-funcs_1
  MERGE: 1.1810.3473.24

ChangeSet@1.1810.3473.24, 2008-03-07
  WL#4203 Reorganize and fix the data dictionary tests of
          testsuite funcs_1

  1. Adjustment of expected results to modified server properties
  2. Add some tests of information_schema views
  3. Minor corrections and improvements


BitKeeper/deleted/.del-ndb__datadict.result:
  Delete: mysql-test/suite/funcs_1/r/ndb__datadict.result
BitKeeper/deleted/.del-ndb__datadict.test:
  Delete: mysql-test/suite/funcs_1/t/ndb__datadict.test
BitKeeper/deleted/.del-ndb__load.test:
  Delete: mysql-test/suite/funcs_1/t/ndb__load.test
BitKeeper/deleted/.del-ndb__load.result:
  Delete: mysql-test/suite/funcs_1/r/ndb__load.result
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
  Make the results independend of amount of preceding tests.
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
  Correct the cleanup
mysql-test/suite/funcs_1/r/charset_collation_1.result:
  Updated results
mysql-test/suite/funcs_1/r/charset_collation_2.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
  Updated results
mysql-test/suite/funcs_1/r/is_basics_mixed.result:
  Updated results
mysql-test/suite/funcs_1/r/is_character_sets.result:
  Updated results
mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result:
  Updated results
mysql-test/suite/funcs_1/r/is_collations.result:
  Updated results
mysql-test/suite/funcs_1/r/is_column_privileges.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_is.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_mysql.result:
  Updated results
mysql-test/suite/funcs_1/r/is_key_column_usage.result:
  Updated results
mysql-test/suite/funcs_1/r/is_routines.result:
  Updated results
mysql-test/suite/funcs_1/r/is_schema_privileges.result:
  Updated results
mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result:
  Updated results
mysql-test/suite/funcs_1/r/is_schemata.result:
  Updated results
mysql-test/suite/funcs_1/r/is_statistics.result:
  Updated results
mysql-test/suite/funcs_1/r/is_statistics_mysql.result:
  Updated results
mysql-test/suite/funcs_1/r/is_table_constraints.result:
  Updated results
mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result:
  Updated results
mysql-test/suite/funcs_1/r/is_table_privileges.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_is.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_mysql.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_triggers.result:
  Updated results
mysql-test/suite/funcs_1/r/is_user_privileges.result:
  Updated results
mysql-test/suite/funcs_1/r/is_views.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_storedproc.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_func_view.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_storedproc.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_storedproc_02.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_storedproc_03.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_storedproc_10.result:
  Updated results
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
  Updated results
mysql-test/suite/funcs_1/r/processlist_priv_ps.result:
  Updated results
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
  Updated results
mysql-test/suite/funcs_1/r/processlist_val_ps.result:
  Updated results
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
  Set subtest checking a no more reserved keyword
  to comment.
mysql-test/suite/funcs_1/t/disabled.def:
  ndb__datadict is dropped. The checks are done in
  other scripts.
mysql-test/suite/funcs_1/t/is_routines.test:
  Correction of comment
mysql-test/suite/funcs_1/t/is_triggers.test:
  Adjustment to changes in privilege system between
  MySQL 5.0 and 5.1.
mysql-test/suite/funcs_1/t/is_views.test:
  Correction of comment.
mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test:
  Correction of comment.
mysql-test/suite/funcs_1/t/processlist_priv_ps.test:
  Correction of comment.
mysql-test/suite/funcs_1/t/processlist_val_no_prot.test:
  Correction of comment.
mysql-test/suite/funcs_1/t/processlist_val_ps.test:
  Correction of comment.
mysql-test/suite/funcs_1/r/is_engines.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_archive.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_blackhole.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_csv.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_federated.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_innodb.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_memory.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_merge.result:
  Expected results
mysql-test/suite/funcs_1/r/is_engines_myisam.result:
  Expected results
mysql-test/suite/funcs_1/t/is_engines.test:
  Test of information_schema.engines
mysql-test/suite/funcs_1/t/is_engines_archive.test:
  Test of information_schema.engines
      Variant for ARCHIVE
mysql-test/suite/funcs_1/t/is_engines_blackhole.test:
  Test of information_schema.engines
      Variant for BLACKHOLE
mysql-test/suite/funcs_1/t/is_engines_csv.test:
  Test of information_schema.engines
      Variant for CSV
mysql-test/suite/funcs_1/t/is_engines_federated.test:
  Test of information_schema.engines
      Variant for FEDERATED
mysql-test/suite/funcs_1/t/is_engines_innodb.test:
  Test of information_schema.engines
      Variant for InnoDB
mysql-test/suite/funcs_1/t/is_engines_memory.test:
  Test of information_schema.engines
      Variant for MEMORY
mysql-test/suite/funcs_1/t/is_engines_merge.test:
  Test of information_schema.engines
      Variant for MERGGE
mysql-test/suite/funcs_1/t/is_engines_myisam.test:
  Test of information_schema.engines
      Variant for MyISAM
mysql-test/suite/funcs_1/t/is_engines_ndb.test:
  Test of information_schema.engines
      Variant for NDB
mysql-test/suite/funcs_1/t/is_events.test:
  Test for information_schema.events
mysql-test/suite/funcs_1/r/is_engines_ndb.result:
  Expected results
mysql-test/suite/funcs_1/r/is_events.result:
  Expected results

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

@@ -112,11 +112,11 @@ connect (con100,localhost,ddicttestuser1,ddictpass,information_schema);
 --echo ####################################################################################
 connection default;
 eval SHOW CREATE TABLE $table;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 eval SHOW $table;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 eval SELECT * FROM $table $select_where ORDER BY id;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 eval SELECT $columns FROM $table $select_where ORDER BY id;
 --source suite/funcs_1/datadict/datadict_priv.inc
 --real_sleep 0.3
@@ -128,11 +128,11 @@ connection con100;
 --echo   SHOW/SELECT shows only the processes (1) of the user.
 --echo ####################################################################################
 eval SHOW CREATE TABLE $table;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 eval SHOW $table;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 eval SELECT * FROM $table $select_where ORDER BY id;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 eval SELECT $columns FROM $table $select_where ORDER BY id;
 --source suite/funcs_1/datadict/datadict_priv.inc
 --real_sleep 0.3
@@ -154,9 +154,9 @@ GRANT PROCESS ON *.* TO ddicttestuser1@'localhost' IDENTIFIED BY 'ddictpass';
 --echo ####################################################################################
 connection con100;
 SHOW GRANTS;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SHOW processlist;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -166,9 +166,9 @@ SELECT * FROM information_schema.processlist;
 --echo ####################################################################################
 connect (con101,localhost,ddicttestuser1,ddictpass,information_schema);
 SHOW GRANTS;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SHOW processlist;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -188,9 +188,9 @@ GRANT PROCESS ON *.* TO ''@'localhost';
 --echo ####################################################################################
 connect (anonymous1,localhost,'',,information_schema);
 SHOW GRANTS;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SHOW processlist;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -210,9 +210,9 @@ connect (con102,localhost,ddicttestuser1,ddictpass,information_schema);
 --echo     ddicttestuser1 are visible.
 --echo ####################################################################################
 SHOW GRANTS;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SHOW processlist;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -235,10 +235,10 @@ SHOW GRANTS FOR ''@'localhost';
 if ($fixed_bug_30395)
 {
 # Bug#30395 strange results after REVOKE PROCESS ON *.* FROM ...
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SHOW processlist;
 }
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -257,9 +257,9 @@ connect (con103,localhost,ddicttestuser1,ddictpass,information_schema);
 --echo     Only the processes of ddicttestuser1 user are visible.
 --echo ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SHOW processlist;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -279,9 +279,9 @@ connect (con104,localhost,ddicttestuser1,ddictpass,information_schema);
 --echo     Only the processes of ddicttestuser1 are visible.
 --echo ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SHOW processlist;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -326,9 +326,9 @@ connect (con200,localhost,ddicttestuser2,ddictpass,information_schema);
 --echo      ddicttestuser2 has now the PROCESS privilege and sees all connections
 --echo ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser2'@'localhost';
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SHOW processlist;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -347,9 +347,9 @@ connect (con201,localhost,ddicttestuser2,ddictpass,information_schema);
 --echo      ddicttestuser2 has no more the PROCESS privilege and can only see own connects
 --echo ####################################################################################
 SHOW GRANTS;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SHOW processlist;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -370,9 +370,9 @@ connect (con107,localhost,ddicttestuser1,ddictpass,information_schema);
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
 --error ER_ACCESS_DENIED_ERROR
 GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SHOW processlist;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 
@@ -394,9 +394,9 @@ connect (con108,localhost,ddicttestuser1,ddictpass,information_schema);
 --echo      Therefore the missing SELECT privilege does not affect SELECTs on PROCESSLIST.
 --echo ####################################################################################
 SHOW GRANTS FOR 'ddicttestuser1'@'localhost';
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SHOW processlist;
---replace_column 6 TIME
+--replace_column 1 ID 6 TIME
 SELECT * FROM information_schema.processlist;
 --real_sleep 0.3
 

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

@@ -306,3 +306,4 @@ connection default;
 --echo ----- close connection ddicttestuser1 -----
 disconnect ddicttestuser1;
 DROP USER ddicttestuser1@'localhost';
+DROP TABLE test.t1;

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

@@ -58,6 +58,7 @@ cp1250_bin	cp1250	66		Yes	1
 cp1250_croatian_ci	cp1250	44		Yes	1
 cp1250_czech_cs	cp1250	34		Yes	2
 cp1250_general_ci	cp1250	26	Yes	Yes	1
+cp1250_polish_ci	cp1250	99		Yes	1
 cp1251_bin	cp1251	50			0
 cp1251_bulgarian_ci	cp1251	14			0
 cp1251_general_ci	cp1251	51	Yes		0
@@ -190,6 +191,7 @@ cp1250_bin	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_general_ci	cp1250
+cp1250_polish_ci	cp1250
 cp1251_bin	cp1251
 cp1251_bulgarian_ci	cp1251
 cp1251_general_ci	cp1251
@@ -214,6 +216,7 @@ eucjpms_bin	eucjpms
 eucjpms_japanese_ci	eucjpms
 euckr_bin	euckr
 euckr_korean_ci	euckr
+filename	filename
 gb2312_bin	gb2312
 gb2312_chinese_ci	gb2312
 gbk_bin	gbk

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

@@ -58,6 +58,7 @@ cp1250_bin	cp1250	66		Yes	1
 cp1250_croatian_ci	cp1250	44		Yes	1
 cp1250_czech_cs	cp1250	34		Yes	2
 cp1250_general_ci	cp1250	26	Yes	Yes	1
+cp1250_polish_ci	cp1250	99		Yes	1
 cp1251_bin	cp1251	50			0
 cp1251_bulgarian_ci	cp1251	14			0
 cp1251_general_ci	cp1251	51	Yes		0
@@ -191,6 +192,7 @@ cp1250_bin	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_general_ci	cp1250
+cp1250_polish_ci	cp1250
 cp1251_bin	cp1251
 cp1251_bulgarian_ci	cp1251
 cp1251_general_ci	cp1251
@@ -215,6 +217,7 @@ eucjpms_bin	eucjpms
 eucjpms_japanese_ci	eucjpms
 euckr_bin	euckr
 euckr_korean_ci	euckr
+filename	filename
 gb2312_bin	gb2312
 gb2312_chinese_ci	gb2312
 gbk_bin	gbk

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

@@ -328,7 +328,7 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_
 SELECT table_schema,table_name FROM information_schema.tables
 WHERE table_schema = 'information_schema' AND table_name = 'tables';
 table_schema	table_name
-information_schema	TABLES
+information_schema	tables
 SELECT * FROM information_schema.table_privileges
 WHERE table_schema = 'information_schema';
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE

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

@@ -35,10 +35,10 @@ 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 '',
-  `DESCRIPTION` varchar(60) NOT NULL default '',
-  `MAXLEN` bigint(3) NOT NULL default '0'
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATE_NAME` varchar(64) 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

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

@@ -33,8 +33,8 @@ CHARACTER_SET_NAME	varchar(64)	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(64) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.COLLATION_CHARACTER_SET_APPLICABILITY;
 Field	Type	Null	Key	Default	Extra

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

@@ -37,12 +37,12 @@ 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 '',
-  `ID` bigint(11) NOT NULL default '0',
-  `IS_DEFAULT` varchar(3) NOT NULL default '',
-  `IS_COMPILED` varchar(3) NOT NULL default '',
-  `SORTLEN` bigint(3) NOT NULL default '0'
+  `COLLATION_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ID` bigint(11) NOT NULL DEFAULT '0',
+  `IS_DEFAULT` varchar(3) NOT NULL DEFAULT '',
+  `IS_COMPILED` varchar(3) NOT NULL DEFAULT '',
+  `SORTLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.COLLATIONS;
 Field	Type	Null	Key	Default	Extra

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

@@ -38,13 +38,13 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE information_schema.COLUMN_PRIVILEGES;
 Table	Create Table
 COLUMN_PRIVILEGES	CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(512) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(512) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.COLUMN_PRIVILEGES;
 Field	Type	Null	Key	Default	Extra
@@ -141,6 +141,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser3'@'localhost'	NULL	db_datadict	CREATE VIEW	NO
 'testuser3'@'localhost'	NULL	db_datadict	DELETE	NO
 'testuser3'@'localhost'	NULL	db_datadict	DROP	NO
+'testuser3'@'localhost'	NULL	db_datadict	EVENT	NO
 'testuser3'@'localhost'	NULL	db_datadict	EXECUTE	NO
 'testuser3'@'localhost'	NULL	db_datadict	INDEX	NO
 'testuser3'@'localhost'	NULL	db_datadict	INSERT	NO
@@ -148,6 +149,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser3'@'localhost'	NULL	db_datadict	REFERENCES	NO
 'testuser3'@'localhost'	NULL	db_datadict	SELECT	NO
 'testuser3'@'localhost'	NULL	db_datadict	SHOW VIEW	NO
+'testuser3'@'localhost'	NULL	db_datadict	TRIGGER	NO
 'testuser3'@'localhost'	NULL	db_datadict	UPDATE	NO
 SELECT * FROM information_schema.column_privileges
 WHERE grantee LIKE '''testuser%'''

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

@@ -32,43 +32,43 @@ TABLE_CATALOG	varchar(512)	YES		NULL
 TABLE_SCHEMA	varchar(64)	NO			
 TABLE_NAME	varchar(64)	NO			
 COLUMN_NAME	varchar(64)	NO			
-ORDINAL_POSITION	bigint(21)	NO		0	
+ORDINAL_POSITION	bigint(21) unsigned	NO		0	
 COLUMN_DEFAULT	longtext	YES		NULL	
 IS_NULLABLE	varchar(3)	NO			
 DATA_TYPE	varchar(64)	NO			
-CHARACTER_MAXIMUM_LENGTH	bigint(21)	YES		NULL	
-CHARACTER_OCTET_LENGTH	bigint(21)	YES		NULL	
-NUMERIC_PRECISION	bigint(21)	YES		NULL	
-NUMERIC_SCALE	bigint(21)	YES		NULL	
+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	
 COLUMN_TYPE	longtext	NO		NULL	
 COLUMN_KEY	varchar(3)	NO			
-EXTRA	varchar(20)	NO			
+EXTRA	varchar(27)	NO			
 PRIVILEGES	varchar(80)	NO			
 COLUMN_COMMENT	varchar(255)	NO			
 SHOW CREATE TABLE information_schema.COLUMNS;
 Table	Create Table
 COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
-  `TABLE_CATALOG` varchar(512) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `ORDINAL_POSITION` bigint(21) NOT NULL default '0',
+  `TABLE_CATALOG` varchar(512) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ORDINAL_POSITION` bigint(21) unsigned NOT NULL DEFAULT '0',
   `COLUMN_DEFAULT` longtext,
-  `IS_NULLABLE` varchar(3) NOT NULL default '',
-  `DATA_TYPE` varchar(64) NOT NULL default '',
-  `CHARACTER_MAXIMUM_LENGTH` bigint(21) default NULL,
-  `CHARACTER_OCTET_LENGTH` bigint(21) default NULL,
-  `NUMERIC_PRECISION` bigint(21) default NULL,
-  `NUMERIC_SCALE` bigint(21) default NULL,
-  `CHARACTER_SET_NAME` varchar(64) default NULL,
-  `COLLATION_NAME` varchar(64) default NULL,
+  `IS_NULLABLE` varchar(3) NOT NULL DEFAULT '',
+  `DATA_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `CHARACTER_MAXIMUM_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `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,
   `COLUMN_TYPE` longtext NOT NULL,
-  `COLUMN_KEY` varchar(3) NOT NULL default '',
-  `EXTRA` varchar(20) NOT NULL default '',
-  `PRIVILEGES` varchar(80) NOT NULL default '',
-  `COLUMN_COMMENT` varchar(255) NOT NULL default ''
+  `COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
+  `EXTRA` varchar(27) NOT NULL DEFAULT '',
+  `PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
+  `COLUMN_COMMENT` varchar(255) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.COLUMNS;
 Field	Type	Null	Key	Default	Extra
@@ -76,19 +76,19 @@ TABLE_CATALOG	varchar(512)	YES		NULL
 TABLE_SCHEMA	varchar(64)	NO			
 TABLE_NAME	varchar(64)	NO			
 COLUMN_NAME	varchar(64)	NO			
-ORDINAL_POSITION	bigint(21)	NO		0	
+ORDINAL_POSITION	bigint(21) unsigned	NO		0	
 COLUMN_DEFAULT	longtext	YES		NULL	
 IS_NULLABLE	varchar(3)	NO			
 DATA_TYPE	varchar(64)	NO			
-CHARACTER_MAXIMUM_LENGTH	bigint(21)	YES		NULL	
-CHARACTER_OCTET_LENGTH	bigint(21)	YES		NULL	
-NUMERIC_PRECISION	bigint(21)	YES		NULL	
-NUMERIC_SCALE	bigint(21)	YES		NULL	
+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	
 COLUMN_TYPE	longtext	NO		NULL	
 COLUMN_KEY	varchar(3)	NO			
-EXTRA	varchar(20)	NO			
+EXTRA	varchar(27)	NO			
 PRIVILEGES	varchar(80)	NO			
 COLUMN_COMMENT	varchar(255)	NO			
 SELECT table_catalog, table_schema, table_name, column_name

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

@@ -629,7 +629,7 @@ NULL	test	tb4	f217	42	NULL	YES	double unsigned zerofill	NULL	NULL	22	NULL	NULL	N
 NULL	test	tb4	f218	43	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
 NULL	test	tb4	f219	44	NULL	YES	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
 NULL	test	tb4	f220	45	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	test	tb4	f221	46	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	test	tb4	f221	46	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP	select,insert,update,references	
 NULL	test	tb4	f222	47	NULL	YES	year	NULL	NULL	NULL	NULL	NULL	NULL	year(4)			select,insert,update,references	
 NULL	test	tb4	f223	48	NULL	YES	year	NULL	NULL	NULL	NULL	NULL	NULL	year(4)			select,insert,update,references	
 NULL	test	tb4	f224	49	NULL	YES	year	NULL	NULL	NULL	NULL	NULL	NULL	year(4)			select,insert,update,references	

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

@@ -15,8 +15,8 @@ NULL	information_schema	COLLATIONS	IS_DEFAULT	4		NO	varchar	3	9	NULL	NULL	utf8	u
 NULL	information_schema	COLLATIONS	SORTLEN	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(3)			select	
 NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	CHARACTER_SET_NAME	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	COLLATION_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_COMMENT	19		NO	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
@@ -25,11 +25,11 @@ NULL	information_schema	COLUMNS	COLUMN_KEY	16		NO	varchar	3	9	NULL	NULL	utf8	utf
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_TYPE	15	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	EXTRA	17		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	COLUMNS	EXTRA	17		NO	varchar	27	81	NULL	NULL	utf8	utf8_general_ci	varchar(27)			select	
 NULL	information_schema	COLUMNS	IS_NULLABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	COLUMNS	PRIVILEGES	18		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -41,6 +41,78 @@ NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NU
 NULL	information_schema	COLUMN_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	TRANSACTIONS	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	XA	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	EVENTS	CHARACTER_SET_CLIENT	22		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
+NULL	information_schema	EVENTS	COLLATION_CONNECTION	23		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
+NULL	information_schema	EVENTS	CREATED	17	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	DATABASE_COLLATION	24		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
+NULL	information_schema	EVENTS	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	EVENTS	EVENT_CATALOG	1	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_DEFINITION	7	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
+NULL	information_schema	EVENTS	EXECUTE_AT	9	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	INTERVAL_FIELD	11	NULL	YES	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	INTERVAL_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			select	
+NULL	information_schema	EVENTS	LAST_ALTERED	18	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	LAST_EXECUTED	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			select	
+NULL	information_schema	EVENTS	SQL_MODE	12	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	EVENTS	STARTS	13	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	EVENTS	STATUS	15		NO	varchar	18	54	NULL	NULL	utf8	utf8_general_ci	varchar(18)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	AVG_ROW_LENGTH	28	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CREATION_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	DATA_FREE	32	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DATA_LENGTH	29	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	DELETED_ROWS	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
+NULL	information_schema	FILES	FILE_ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FILE_NAME	2	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	FILE_TYPE	3		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	FULLTEXT_KEYS	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	INITIAL_SIZE	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LAST_UPDATE_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NAME	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	MAX_DATA_LENGTH	30	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	ROW_FORMAT	26	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	TABLESPACE_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_CATALOG	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_NAME	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TABLE_ROWS	27	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	TABLE_SCHEMA	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TRANSACTION_COUNTER	24	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	UPDATE_COUNT	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	2	NULL	YES	varchar	20480	61440	NULL	NULL	utf8	utf8_general_ci	varchar(20480)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	2	NULL	YES	varchar	20480	61440	NULL	NULL	utf8	utf8_general_ci	varchar(20480)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	COLUMN_NAME	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -53,7 +125,64 @@ NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	var
 NULL	information_schema	KEY_COLUMN_USAGE	TABLE_CATALOG	4	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	TABLE_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	TABLE_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	14	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	DATA_FREE	18	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	DATA_LENGTH	15	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	16	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	PARTITION_COMMENT	23		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PARTITIONS	PARTITION_DESCRIPTION	12	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	PARTITION_EXPRESSION	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	PARTITION_METHOD	8	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	PARTITION_NAME	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_NAME	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	TABLESPACE_NAME	25	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
+NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	7	NULL	YES	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_STATUS	3		NO	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE	4		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	5		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	PROCESSLIST	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	DB	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	PROCESSLIST	STATE	7	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	9		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	7		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	11		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	4	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ROUTINES	CHARACTER_SET_CLIENT	21		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
+NULL	information_schema	ROUTINES	COLLATION_CONNECTION	22		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
 NULL	information_schema	ROUTINES	CREATED	16	0000-00-00 00:00:00	NO	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	ROUTINES	DATABASE_COLLATION	23		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
 NULL	information_schema	ROUTINES	DEFINER	20		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
 NULL	information_schema	ROUTINES	DTD_IDENTIFIER	6	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	EXTERNAL_LANGUAGE	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -83,6 +212,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NU
 NULL	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	2	NULL	YES	varchar	20480	61440	NULL	NULL	utf8	utf8_general_ci	varchar(20480)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	2	NULL	YES	varchar	20480	61440	NULL	NULL	utf8	utf8_general_ci	varchar(20480)			select	
 NULL	information_schema	STATISTICS	CARDINALITY	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
 NULL	information_schema	STATISTICS	COLLATION	9	NULL	YES	varchar	1	3	NULL	NULL	utf8	utf8_general_ci	varchar(1)			select	
 NULL	information_schema	STATISTICS	COLUMN_NAME	8		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -98,27 +231,27 @@ NULL	information_schema	STATISTICS	SUB_PART	11	NULL	YES	bigint	NULL	NULL	19	0	NU
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select	
 NULL	information_schema	TABLES	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
 NULL	information_schema	TABLES	TABLE_CATALOG	1	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
 NULL	information_schema	TABLES	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLES	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select	
+NULL	information_schema	TABLES	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -140,7 +273,10 @@ NULL	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_ROW	15		NO	varchar	3	9	NUL
 NULL	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_TABLE	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	TRIGGERS	ACTION_STATEMENT	10	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	TRIGGERS	ACTION_TIMING	12		NO	varchar	6	18	NULL	NULL	utf8	utf8_general_ci	varchar(6)			select	
+NULL	information_schema	TRIGGERS	CHARACTER_SET_CLIENT	20		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
+NULL	information_schema	TRIGGERS	COLLATION_CONNECTION	21		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
 NULL	information_schema	TRIGGERS	CREATED	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	TRIGGERS	DATABASE_COLLATION	22		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
 NULL	information_schema	TRIGGERS	DEFINER	19	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	TRIGGERS	EVENT_MANIPULATION	4		NO	varchar	6	18	NULL	NULL	utf8	utf8_general_ci	varchar(6)			select	
 NULL	information_schema	TRIGGERS	EVENT_OBJECT_CATALOG	5	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
@@ -154,7 +290,9 @@ NULL	information_schema	USER_PRIVILEGES	GRANTEE	1		NO	varchar	81	243	NULL	NULL	u
 NULL	information_schema	USER_PRIVILEGES	IS_GRANTABLE	4		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	USER_PRIVILEGES	PRIVILEGE_TYPE	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	USER_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
+NULL	information_schema	VIEWS	CHARACTER_SET_CLIENT	9		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
 NULL	information_schema	VIEWS	CHECK_OPTION	5		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	VIEWS	COLLATION_CONNECTION	10		NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
 NULL	information_schema	VIEWS	DEFINER	7		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
 NULL	information_schema	VIEWS	IS_UPDATABLE	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 NULL	information_schema	VIEWS	SECURITY_TYPE	8		NO	varchar	7	21	NULL	NULL	utf8	utf8_general_ci	varchar(7)			select	
@@ -235,19 +373,19 @@ NULL	information_schema	COLLATIONS	SORTLEN	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	COLUMNS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 1.0000	information_schema	COLUMNS	COLUMN_DEFAULT	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	COLUMNS	IS_NULLABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	COLUMNS	DATA_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	COLUMNS	NUMERIC_PRECISION	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	CHARACTER_OCTET_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	NUMERIC_PRECISION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 3.0000	information_schema	COLUMNS	CHARACTER_SET_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMNS	COLLATION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 1.0000	information_schema	COLUMNS	COLUMN_TYPE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	COLUMNS	COLUMN_KEY	varchar	3	9	utf8	utf8_general_ci	varchar(3)
-3.0000	information_schema	COLUMNS	EXTRA	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	COLUMNS	EXTRA	varchar	27	81	utf8	utf8_general_ci	varchar(27)
 3.0000	information_schema	COLUMNS	PRIVILEGES	varchar	80	240	utf8	utf8_general_ci	varchar(80)
 3.0000	information_schema	COLUMNS	COLUMN_COMMENT	varchar	255	765	utf8	utf8_general_ci	varchar(255)
 3.0000	information_schema	COLUMN_PRIVILEGES	GRANTEE	varchar	81	243	utf8	utf8_general_ci	varchar(81)
@@ -257,6 +395,78 @@ NULL	information_schema	COLUMNS	NUMERIC_SCALE	bigint	NULL	NULL	NULL	NULL	bigint(
 3.0000	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	ENGINES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	ENGINES	SUPPORT	varchar	8	24	utf8	utf8_general_ci	varchar(8)
+3.0000	information_schema	ENGINES	COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+3.0000	information_schema	ENGINES	TRANSACTIONS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	ENGINES	XA	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	ENGINES	SAVEPOINTS	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	EVENTS	EVENT_CATALOG	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	EVENT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	EVENT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	DEFINER	varchar	77	231	utf8	utf8_general_ci	varchar(77)
+3.0000	information_schema	EVENTS	TIME_ZONE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	EVENTS	EVENT_BODY	varchar	8	24	utf8	utf8_general_ci	varchar(8)
+1.0000	information_schema	EVENTS	EVENT_DEFINITION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	EVENTS	EVENT_TYPE	varchar	9	27	utf8	utf8_general_ci	varchar(9)
+NULL	information_schema	EVENTS	EXECUTE_AT	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	information_schema	EVENTS	INTERVAL_VALUE	varchar	256	768	utf8	utf8_general_ci	varchar(256)
+3.0000	information_schema	EVENTS	INTERVAL_FIELD	varchar	18	54	utf8	utf8_general_ci	varchar(18)
+1.0000	information_schema	EVENTS	SQL_MODE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+NULL	information_schema	EVENTS	STARTS	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	EVENTS	ENDS	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	information_schema	EVENTS	STATUS	varchar	18	54	utf8	utf8_general_ci	varchar(18)
+3.0000	information_schema	EVENTS	ON_COMPLETION	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+NULL	information_schema	EVENTS	CREATED	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	EVENTS	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	EVENTS	LAST_EXECUTED	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	information_schema	EVENTS	EVENT_COMMENT	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	EVENTS	ORIGINATOR	bigint	NULL	NULL	NULL	NULL	bigint(10)
+3.0000	information_schema	EVENTS	CHARACTER_SET_CLIENT	varchar	32	96	utf8	utf8_general_ci	varchar(32)
+3.0000	information_schema	EVENTS	COLLATION_CONNECTION	varchar	32	96	utf8	utf8_general_ci	varchar(32)
+3.0000	information_schema	EVENTS	DATABASE_COLLATION	varchar	32	96	utf8	utf8_general_ci	varchar(32)
+NULL	information_schema	FILES	FILE_ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
+3.0000	information_schema	FILES	FILE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	FILE_TYPE	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	FILES	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	TABLE_CATALOG	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	LOGFILE_GROUP_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	FILES	LOGFILE_GROUP_NUMBER	bigint	NULL	NULL	NULL	NULL	bigint(4)
+3.0000	information_schema	FILES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	FILES	FULLTEXT_KEYS	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	FILES	DELETED_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	UPDATE_COUNT	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	FREE_EXTENTS	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	TOTAL_EXTENTS	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	EXTENT_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	INITIAL_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	MAXIMUM_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	AUTOEXTEND_SIZE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	CREATION_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	LAST_UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	LAST_ACCESS_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	RECOVER_TIME	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	TRANSACTION_COUNTER	bigint	NULL	NULL	NULL	NULL	bigint(4)
+NULL	information_schema	FILES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	FILES	ROW_FORMAT	varchar	10	30	utf8	utf8_general_ci	varchar(10)
+NULL	information_schema	FILES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	FILES	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	FILES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	FILES	STATUS	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	FILES	EXTRA	varchar	255	765	utf8	utf8_general_ci	varchar(255)
+3.0000	information_schema	GLOBAL_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	varchar	20480	61440	utf8	utf8_general_ci	varchar(20480)
+3.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	varchar	20480	61440	utf8	utf8_general_ci	varchar(20480)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -269,6 +479,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint	NU
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	TABLE_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
+3.0000	information_schema	PARTITIONS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	PARTITION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PARTITIONS	SUBPARTITION_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+NULL	information_schema	PARTITIONS	PARTITION_ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	PARTITIONS	PARTITION_METHOD	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+3.0000	information_schema	PARTITIONS	SUBPARTITION_METHOD	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+1.0000	information_schema	PARTITIONS	PARTITION_EXPRESSION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+1.0000	information_schema	PARTITIONS	SUBPARTITION_EXPRESSION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+1.0000	information_schema	PARTITIONS	PARTITION_DESCRIPTION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+NULL	information_schema	PARTITIONS	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	PARTITIONS	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	PARTITIONS	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	PARTITIONS	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	information_schema	PARTITIONS	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+3.0000	information_schema	PARTITIONS	PARTITION_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+3.0000	information_schema	PARTITIONS	NODEGROUP	varchar	12	36	utf8	utf8_general_ci	varchar(12)
+3.0000	information_schema	PARTITIONS	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PLUGINS	PLUGIN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PLUGINS	PLUGIN_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	PLUGINS	PLUGIN_STATUS	varchar	10	30	utf8	utf8_general_ci	varchar(10)
+3.0000	information_schema	PLUGINS	PLUGIN_TYPE	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+3.0000	information_schema	PLUGINS	PLUGIN_TYPE_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	PLUGINS	PLUGIN_LIBRARY	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PLUGINS	PLUGIN_LIBRARY_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
+3.0000	information_schema	PLUGINS	PLUGIN_AUTHOR	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	PLUGINS	PLUGIN_DESCRIPTION	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	PLUGINS	PLUGIN_LICENSE	varchar	80	240	utf8	utf8_general_ci	varchar(80)
+NULL	information_schema	PROCESSLIST	ID	bigint	NULL	NULL	NULL	NULL	bigint(4)
+3.0000	information_schema	PROCESSLIST	USER	varchar	16	48	utf8	utf8_general_ci	varchar(16)
+3.0000	information_schema	PROCESSLIST	HOST	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PROCESSLIST	DB	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	PROCESSLIST	COMMAND	varchar	16	48	utf8	utf8_general_ci	varchar(16)
+NULL	information_schema	PROCESSLIST	TIME	bigint	NULL	NULL	NULL	NULL	bigint(7)
+3.0000	information_schema	PROCESSLIST	STATE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	PROCESSLIST	INFO	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	SPECIFIC_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	ROUTINE_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 3.0000	information_schema	ROUTINES	ROUTINE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -289,6 +553,9 @@ NULL	information_schema	ROUTINES	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datet
 1.0000	information_schema	ROUTINES	SQL_MODE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	ROUTINES	ROUTINE_COMMENT	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	ROUTINES	DEFINER	varchar	77	231	utf8	utf8_general_ci	varchar(77)
+3.0000	information_schema	ROUTINES	CHARACTER_SET_CLIENT	varchar	32	96	utf8	utf8_general_ci	varchar(32)
+3.0000	information_schema	ROUTINES	COLLATION_CONNECTION	varchar	32	96	utf8	utf8_general_ci	varchar(32)
+3.0000	information_schema	ROUTINES	DATABASE_COLLATION	varchar	32	96	utf8	utf8_general_ci	varchar(32)
 3.0000	information_schema	SCHEMATA	CATALOG_NAME	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 3.0000	information_schema	SCHEMATA	SCHEMA_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMATA	DEFAULT_CHARACTER_SET_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -299,6 +566,10 @@ NULL	information_schema	ROUTINES	LAST_ALTERED	datetime	NULL	NULL	NULL	NULL	datet
 3.0000	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
+3.0000	information_schema	SESSION_STATUS	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	SESSION_STATUS	VARIABLE_VALUE	varchar	20480	61440	utf8	utf8_general_ci	varchar(20480)
+3.0000	information_schema	SESSION_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+3.0000	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	varchar	20480	61440	utf8	utf8_general_ci	varchar(20480)
 3.0000	information_schema	STATISTICS	TABLE_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 3.0000	information_schema	STATISTICS	TABLE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	STATISTICS	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -319,20 +590,20 @@ NULL	information_schema	STATISTICS	SUB_PART	bigint	NULL	NULL	NULL	NULL	bigint(3)
 3.0000	information_schema	TABLES	TABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TABLES	TABLE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	TABLES	ENGINE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	TABLES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	VERSION	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 3.0000	information_schema	TABLES	ROW_FORMAT	varchar	10	30	utf8	utf8_general_ci	varchar(10)
-NULL	information_schema	TABLES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21)
-NULL	information_schema	TABLES	AUTO_INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	TABLE_ROWS	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	AVG_ROW_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	MAX_DATA_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	INDEX_LENGTH	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	DATA_FREE	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
+NULL	information_schema	TABLES	AUTO_INCREMENT	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 NULL	information_schema	TABLES	CREATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	TABLES	UPDATE_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 NULL	information_schema	TABLES	CHECK_TIME	datetime	NULL	NULL	NULL	NULL	datetime
 3.0000	information_schema	TABLES	TABLE_COLLATION	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	TABLES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21)
+NULL	information_schema	TABLES	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21) unsigned
 3.0000	information_schema	TABLES	CREATE_OPTIONS	varchar	255	765	utf8	utf8_general_ci	varchar(255)
 3.0000	information_schema	TABLES	TABLE_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
 3.0000	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
@@ -366,6 +637,9 @@ NULL	information_schema	TRIGGERS	ACTION_ORDER	bigint	NULL	NULL	NULL	NULL	bigint(
 NULL	information_schema	TRIGGERS	CREATED	datetime	NULL	NULL	NULL	NULL	datetime
 1.0000	information_schema	TRIGGERS	SQL_MODE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 1.0000	information_schema	TRIGGERS	DEFINER	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
+3.0000	information_schema	TRIGGERS	CHARACTER_SET_CLIENT	varchar	32	96	utf8	utf8_general_ci	varchar(32)
+3.0000	information_schema	TRIGGERS	COLLATION_CONNECTION	varchar	32	96	utf8	utf8_general_ci	varchar(32)
+3.0000	information_schema	TRIGGERS	DATABASE_COLLATION	varchar	32	96	utf8	utf8_general_ci	varchar(32)
 3.0000	information_schema	USER_PRIVILEGES	GRANTEE	varchar	81	243	utf8	utf8_general_ci	varchar(81)
 3.0000	information_schema	USER_PRIVILEGES	TABLE_CATALOG	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
 3.0000	information_schema	USER_PRIVILEGES	PRIVILEGE_TYPE	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -378,3 +652,5 @@ NULL	information_schema	TRIGGERS	CREATED	datetime	NULL	NULL	NULL	NULL	datetime
 3.0000	information_schema	VIEWS	IS_UPDATABLE	varchar	3	9	utf8	utf8_general_ci	varchar(3)
 3.0000	information_schema	VIEWS	DEFINER	varchar	77	231	utf8	utf8_general_ci	varchar(77)
 3.0000	information_schema	VIEWS	SECURITY_TYPE	varchar	7	21	utf8	utf8_general_ci	varchar(7)
+3.0000	information_schema	VIEWS	CHARACTER_SET_CLIENT	varchar	32	96	utf8	utf8_general_ci	varchar(32)
+3.0000	information_schema	VIEWS	COLLATION_CONNECTION	varchar	32	96	utf8	utf8_general_ci	varchar(32)

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

@@ -604,7 +604,7 @@ NULL	test	tb4	f217	42	NULL	YES	double unsigned zerofill	NULL	NULL	22	NULL	NULL	N
 NULL	test	tb4	f218	43	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
 NULL	test	tb4	f219	44	NULL	YES	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
 NULL	test	tb4	f220	45	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	test	tb4	f221	46	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	test	tb4	f221	46	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP	select,insert,update,references	
 NULL	test	tb4	f222	47	NULL	YES	year	NULL	NULL	NULL	NULL	NULL	NULL	year(4)			select,insert,update,references	
 NULL	test	tb4	f223	48	NULL	YES	year	NULL	NULL	NULL	NULL	NULL	NULL	year(4)			select,insert,update,references	
 NULL	test	tb4	f224	49	NULL	YES	year	NULL	NULL	NULL	NULL	NULL	NULL	year(4)			select,insert,update,references	

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

@@ -666,7 +666,7 @@ NULL	test	tb4	f217	42	NULL	YES	double unsigned zerofill	NULL	NULL	22	NULL	NULL	N
 NULL	test	tb4	f218	43	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
 NULL	test	tb4	f219	44	NULL	YES	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
 NULL	test	tb4	f220	45	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
-NULL	test	tb4	f221	46	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	test	tb4	f221	46	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP	select,insert,update,references	
 NULL	test	tb4	f222	47	NULL	YES	year	NULL	NULL	NULL	NULL	NULL	NULL	year(4)			select,insert,update,references	
 NULL	test	tb4	f223	48	NULL	YES	year	NULL	NULL	NULL	NULL	NULL	NULL	year(4)			select,insert,update,references	
 NULL	test	tb4	f224	49	NULL	YES	year	NULL	NULL	NULL	NULL	NULL	NULL	year(4)			select,insert,update,references	

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

@@ -7,7 +7,7 @@ NULL	mysql	columns_priv	Column_priv	7		NO	set	31	93	NULL	NULL	utf8	utf8_general_
 NULL	mysql	columns_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	columns_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
 NULL	mysql	columns_priv	Table_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
-NULL	mysql	columns_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	columns_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP	select,insert,update,references	
 NULL	mysql	columns_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
 NULL	mysql	db	Alter_priv	13	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Alter_routine_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
@@ -18,6 +18,7 @@ NULL	mysql	db	Create_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	db	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	db	Delete_priv	7	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Drop_priv	9	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	db	Event_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Execute_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Grant_priv	10	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
@@ -27,12 +28,41 @@ NULL	mysql	db	Lock_tables_priv	15	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	db	References_priv	11	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Select_priv	4	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	db	Trigger_priv	22	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	Update_priv	6	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	db	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
+NULL	mysql	event	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	event	body_utf8	22	NULL	YES	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	event	character_set_client	19	NULL	YES	char	32	96	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references	
+NULL	mysql	event	collation_connection	20	NULL	YES	char	32	96	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references	
+NULL	mysql	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
+NULL	mysql	event	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP	select,insert,update,references	
+NULL	mysql	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
+NULL	mysql	event	db_collation	21	NULL	YES	char	32	96	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references	
+NULL	mysql	event	definer	4		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
+NULL	mysql	event	ends	12	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	interval_field	7	NULL	YES	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')			select,insert,update,references	
+NULL	mysql	event	interval_value	6	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	event	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	modified	9	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	event	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
+NULL	mysql	event	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
+NULL	mysql	event	originator	17	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10)			select,insert,update,references	
+NULL	mysql	event	sql_mode	15		NO	set	478	1434	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH')			select,insert,update,references	
+NULL	mysql	event	starts	11	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
+NULL	mysql	event	status	13	ENABLED	NO	enum	18	54	NULL	NULL	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')			select,insert,update,references	
+NULL	mysql	event	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			select,insert,update,references	
 NULL	mysql	func	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
 NULL	mysql	func	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	func	ret	2	0	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)			select,insert,update,references	
 NULL	mysql	func	type	4	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('function','aggregate')			select,insert,update,references	
+NULL	mysql	general_log	argument	6	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	general_log	command_type	5	NULL	NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+NULL	mysql	general_log	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP	select,insert,update,references	
+NULL	mysql	general_log	server_id	4	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	thread_id	3	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	help_category	help_category_id	1	NULL	NO	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned	PRI		select,insert,update,references	
 NULL	mysql	help_category	name	2	NULL	NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	UNI		select,insert,update,references	
 NULL	mysql	help_category	parent_category_id	3	NULL	YES	smallint	NULL	NULL	5	0	NULL	NULL	smallint(5) unsigned			select,insert,update,references	
@@ -65,22 +95,36 @@ NULL	mysql	host	Lock_tables_priv	14	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci
 NULL	mysql	host	References_priv	10	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Select_priv	3	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	host	Trigger_priv	20	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Update_priv	5	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	deletes	6	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	epoch	3	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned	PRI		select,insert,update,references	
+NULL	mysql	ndb_binlog_index	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	inserts	4	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	Position	1	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	ndb_binlog_index	updates	5	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+NULL	mysql	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	
+NULL	mysql	plugin	name	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	body	11	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	proc	body_utf8	20	NULL	YES	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
+NULL	mysql	proc	character_set_client	17	NULL	YES	char	32	96	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references	
+NULL	mysql	proc	collation_connection	18	NULL	YES	char	32	96	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references	
 NULL	mysql	proc	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			select,insert,update,references	
-NULL	mysql	proc	created	13	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	proc	created	13	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP	select,insert,update,references	
 NULL	mysql	proc	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
+NULL	mysql	proc	db_collation	19	NULL	YES	char	32	96	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references	
 NULL	mysql	proc	definer	12		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)			select,insert,update,references	
 NULL	mysql	proc	is_deterministic	7	NO	NO	enum	3	9	NULL	NULL	utf8	utf8_general_ci	enum('YES','NO')			select,insert,update,references	
 NULL	mysql	proc	language	5	SQL	NO	enum	3	9	NULL	NULL	utf8	utf8_general_ci	enum('SQL')			select,insert,update,references	
 NULL	mysql	proc	modified	14	0000-00-00 00:00:00	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
 NULL	mysql	proc	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
 NULL	mysql	proc	param_list	9	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	proc	returns	10		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	proc	returns	10	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			select,insert,update,references	
 NULL	mysql	proc	security_type	8	DEFINER	NO	enum	7	21	NULL	NULL	utf8	utf8_general_ci	enum('INVOKER','DEFINER')			select,insert,update,references	
 NULL	mysql	proc	specific_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
 NULL	mysql	proc	sql_data_access	6	CONTAINS_SQL	NO	enum	17	51	NULL	NULL	utf8	utf8_general_ci	enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA')			select,insert,update,references	
-NULL	mysql	proc	sql_mode	15		NO	set	431	1293	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')			select,insert,update,references	
+NULL	mysql	proc	sql_mode	15		NO	set	478	1434	NULL	NULL	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH')			select,insert,update,references	
 NULL	mysql	proc	type	3	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')	PRI		select,insert,update,references	
 NULL	mysql	procs_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
@@ -88,15 +132,35 @@ NULL	mysql	procs_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PR
 NULL	mysql	procs_priv	Proc_priv	7		NO	set	27	81	NULL	NULL	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')			select,insert,update,references	
 NULL	mysql	procs_priv	Routine_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	enum('FUNCTION','PROCEDURE')	PRI		select,insert,update,references	
-NULL	mysql	procs_priv	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	procs_priv	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP	select,insert,update,references	
 NULL	mysql	procs_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
+NULL	mysql	servers	Db	3		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Password	5		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Port	6	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select,insert,update,references	
+NULL	mysql	servers	Server_name	1		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		select,insert,update,references	
+NULL	mysql	servers	Socket	7		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Username	4		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	servers	Wrapper	8		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	slow_log	db	7	NULL	NO	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references	
+NULL	mysql	slow_log	insert_id	9	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	last_insert_id	8	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	lock_time	4	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
+NULL	mysql	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			select,insert,update,references	
+NULL	mysql	slow_log	rows_examined	6	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	server_id	10	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	sql_text	11	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP	select,insert,update,references	
+NULL	mysql	slow_log	user_host	2	NULL	NO	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
 NULL	mysql	tables_priv	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			select,insert,update,references	
 NULL	mysql	tables_priv	Db	2		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 NULL	mysql	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		select,insert,update,references	
 NULL	mysql	tables_priv	Table_name	4		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		select,insert,update,references	
-NULL	mysql	tables_priv	Table_priv	7		NO	set	90	270	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')			select,insert,update,references	
-NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	tables_priv	Table_priv	7		NO	set	98	294	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')			select,insert,update,references	
+NULL	mysql	tables_priv	Timestamp	6	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp		on update CURRENT_TIMESTAMP	select,insert,update,references	
 NULL	mysql	tables_priv	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
 NULL	mysql	time_zone	Time_zone_id	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI	auto_increment	select,insert,update,references	
 NULL	mysql	time_zone	Use_leap_seconds	2	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('Y','N')			select,insert,update,references	
@@ -121,6 +185,7 @@ NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci
 NULL	mysql	user	Create_view_priv	25	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Delete_priv	7	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Drop_priv	9	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	Event_priv	30	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Execute_priv	22	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	File_priv	13	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Grant_priv	14	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
@@ -128,10 +193,10 @@ NULL	mysql	user	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		sel
 NULL	mysql	user	Index_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Insert_priv	5	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Lock_tables_priv	21	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	max_connections	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_questions	34	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_updates	35	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
-NULL	mysql	user	max_user_connections	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_connections	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_questions	36	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_updates	37	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
+NULL	mysql	user	max_user_connections	39	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned			select,insert,update,references	
 NULL	mysql	user	Password	3		NO	char	41	41	NULL	NULL	latin1	latin1_bin	char(41)			select,insert,update,references	
 NULL	mysql	user	Process_priv	12	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	References_priv	15	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
@@ -142,13 +207,14 @@ NULL	mysql	user	Select_priv	4	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum(
 NULL	mysql	user	Show_db_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Shutdown_priv	11	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
-NULL	mysql	user	ssl_cipher	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	ssl_type	30		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
+NULL	mysql	user	ssl_cipher	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	ssl_type	32		NO	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')			select,insert,update,references	
 NULL	mysql	user	Super_priv	19	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
+NULL	mysql	user	Trigger_priv	31	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Update_priv	6	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	User	2		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	PRI		select,insert,update,references	
-NULL	mysql	user	x509_issuer	32	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
-NULL	mysql	user	x509_subject	33	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_issuer	34	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
+NULL	mysql	user	x509_subject	35	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			select,insert,update,references	
 ##########################################################################
 # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH
 ##########################################################################
@@ -165,6 +231,9 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 1.0000	blob	NULL	NULL
 1.0000	longblob	NULL	NULL
 1.0000	char	latin1	latin1_bin
+1.0000	char	latin1	latin1_swedish_ci
+1.0000	varchar	latin1	latin1_swedish_ci
+1.0000	mediumtext	utf8	utf8_general_ci
 1.0000	text	utf8	utf8_general_ci
 SELECT DISTINCT
 CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
@@ -181,6 +250,7 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 3.0000	char	utf8	utf8_general_ci
 3.0000	enum	utf8	utf8_general_ci
 3.0000	set	utf8	utf8_general_ci
+3.0000	varchar	utf8	utf8_general_ci
 SELECT DISTINCT
 CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
 DATA_TYPE,
@@ -192,8 +262,10 @@ AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH IS NULL
 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML;
 COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 NULL	bigint	NULL	NULL
+NULL	datetime	NULL	NULL
 NULL	int	NULL	NULL
 NULL	smallint	NULL	NULL
+NULL	time	NULL	NULL
 NULL	timestamp	NULL	NULL
 NULL	tinyint	NULL	NULL
 --> CHAR(0) is allowed (see manual), and here both CHARACHTER_* values
@@ -239,10 +311,40 @@ NULL	mysql	columns_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	db	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	db	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	db	Execute_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	db	Event_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	db	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	event	db	char	64	192	utf8	utf8_bin	char(64)
+3.0000	mysql	event	name	char	64	192	utf8	utf8_general_ci	char(64)
+1.0000	mysql	event	body	longblob	4294967295	4294967295	NULL	NULL	longblob
+3.0000	mysql	event	definer	char	77	231	utf8	utf8_bin	char(77)
+NULL	mysql	event	execute_at	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	mysql	event	interval_value	int	NULL	NULL	NULL	NULL	int(11)
+3.0000	mysql	event	interval_field	enum	18	54	utf8	utf8_general_ci	enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND')
+NULL	mysql	event	created	timestamp	NULL	NULL	NULL	NULL	timestamp
+NULL	mysql	event	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
+NULL	mysql	event	last_executed	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	mysql	event	starts	datetime	NULL	NULL	NULL	NULL	datetime
+NULL	mysql	event	ends	datetime	NULL	NULL	NULL	NULL	datetime
+3.0000	mysql	event	status	enum	18	54	utf8	utf8_general_ci	enum('ENABLED','DISABLED','SLAVESIDE_DISABLED')
+3.0000	mysql	event	on_completion	enum	8	24	utf8	utf8_general_ci	enum('DROP','PRESERVE')
+3.0000	mysql	event	sql_mode	set	478	1434	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH')
+3.0000	mysql	event	comment	char	64	192	utf8	utf8_bin	char(64)
+NULL	mysql	event	originator	int	NULL	NULL	NULL	NULL	int(10)
+1.0000	mysql	event	time_zone	char	64	64	latin1	latin1_swedish_ci	char(64)
+3.0000	mysql	event	character_set_client	char	32	96	utf8	utf8_bin	char(32)
+3.0000	mysql	event	collation_connection	char	32	96	utf8	utf8_bin	char(32)
+3.0000	mysql	event	db_collation	char	32	96	utf8	utf8_bin	char(32)
+1.0000	mysql	event	body_utf8	longblob	4294967295	4294967295	NULL	NULL	longblob
 3.0000	mysql	func	name	char	64	192	utf8	utf8_bin	char(64)
 NULL	mysql	func	ret	tinyint	NULL	NULL	NULL	NULL	tinyint(1)
 3.0000	mysql	func	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	func	type	enum	9	27	utf8	utf8_general_ci	enum('function','aggregate')
+NULL	mysql	general_log	event_time	timestamp	NULL	NULL	NULL	NULL	timestamp
+1.0000	mysql	general_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
+NULL	mysql	general_log	thread_id	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	general_log	server_id	int	NULL	NULL	NULL	NULL	int(11)
+3.0000	mysql	general_log	command_type	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	mysql	general_log	argument	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 NULL	mysql	help_category	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
 3.0000	mysql	help_category	name	char	64	192	utf8	utf8_general_ci	char(64)
 NULL	mysql	help_category	parent_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5) unsigned
@@ -276,6 +378,16 @@ NULL	mysql	help_topic	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5)
 3.0000	mysql	host	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	host	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	host	Execute_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	host	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+NULL	mysql	ndb_binlog_index	Position	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+1.0000	mysql	ndb_binlog_index	File	varchar	255	255	latin1	latin1_swedish_ci	varchar(255)
+NULL	mysql	ndb_binlog_index	epoch	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	inserts	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	updates	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	deletes	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+NULL	mysql	ndb_binlog_index	schemaops	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+3.0000	mysql	plugin	name	char	64	192	utf8	utf8_bin	char(64)
+3.0000	mysql	plugin	dl	char	128	384	utf8	utf8_bin	char(128)
 3.0000	mysql	proc	db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	proc	name	char	64	192	utf8	utf8_general_ci	char(64)
 3.0000	mysql	proc	type	enum	9	27	utf8	utf8_general_ci	enum('FUNCTION','PROCEDURE')
@@ -285,13 +397,17 @@ NULL	mysql	help_topic	help_category_id	smallint	NULL	NULL	NULL	NULL	smallint(5)
 3.0000	mysql	proc	is_deterministic	enum	3	9	utf8	utf8_general_ci	enum('YES','NO')
 3.0000	mysql	proc	security_type	enum	7	21	utf8	utf8_general_ci	enum('INVOKER','DEFINER')
 1.0000	mysql	proc	param_list	blob	65535	65535	NULL	NULL	blob
-3.0000	mysql	proc	returns	char	64	192	utf8	utf8_general_ci	char(64)
+1.0000	mysql	proc	returns	longblob	4294967295	4294967295	NULL	NULL	longblob
 1.0000	mysql	proc	body	longblob	4294967295	4294967295	NULL	NULL	longblob
 3.0000	mysql	proc	definer	char	77	231	utf8	utf8_bin	char(77)
 NULL	mysql	proc	created	timestamp	NULL	NULL	NULL	NULL	timestamp
 NULL	mysql	proc	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
-3.0000	mysql	proc	sql_mode	set	431	1293	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE')
+3.0000	mysql	proc	sql_mode	set	478	1434	utf8	utf8_general_ci	set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH')
 3.0000	mysql	proc	comment	char	64	192	utf8	utf8_bin	char(64)
+3.0000	mysql	proc	character_set_client	char	32	96	utf8	utf8_bin	char(32)
+3.0000	mysql	proc	collation_connection	char	32	96	utf8	utf8_bin	char(32)
+3.0000	mysql	proc	db_collation	char	32	96	utf8	utf8_bin	char(32)
+1.0000	mysql	proc	body_utf8	longblob	4294967295	4294967295	NULL	NULL	longblob
 3.0000	mysql	procs_priv	Host	char	60	180	utf8	utf8_bin	char(60)
 3.0000	mysql	procs_priv	Db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	procs_priv	User	char	16	48	utf8	utf8_bin	char(16)
@@ -300,13 +416,33 @@ NULL	mysql	proc	modified	timestamp	NULL	NULL	NULL	NULL	timestamp
 3.0000	mysql	procs_priv	Grantor	char	77	231	utf8	utf8_bin	char(77)
 3.0000	mysql	procs_priv	Proc_priv	set	27	81	utf8	utf8_general_ci	set('Execute','Alter Routine','Grant')
 NULL	mysql	procs_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
+3.0000	mysql	servers	Server_name	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Host	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Db	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Username	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Password	char	64	192	utf8	utf8_general_ci	char(64)
+NULL	mysql	servers	Port	int	NULL	NULL	NULL	NULL	int(4)
+3.0000	mysql	servers	Socket	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Wrapper	char	64	192	utf8	utf8_general_ci	char(64)
+3.0000	mysql	servers	Owner	char	64	192	utf8	utf8_general_ci	char(64)
+NULL	mysql	slow_log	start_time	timestamp	NULL	NULL	NULL	NULL	timestamp
+1.0000	mysql	slow_log	user_host	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
+NULL	mysql	slow_log	query_time	time	NULL	NULL	NULL	NULL	time
+NULL	mysql	slow_log	lock_time	time	NULL	NULL	NULL	NULL	time
+NULL	mysql	slow_log	rows_sent	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	slow_log	rows_examined	int	NULL	NULL	NULL	NULL	int(11)
+3.0000	mysql	slow_log	db	varchar	512	1536	utf8	utf8_general_ci	varchar(512)
+NULL	mysql	slow_log	last_insert_id	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	slow_log	insert_id	int	NULL	NULL	NULL	NULL	int(11)
+NULL	mysql	slow_log	server_id	int	NULL	NULL	NULL	NULL	int(11)
+1.0000	mysql	slow_log	sql_text	mediumtext	16777215	16777215	utf8	utf8_general_ci	mediumtext
 3.0000	mysql	tables_priv	Host	char	60	180	utf8	utf8_bin	char(60)
 3.0000	mysql	tables_priv	Db	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	User	char	16	48	utf8	utf8_bin	char(16)
 3.0000	mysql	tables_priv	Table_name	char	64	192	utf8	utf8_bin	char(64)
 3.0000	mysql	tables_priv	Grantor	char	77	231	utf8	utf8_bin	char(77)
 NULL	mysql	tables_priv	Timestamp	timestamp	NULL	NULL	NULL	NULL	timestamp
-3.0000	mysql	tables_priv	Table_priv	set	90	270	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view')
+3.0000	mysql	tables_priv	Table_priv	set	98	294	utf8	utf8_general_ci	set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger')
 3.0000	mysql	tables_priv	Column_priv	set	31	93	utf8	utf8_general_ci	set('Select','Insert','Update','References')
 NULL	mysql	time_zone	Time_zone_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 3.0000	mysql	time_zone	Use_leap_seconds	enum	1	3	utf8	utf8_general_ci	enum('Y','N')
@@ -351,6 +487,8 @@ NULL	mysql	time_zone_transition_type	Is_DST	tinyint	NULL	NULL	NULL	NULL	tinyint(
 3.0000	mysql	user	Create_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	Alter_routine_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	Create_user_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	user	Event_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
+3.0000	mysql	user	Trigger_priv	enum	1	3	utf8	utf8_general_ci	enum('N','Y')
 3.0000	mysql	user	ssl_type	enum	9	27	utf8	utf8_general_ci	enum('','ANY','X509','SPECIFIED')
 1.0000	mysql	user	ssl_cipher	blob	65535	65535	NULL	NULL	blob
 1.0000	mysql	user	x509_issuer	blob	65535	65535	NULL	NULL	blob

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

+SHOW TABLES FROM information_schema LIKE 'ENGINES';
+Tables_in_information_schema (ENGINES)
+ENGINES
+#######################################################################
+# Testcase 3.2.1.1: INFORMATION_SCHEMA tables can be queried via SELECT
+#######################################################################
+DROP VIEW      IF EXISTS test.v1;
+DROP PROCEDURE IF EXISTS test.p1;
+DROP FUNCTION  IF EXISTS test.f1;
+CREATE VIEW test.v1 AS     SELECT * FROM information_schema.ENGINES;
+CREATE PROCEDURE test.p1() SELECT * FROM information_schema.ENGINES;
+CREATE FUNCTION test.f1() returns BIGINT
+BEGIN
+DECLARE counter BIGINT DEFAULT NULL;
+SELECT COUNT(*) INTO counter FROM information_schema.ENGINES;
+RETURN counter;
+END//
+# Attention: The printing of the next result sets is disabled.
+SELECT * FROM information_schema.ENGINES;
+SELECT * FROM test.v1;
+CALL test.p1;
+SELECT test.f1();
+DROP VIEW test.v1;
+DROP PROCEDURE test.p1;
+DROP FUNCTION test.f1;
+#########################################################################
+# Testcase 3.2.12.1: INFORMATION_SCHEMA.ENGINES layout
+#########################################################################
+DESCRIBE          information_schema.ENGINES;
+Field	Type	Null	Key	Default	Extra
+ENGINE	varchar(64)	NO			
+SUPPORT	varchar(8)	NO			
+COMMENT	varchar(80)	NO			
+TRANSACTIONS	varchar(3)	NO			
+XA	varchar(3)	NO			
+SAVEPOINTS	varchar(3)	NO			
+SHOW CREATE TABLE information_schema.ENGINES;
+Table	Create Table
+ENGINES	CREATE TEMPORARY TABLE `ENGINES` (
+  `ENGINE` varchar(64) NOT NULL DEFAULT '',
+  `SUPPORT` varchar(8) NOT NULL DEFAULT '',
+  `COMMENT` varchar(80) NOT NULL DEFAULT '',
+  `TRANSACTIONS` varchar(3) NOT NULL DEFAULT '',
+  `XA` varchar(3) NOT NULL DEFAULT '',
+  `SAVEPOINTS` varchar(3) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
+SHOW COLUMNS FROM information_schema.ENGINES;
+Field	Type	Null	Key	Default	Extra
+ENGINE	varchar(64)	NO			
+SUPPORT	varchar(8)	NO			
+COMMENT	varchar(80)	NO			
+TRANSACTIONS	varchar(3)	NO			
+XA	varchar(3)	NO			
+SAVEPOINTS	varchar(3)	NO			
+########################################################################
+# Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and
+#           DDL on INFORMATION_SCHEMA tables are not supported
+########################################################################
+DROP DATABASE IF EXISTS db_datadict;
+CREATE DATABASE db_datadict;
+CREATE TABLE db_datadict.t1 (f1 BIGINT)
+ENGINE = <engine_type>;
+INSERT INTO information_schema.engines
+SELECT * FROM information_schema.engines;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+UPDATE information_schema.engines SET engine = '1234567';
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+DELETE FROM information_schema.engines WHERE support IN ('DEFAULT','YES');
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+TRUNCATE information_schema.engines;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+CREATE INDEX my_idx_on_engines ON information_schema.engines(engine);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ALTER TABLE information_schema.engines DROP PRIMARY KEY;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ALTER TABLE information_schema.engines ADD f1 INT;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+DROP TABLE information_schema.engines;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ALTER TABLE information_schema.engines RENAME db_datadict.engines;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ALTER TABLE information_schema.engines RENAME information_schema.xengines;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+DROP DATABASE db_datadict;

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

+SELECT * FROM information_schema.engines
+WHERE ENGINE = 'ARCHIVE';
+ENGINE	ARCHIVE
+SUPPORT	YES
+COMMENT	Archive storage engine
+TRANSACTIONS	NO
+XA	NO
+SAVEPOINTS	NO

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

+SELECT * FROM information_schema.engines
+WHERE ENGINE = 'BLACKHOLE';
+ENGINE	BLACKHOLE
+SUPPORT	YES
+COMMENT	/dev/null storage engine (anything you write to it disappears)
+TRANSACTIONS	NO
+XA	NO
+SAVEPOINTS	NO

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

+SELECT * FROM information_schema.engines
+WHERE ENGINE = 'CSV';
+ENGINE	CSV
+SUPPORT	YES
+COMMENT	CSV storage engine
+TRANSACTIONS	NO
+XA	NO
+SAVEPOINTS	NO

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

+SELECT * FROM information_schema.engines
+WHERE ENGINE = 'FEDERATED';
+ENGINE	FEDERATED
+SUPPORT	YES
+COMMENT	Federated MySQL storage engine
+TRANSACTIONS	NO
+XA	NO
+SAVEPOINTS	NO

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

+SELECT * FROM information_schema.engines
+WHERE ENGINE = 'InnoDB';
+ENGINE	InnoDB
+SUPPORT	YES
+COMMENT	Supports transactions, row-level locking, and foreign keys
+TRANSACTIONS	YES
+XA	YES
+SAVEPOINTS	YES

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

+SELECT * FROM information_schema.engines
+WHERE ENGINE = 'MEMORY';
+ENGINE	MEMORY
+SUPPORT	YES
+COMMENT	Hash based, stored in memory, useful for temporary tables
+TRANSACTIONS	NO
+XA	NO
+SAVEPOINTS	NO

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

+SELECT * FROM information_schema.engines
+WHERE ENGINE = 'MRG_MYISAM';
+ENGINE	MRG_MYISAM
+SUPPORT	YES
+COMMENT	Collection of identical MyISAM tables
+TRANSACTIONS	NO
+XA	NO
+SAVEPOINTS	NO

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

+SELECT * FROM information_schema.engines
+WHERE ENGINE = 'MyISAM';
+ENGINE	MyISAM
+SUPPORT	DEFAULT
+COMMENT	Default engine as of MySQL 3.23 with great performance
+TRANSACTIONS	NO
+XA	NO
+SAVEPOINTS	NO

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

+SELECT * FROM information_schema.engines
+WHERE ENGINE = 'ndbcluster';
+ENGINE	ndbcluster
+SUPPORT	YES
+COMMENT	Clustered, fault-tolerant tables
+TRANSACTIONS	YES
+XA	NO
+SAVEPOINTS	NO

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

+SHOW TABLES FROM information_schema LIKE 'EVENTS';
+Tables_in_information_schema (EVENTS)
+EVENTS
+#######################################################################
+# Testcase 3.2.1.1: INFORMATION_SCHEMA tables can be queried via SELECT
+#######################################################################
+DROP VIEW      IF EXISTS test.v1;
+DROP PROCEDURE IF EXISTS test.p1;
+DROP FUNCTION  IF EXISTS test.f1;
+CREATE VIEW test.v1 AS     SELECT * FROM information_schema.EVENTS;
+CREATE PROCEDURE test.p1() SELECT * FROM information_schema.EVENTS;
+CREATE FUNCTION test.f1() returns BIGINT
+BEGIN
+DECLARE counter BIGINT DEFAULT NULL;
+SELECT COUNT(*) INTO counter FROM information_schema.EVENTS;
+RETURN counter;
+END//
+# Attention: The printing of the next result sets is disabled.
+SELECT * FROM information_schema.EVENTS;
+SELECT * FROM test.v1;
+CALL test.p1;
+SELECT test.f1();
+DROP VIEW test.v1;
+DROP PROCEDURE test.p1;
+DROP FUNCTION test.f1;
+#########################################################################
+# Testcase 3.2.12.1: INFORMATION_SCHEMA.EVENTS layout
+#########################################################################
+DESCRIBE          information_schema.EVENTS;
+Field	Type	Null	Key	Default	Extra
+EVENT_CATALOG	varchar(64)	YES		NULL	
+EVENT_SCHEMA	varchar(64)	NO			
+EVENT_NAME	varchar(64)	NO			
+DEFINER	varchar(77)	NO			
+TIME_ZONE	varchar(64)	NO			
+EVENT_BODY	varchar(8)	NO			
+EVENT_DEFINITION	longtext	NO		NULL	
+EVENT_TYPE	varchar(9)	NO			
+EXECUTE_AT	datetime	YES		NULL	
+INTERVAL_VALUE	varchar(256)	YES		NULL	
+INTERVAL_FIELD	varchar(18)	YES		NULL	
+SQL_MODE	longtext	NO		NULL	
+STARTS	datetime	YES		NULL	
+ENDS	datetime	YES		NULL	
+STATUS	varchar(18)	NO			
+ON_COMPLETION	varchar(12)	NO			
+CREATED	datetime	NO		0000-00-00 00:00:00	
+LAST_ALTERED	datetime	NO		0000-00-00 00:00:00	
+LAST_EXECUTED	datetime	YES		NULL	
+EVENT_COMMENT	varchar(64)	NO			
+ORIGINATOR	bigint(10)	NO		0	
+CHARACTER_SET_CLIENT	varchar(32)	NO			
+COLLATION_CONNECTION	varchar(32)	NO			
+DATABASE_COLLATION	varchar(32)	NO			
+SHOW CREATE TABLE information_schema.EVENTS;
+Table	Create Table
+EVENTS	CREATE TEMPORARY TABLE `EVENTS` (
+  `EVENT_CATALOG` varchar(64) DEFAULT NULL,
+  `EVENT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `EVENT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFINER` varchar(77) NOT NULL DEFAULT '',
+  `TIME_ZONE` varchar(64) NOT NULL DEFAULT '',
+  `EVENT_BODY` varchar(8) NOT NULL DEFAULT '',
+  `EVENT_DEFINITION` longtext NOT NULL,
+  `EVENT_TYPE` varchar(9) NOT NULL DEFAULT '',
+  `EXECUTE_AT` datetime DEFAULT NULL,
+  `INTERVAL_VALUE` varchar(256) DEFAULT NULL,
+  `INTERVAL_FIELD` varchar(18) DEFAULT NULL,
+  `SQL_MODE` longtext NOT NULL,
+  `STARTS` datetime DEFAULT NULL,
+  `ENDS` datetime DEFAULT NULL,
+  `STATUS` varchar(18) NOT NULL DEFAULT '',
+  `ON_COMPLETION` varchar(12) 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',
+  `LAST_EXECUTED` datetime DEFAULT NULL,
+  `EVENT_COMMENT` varchar(64) NOT NULL DEFAULT '',
+  `ORIGINATOR` bigint(10) NOT NULL DEFAULT '0',
+  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
+  `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
+  `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+SHOW COLUMNS FROM information_schema.EVENTS;
+Field	Type	Null	Key	Default	Extra
+EVENT_CATALOG	varchar(64)	YES		NULL	
+EVENT_SCHEMA	varchar(64)	NO			
+EVENT_NAME	varchar(64)	NO			
+DEFINER	varchar(77)	NO			
+TIME_ZONE	varchar(64)	NO			
+EVENT_BODY	varchar(8)	NO			
+EVENT_DEFINITION	longtext	NO		NULL	
+EVENT_TYPE	varchar(9)	NO			
+EXECUTE_AT	datetime	YES		NULL	
+INTERVAL_VALUE	varchar(256)	YES		NULL	
+INTERVAL_FIELD	varchar(18)	YES		NULL	
+SQL_MODE	longtext	NO		NULL	
+STARTS	datetime	YES		NULL	
+ENDS	datetime	YES		NULL	
+STATUS	varchar(18)	NO			
+ON_COMPLETION	varchar(12)	NO			
+CREATED	datetime	NO		0000-00-00 00:00:00	
+LAST_ALTERED	datetime	NO		0000-00-00 00:00:00	
+LAST_EXECUTED	datetime	YES		NULL	
+EVENT_COMMENT	varchar(64)	NO			
+ORIGINATOR	bigint(10)	NO		0	
+CHARACTER_SET_CLIENT	varchar(32)	NO			
+COLLATION_CONNECTION	varchar(32)	NO			
+DATABASE_COLLATION	varchar(32)	NO			
+SELECT event_catalog, event_name, event_body, event_type, event_type,
+status, on_completion
+FROM information_schema.events
+WHERE event_catalog IS NOT NULL or
+event_body NOT IN ('SQL') or
+event_type NOT IN ('ONE TIME','RECURRING') or
+status NOT IN ('ENABLED','DISABLED','SLAVESIDE_DISABLED') or
+on_completion NOT IN ('PRESERVE','NOT PRESERVE');
+event_catalog	event_name	event_body	event_type	event_type	status	on_completion
+########################################################################
+# Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and
+#           DDL on INFORMATION_SCHEMA tables are not supported
+########################################################################
+DROP DATABASE IF EXISTS db_datadict;
+CREATE DATABASE db_datadict;
+CREATE TABLE db_datadict.t1 (f1 BIGINT)
+ENGINE = <engine_type>;
+INSERT INTO information_schema.events
+SELECT * FROM information_schema.events;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+UPDATE information_schema.events SET event_name = '1234567'
+WHERE table_name = 't1';
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+DELETE FROM information_schema.events WHERE event_catalog IS NULL;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+TRUNCATE information_schema.events;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+CREATE INDEX my_idx_on_events ON information_schema.events(event_name);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ALTER TABLE information_schema.events DROP PRIMARY KEY;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ALTER TABLE information_schema.events ADD f1 INT;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+DROP TABLE information_schema.events;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ALTER TABLE information_schema.events RENAME db_datadict.events;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+ALTER TABLE information_schema.events RENAME information_schema.xevents;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'
+DROP DATABASE db_datadict;

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

@@ -43,18 +43,18 @@ REFERENCED_COLUMN_NAME	varchar(64)	YES		NULL
 SHOW CREATE TABLE information_schema.KEY_COLUMN_USAGE;
 Table	Create Table
 KEY_COLUMN_USAGE	CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
-  `CONSTRAINT_CATALOG` varchar(512) default NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
-  `TABLE_CATALOG` varchar(512) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `ORDINAL_POSITION` bigint(10) NOT NULL default '0',
-  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) default NULL,
-  `REFERENCED_TABLE_SCHEMA` varchar(64) default NULL,
-  `REFERENCED_TABLE_NAME` varchar(64) default NULL,
-  `REFERENCED_COLUMN_NAME` varchar(64) default NULL
+  `CONSTRAINT_CATALOG` varchar(512) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(512) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ORDINAL_POSITION` bigint(10) NOT NULL DEFAULT '0',
+  `POSITION_IN_UNIQUE_CONSTRAINT` bigint(10) DEFAULT NULL,
+  `REFERENCED_TABLE_SCHEMA` varchar(64) DEFAULT NULL,
+  `REFERENCED_TABLE_NAME` varchar(64) DEFAULT NULL,
+  `REFERENCED_COLUMN_NAME` varchar(64) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.KEY_COLUMN_USAGE;
 Field	Type	Null	Key	Default	Extra

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

@@ -48,29 +48,35 @@ LAST_ALTERED	datetime	NO		0000-00-00 00:00:00
 SQL_MODE	longtext	NO		NULL	
 ROUTINE_COMMENT	varchar(64)	NO			
 DEFINER	varchar(77)	NO			
+CHARACTER_SET_CLIENT	varchar(32)	NO			
+COLLATION_CONNECTION	varchar(32)	NO			
+DATABASE_COLLATION	varchar(32)	NO			
 SHOW CREATE TABLE information_schema.ROUTINES;
 Table	Create Table
 ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
-  `SPECIFIC_NAME` varchar(64) NOT NULL default '',
-  `ROUTINE_CATALOG` varchar(512) default NULL,
-  `ROUTINE_SCHEMA` varchar(64) NOT NULL default '',
-  `ROUTINE_NAME` varchar(64) NOT NULL default '',
-  `ROUTINE_TYPE` varchar(9) NOT NULL default '',
-  `DTD_IDENTIFIER` varchar(64) default NULL,
-  `ROUTINE_BODY` varchar(8) NOT NULL default '',
+  `SPECIFIC_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ROUTINE_CATALOG` varchar(512) DEFAULT NULL,
+  `ROUTINE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `ROUTINE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `ROUTINE_TYPE` varchar(9) NOT NULL DEFAULT '',
+  `DTD_IDENTIFIER` varchar(64) DEFAULT NULL,
+  `ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '',
   `ROUTINE_DEFINITION` longtext,
-  `EXTERNAL_NAME` varchar(64) default NULL,
-  `EXTERNAL_LANGUAGE` varchar(64) default NULL,
-  `PARAMETER_STYLE` varchar(8) NOT NULL default '',
-  `IS_DETERMINISTIC` varchar(3) NOT NULL default '',
-  `SQL_DATA_ACCESS` varchar(64) NOT NULL default '',
-  `SQL_PATH` varchar(64) default NULL,
-  `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',
+  `EXTERNAL_NAME` varchar(64) DEFAULT NULL,
+  `EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL,
+  `PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '',
+  `IS_DETERMINISTIC` varchar(3) NOT NULL DEFAULT '',
+  `SQL_DATA_ACCESS` varchar(64) NOT NULL DEFAULT '',
+  `SQL_PATH` varchar(64) DEFAULT NULL,
+  `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,
-  `ROUTINE_COMMENT` varchar(64) NOT NULL default '',
-  `DEFINER` varchar(77) NOT NULL default ''
+  `ROUTINE_COMMENT` varchar(64) NOT NULL DEFAULT '',
+  `DEFINER` varchar(77) NOT NULL DEFAULT '',
+  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
+  `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
+  `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.ROUTINES;
 Field	Type	Null	Key	Default	Extra
@@ -94,6 +100,9 @@ LAST_ALTERED	datetime	NO		0000-00-00 00:00:00
 SQL_MODE	longtext	NO		NULL	
 ROUTINE_COMMENT	varchar(64)	NO			
 DEFINER	varchar(77)	NO			
+CHARACTER_SET_CLIENT	varchar(32)	NO			
+COLLATION_CONNECTION	varchar(32)	NO			
+DATABASE_COLLATION	varchar(32)	NO			
 USE test;
 DROP PROCEDURE IF EXISTS sp_for_routines;
 DROP FUNCTION  IF EXISTS function_for_routines;
@@ -152,16 +161,16 @@ GRANT EXECUTE ON db_datadict_2.* TO 'testuser2'@'localhost';
 FLUSH PRIVILEGES;
 # Establish connection testuser1 (user=testuser1)
 SELECT * FROM information_schema.routines;
-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	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER
-sp_6_408002_1	NULL	db_datadict	sp_6_408002_1	PROCEDURE	NULL	SQL	NULL	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss			root@localhost
-sp_6_408002_2	NULL	db_datadict_2	sp_6_408002_2	PROCEDURE	NULL	SQL	NULL	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss			root@localhost
+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	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
+sp_6_408002_1	NULL	db_datadict	sp_6_408002_1	PROCEDURE	NULL	SQL	NULL	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss			root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
+sp_6_408002_2	NULL	db_datadict_2	sp_6_408002_2	PROCEDURE	NULL	SQL	NULL	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss			root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 # Establish connection testuser2 (user=testuser2)
 SELECT * FROM information_schema.routines;
-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	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER
-sp_6_408002_2	NULL	db_datadict_2	sp_6_408002_2	PROCEDURE	NULL	SQL	NULL	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss			root@localhost
+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	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
+sp_6_408002_2	NULL	db_datadict_2	sp_6_408002_2	PROCEDURE	NULL	SQL	NULL	NULL	NULL	SQL	NO	CONTAINS SQL	NULL	DEFINER	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss			root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 # Establish connection testuser3 (user=testuser3)
 SELECT * FROM information_schema.routines;
-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	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER
+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	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
 # Switch to connection default and close connections testuser1,testuser2,testuser3
 DROP USER 'testuser1'@'localhost';
 DROP USER 'testuser2'@'localhost';
@@ -175,7 +184,7 @@ DROP DATABASE db_datadict_2;
 DROP DATABASE IF EXISTS db_datadict;
 CREATE DATABASE db_datadict;
 SELECT * FROM information_schema.routines WHERE routine_schema = 'db_datadict';
-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	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER
+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	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
 USE db_datadict;
 CREATE PROCEDURE sp_for_routines()      SELECT 'db_datadict';
 CREATE FUNCTION function_for_routines() RETURNS INT RETURN 0;
@@ -201,6 +210,9 @@ LAST_ALTERED	<modified>
 SQL_MODE	
 ROUTINE_COMMENT	
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SPECIFIC_NAME	sp_for_routines
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_datadict
@@ -221,6 +233,9 @@ LAST_ALTERED	<modified>
 SQL_MODE	
 ROUTINE_COMMENT	
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 ALTER PROCEDURE sp_for_routines SQL SECURITY INVOKER;
 ALTER FUNCTION function_for_routines COMMENT 'updated comments';
 SELECT * FROM information_schema.routines WHERE routine_schema = 'db_datadict'
@@ -245,6 +260,9 @@ LAST_ALTERED	<modified>
 SQL_MODE	
 ROUTINE_COMMENT	updated comments
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SPECIFIC_NAME	sp_for_routines
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_datadict
@@ -265,10 +283,13 @@ LAST_ALTERED	<modified>
 SQL_MODE	
 ROUTINE_COMMENT	
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 DROP PROCEDURE sp_for_routines;
 DROP FUNCTION function_for_routines;
 SELECT * FROM information_schema.routines WHERE routine_schema = 'db_datadict';
-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	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER
+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	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
 CREATE PROCEDURE sp_for_routines()      SELECT 'db_datadict';
 CREATE FUNCTION function_for_routines() RETURNS INT RETURN 0;
 SELECT * FROM information_schema.routines WHERE routine_schema = 'db_datadict'
@@ -293,6 +314,9 @@ LAST_ALTERED	<modified>
 SQL_MODE	
 ROUTINE_COMMENT	
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 SPECIFIC_NAME	sp_for_routines
 ROUTINE_CATALOG	NULL
 ROUTINE_SCHEMA	db_datadict
@@ -313,10 +337,13 @@ LAST_ALTERED	<modified>
 SQL_MODE	
 ROUTINE_COMMENT	
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 use test;
 DROP DATABASE db_datadict;
 SELECT * FROM information_schema.routines WHERE routine_schema = 'db_datadict';
-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	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER
+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	CREATED	LAST_ALTERED	SQL_MODE	ROUTINE_COMMENT	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
 #########################################################################
 # 3.2.8.4: INFORMATION_SCHEMA.ROUTINES routine body too big for
 #          ROUTINE_DEFINITION column
@@ -569,6 +596,9 @@ LAST_ALTERED	YYYY-MM-DD hh:mm:ss
 SQL_MODE	
 ROUTINE_COMMENT	
 DEFINER	root@localhost
+CHARACTER_SET_CLIENT	latin1
+COLLATION_CONNECTION	latin1_swedish_ci
+DATABASE_COLLATION	latin1_swedish_ci
 LENGTH(routine_definition)	2549
 DROP DATABASE db_datadict;
 ########################################################################

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

@@ -36,11 +36,11 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE information_schema.SCHEMA_PRIVILEGES;
 Table	Create Table
 SCHEMA_PRIVILEGES	CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(512) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(512) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.SCHEMA_PRIVILEGES;
 Field	Type	Null	Key	Default	Extra

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

@@ -17,12 +17,14 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	DELETE	NO
 ''@'%'	NULL	test	DROP	NO
+''@'%'	NULL	test	EVENT	NO
 ''@'%'	NULL	test	INDEX	NO
 ''@'%'	NULL	test	INSERT	NO
 ''@'%'	NULL	test	LOCK TABLES	NO
 ''@'%'	NULL	test	REFERENCES	NO
 ''@'%'	NULL	test	SELECT	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test	UPDATE	NO
 SHOW DATABASES LIKE 'information_schema';
 Database (information_schema)

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

@@ -36,11 +36,11 @@ 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 '',
-  `SQL_PATH` varchar(512) default NULL
+  `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 '',
+  `SQL_PATH` varchar(512) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.SCHEMATA;
 Field	Type	Null	Key	Default	Extra

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

@@ -46,21 +46,21 @@ COMMENT	varchar(16)	YES		NULL
 SHOW CREATE TABLE information_schema.STATISTICS;
 Table	Create Table
 STATISTICS	CREATE TEMPORARY TABLE `STATISTICS` (
-  `TABLE_CATALOG` varchar(512) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `NON_UNIQUE` bigint(1) NOT NULL default '0',
-  `INDEX_SCHEMA` varchar(64) NOT NULL default '',
-  `INDEX_NAME` varchar(64) NOT NULL default '',
-  `SEQ_IN_INDEX` bigint(2) NOT NULL default '0',
-  `COLUMN_NAME` varchar(64) NOT NULL default '',
-  `COLLATION` varchar(1) default NULL,
-  `CARDINALITY` bigint(21) default NULL,
-  `SUB_PART` bigint(3) default NULL,
-  `PACKED` varchar(10) default NULL,
-  `NULLABLE` varchar(3) NOT NULL default '',
-  `INDEX_TYPE` varchar(16) NOT NULL default '',
-  `COMMENT` varchar(16) default NULL
+  `TABLE_CATALOG` varchar(512) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `NON_UNIQUE` bigint(1) NOT NULL DEFAULT '0',
+  `INDEX_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `INDEX_NAME` varchar(64) NOT NULL DEFAULT '',
+  `SEQ_IN_INDEX` bigint(2) NOT NULL DEFAULT '0',
+  `COLUMN_NAME` varchar(64) NOT NULL DEFAULT '',
+  `COLLATION` varchar(1) DEFAULT NULL,
+  `CARDINALITY` bigint(21) DEFAULT NULL,
+  `SUB_PART` bigint(3) DEFAULT NULL,
+  `PACKED` varchar(10) DEFAULT NULL,
+  `NULLABLE` varchar(3) NOT NULL DEFAULT '',
+  `INDEX_TYPE` varchar(16) NOT NULL DEFAULT '',
+  `COMMENT` varchar(16) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.STATISTICS;
 Field	Type	Null	Key	Default	Extra

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

@@ -16,6 +16,8 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	#CARD#	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	#CARD#	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	1	db	A	#CARD#	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	2	name	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	#CARD#	NULL	NULL		BTREE	
@@ -27,6 +29,8 @@ NULL	mysql	help_topic	0	mysql	name	1	name	A	#CARD#	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	#CARD#	NULL	NULL		BTREE	
+NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	#CARD#	NULL	NULL		BTREE	
+NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	#CARD#	NULL	NULL		BTREE	
@@ -36,6 +40,7 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	2	Db	A	#CARD#	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	#CARD#	NULL	NULL		BTREE	
+NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	1	mysql	Grantor	1	Grantor	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	#CARD#	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	#CARD#	NULL	NULL		BTREE	

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

@@ -37,12 +37,12 @@ CONSTRAINT_TYPE	varchar(64)	NO
 SHOW CREATE TABLE information_schema.TABLE_CONSTRAINTS;
 Table	Create Table
 TABLE_CONSTRAINTS	CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` (
-  `CONSTRAINT_CATALOG` varchar(512) default NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `CONSTRAINT_TYPE` varchar(64) NOT NULL default ''
+  `CONSTRAINT_CATALOG` varchar(512) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_TYPE` varchar(64) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.TABLE_CONSTRAINTS;
 Field	Type	Null	Key	Default	Extra

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

@@ -9,6 +9,7 @@ ORDER BY table_schema,table_name,constraint_name;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
 NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	db	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	event	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	func	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
 NULL	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
@@ -18,8 +19,11 @@ NULL	mysql	PRIMARY	mysql	help_relation	PRIMARY KEY
 NULL	mysql	name	mysql	help_topic	UNIQUE
 NULL	mysql	PRIMARY	mysql	help_topic	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	host	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	ndb_binlog_index	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	plugin	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	proc	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	procs_priv	PRIMARY KEY
+NULL	mysql	PRIMARY	mysql	servers	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	tables_priv	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	time_zone	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	time_zone_leap_second	PRIMARY KEY

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

@@ -37,12 +37,12 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE information_schema.TABLE_PRIVILEGES;
 Table	Create Table
 TABLE_PRIVILEGES	CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(512) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(512) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.TABLE_PRIVILEGES;
 Field	Type	Null	Key	Default	Extra
@@ -102,6 +102,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser2'@'localhost'	NULL	db_datadict	tb1	REFERENCES	YES
 'testuser2'@'localhost'	NULL	db_datadict	tb1	SELECT	YES
 'testuser2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
+'testuser2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 'testuser2'@'localhost'	NULL	db_datadict	tb1	UPDATE	YES
 SHOW GRANTS FOR 'testuser2'@'localhost';
 Grants for testuser2@localhost
@@ -133,6 +134,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser2'@'localhost'	NULL	db_datadict	tb1	REFERENCES	YES
 'testuser2'@'localhost'	NULL	db_datadict	tb1	SELECT	YES
 'testuser2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
+'testuser2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 'testuser2'@'localhost'	NULL	db_datadict	tb1	UPDATE	YES
 'testuser3'@'localhost'	NULL	db_datadict	tb3	SELECT	NO
 SHOW GRANTS FOR 'testuser1'@'localhost';
@@ -185,6 +187,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser1'@'localhost'	NULL	test	t1_table	REFERENCES	NO
 'testuser1'@'localhost'	NULL	test	t1_table	SELECT	NO
 'testuser1'@'localhost'	NULL	test	t1_table	SHOW VIEW	NO
+'testuser1'@'localhost'	NULL	test	t1_table	TRIGGER	NO
 'testuser1'@'localhost'	NULL	test	t1_table	UPDATE	NO
 'testuser1'@'localhost'	NULL	test	t1_view	ALTER	NO
 'testuser1'@'localhost'	NULL	test	t1_view	CREATE	NO
@@ -196,6 +199,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser1'@'localhost'	NULL	test	t1_view	REFERENCES	NO
 'testuser1'@'localhost'	NULL	test	t1_view	SELECT	NO
 'testuser1'@'localhost'	NULL	test	t1_view	SHOW VIEW	NO
+'testuser1'@'localhost'	NULL	test	t1_view	TRIGGER	NO
 'testuser1'@'localhost'	NULL	test	t1_view	UPDATE	NO
 SELECT DISTINCT grantee, table_name FROM information_schema.table_privileges
 WHERE table_name LIKE 't1_%'

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

@@ -33,46 +33,46 @@ TABLE_SCHEMA	varchar(64)	NO
 TABLE_NAME	varchar(64)	NO			
 TABLE_TYPE	varchar(64)	NO			
 ENGINE	varchar(64)	YES		NULL	
-VERSION	bigint(21)	YES		NULL	
+VERSION	bigint(21) unsigned	YES		NULL	
 ROW_FORMAT	varchar(10)	YES		NULL	
-TABLE_ROWS	bigint(21)	YES		NULL	
-AVG_ROW_LENGTH	bigint(21)	YES		NULL	
-DATA_LENGTH	bigint(21)	YES		NULL	
-MAX_DATA_LENGTH	bigint(21)	YES		NULL	
-INDEX_LENGTH	bigint(21)	YES		NULL	
-DATA_FREE	bigint(21)	YES		NULL	
-AUTO_INCREMENT	bigint(21)	YES		NULL	
+TABLE_ROWS	bigint(21) unsigned	YES		NULL	
+AVG_ROW_LENGTH	bigint(21) unsigned	YES		NULL	
+DATA_LENGTH	bigint(21) unsigned	YES		NULL	
+MAX_DATA_LENGTH	bigint(21) unsigned	YES		NULL	
+INDEX_LENGTH	bigint(21) unsigned	YES		NULL	
+DATA_FREE	bigint(21) unsigned	YES		NULL	
+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	
-CHECKSUM	bigint(21)	YES		NULL	
+CHECKSUM	bigint(21) unsigned	YES		NULL	
 CREATE_OPTIONS	varchar(255)	YES		NULL	
 TABLE_COMMENT	varchar(80)	NO			
 SHOW CREATE TABLE information_schema.TABLES;
 Table	Create Table
 TABLES	CREATE TEMPORARY TABLE `TABLES` (
-  `TABLE_CATALOG` varchar(512) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
-  `TABLE_TYPE` varchar(64) NOT NULL default '',
-  `ENGINE` varchar(64) default NULL,
-  `VERSION` bigint(21) default NULL,
-  `ROW_FORMAT` varchar(10) default NULL,
-  `TABLE_ROWS` bigint(21) default NULL,
-  `AVG_ROW_LENGTH` bigint(21) default NULL,
-  `DATA_LENGTH` bigint(21) default NULL,
-  `MAX_DATA_LENGTH` bigint(21) default NULL,
-  `INDEX_LENGTH` bigint(21) default NULL,
-  `DATA_FREE` bigint(21) default NULL,
-  `AUTO_INCREMENT` bigint(21) default NULL,
-  `CREATE_TIME` datetime default NULL,
-  `UPDATE_TIME` datetime default NULL,
-  `CHECK_TIME` datetime default NULL,
-  `TABLE_COLLATION` varchar(64) default NULL,
-  `CHECKSUM` bigint(21) default NULL,
-  `CREATE_OPTIONS` varchar(255) default NULL,
-  `TABLE_COMMENT` varchar(80) NOT NULL default ''
+  `TABLE_CATALOG` varchar(512) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `ENGINE` varchar(64) DEFAULT NULL,
+  `VERSION` bigint(21) unsigned DEFAULT NULL,
+  `ROW_FORMAT` varchar(10) DEFAULT NULL,
+  `TABLE_ROWS` bigint(21) unsigned DEFAULT NULL,
+  `AVG_ROW_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `MAX_DATA_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL,
+  `DATA_FREE` bigint(21) unsigned DEFAULT NULL,
+  `AUTO_INCREMENT` bigint(21) unsigned DEFAULT NULL,
+  `CREATE_TIME` datetime DEFAULT NULL,
+  `UPDATE_TIME` datetime DEFAULT NULL,
+  `CHECK_TIME` datetime DEFAULT NULL,
+  `TABLE_COLLATION` varchar(64) DEFAULT NULL,
+  `CHECKSUM` bigint(21) unsigned DEFAULT NULL,
+  `CREATE_OPTIONS` varchar(255) DEFAULT NULL,
+  `TABLE_COMMENT` varchar(80) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.TABLES;
 Field	Type	Null	Key	Default	Extra
@@ -81,20 +81,20 @@ TABLE_SCHEMA	varchar(64)	NO
 TABLE_NAME	varchar(64)	NO			
 TABLE_TYPE	varchar(64)	NO			
 ENGINE	varchar(64)	YES		NULL	
-VERSION	bigint(21)	YES		NULL	
+VERSION	bigint(21) unsigned	YES		NULL	
 ROW_FORMAT	varchar(10)	YES		NULL	
-TABLE_ROWS	bigint(21)	YES		NULL	
-AVG_ROW_LENGTH	bigint(21)	YES		NULL	
-DATA_LENGTH	bigint(21)	YES		NULL	
-MAX_DATA_LENGTH	bigint(21)	YES		NULL	
-INDEX_LENGTH	bigint(21)	YES		NULL	
-DATA_FREE	bigint(21)	YES		NULL	
-AUTO_INCREMENT	bigint(21)	YES		NULL	
+TABLE_ROWS	bigint(21) unsigned	YES		NULL	
+AVG_ROW_LENGTH	bigint(21) unsigned	YES		NULL	
+DATA_LENGTH	bigint(21) unsigned	YES		NULL	
+MAX_DATA_LENGTH	bigint(21) unsigned	YES		NULL	
+INDEX_LENGTH	bigint(21) unsigned	YES		NULL	
+DATA_FREE	bigint(21) unsigned	YES		NULL	
+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	
-CHECKSUM	bigint(21)	YES		NULL	
+CHECKSUM	bigint(21) unsigned	YES		NULL	
 CREATE_OPTIONS	varchar(255)	YES		NULL	
 TABLE_COMMENT	varchar(80)	NO			
 SELECT table_catalog, table_schema, table_name

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

@@ -18,7 +18,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -41,7 +41,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -64,7 +64,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATION_CHARACTER_SET_APPLICABILITY
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -87,7 +87,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -110,7 +110,122 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	ENGINES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	EVENTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	FILES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -133,7 +248,99 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PARTITIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PLUGINS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PROCESSLIST
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	REFERENTIAL_CONSTRAINTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -156,7 +363,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -179,7 +386,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -202,7 +409,53 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -225,7 +478,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -248,7 +501,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -271,7 +524,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -294,7 +547,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -317,7 +570,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -340,7 +593,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -363,7 +616,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -403,7 +656,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -426,7 +679,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -449,7 +702,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATION_CHARACTER_SET_APPLICABILITY
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -472,7 +725,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -495,7 +748,122 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	ENGINES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	EVENTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	FILES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -518,7 +886,99 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PARTITIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PLUGINS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PROCESSLIST
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	REFERENTIAL_CONSTRAINTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -541,7 +1001,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -564,7 +1024,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -587,7 +1047,53 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -610,7 +1116,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -633,7 +1139,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -656,7 +1162,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -679,7 +1185,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -702,7 +1208,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -725,7 +1231,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
@@ -748,7 +1254,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#

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

@@ -60,6 +60,29 @@ user_comment	Database privileges
 Separator	-----------------------------------------------------
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	event
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	Events
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -83,6 +106,29 @@ user_comment	User defined functions
 Separator	-----------------------------------------------------
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	general_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	General log
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -198,6 +244,52 @@ user_comment	Host privileges;  Merged with database privileges
 Separator	-----------------------------------------------------
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	ndb_binlog_index
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	latin1_swedish_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	plugin
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_bin
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	MySQL plugins
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -244,6 +336,52 @@ user_comment	Procedure privileges
 Separator	-----------------------------------------------------
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	servers
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	MySQL Foreign Servers table
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	slow_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	#TBLR#
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	#CRT#
+UPDATE_TIME	#UT#
+CHECK_TIME	#CT#
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	#TC#
+user_comment	Slow log
+Separator	-----------------------------------------------------
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM

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

@@ -521,29 +521,6 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	#TC#
 user_comment	
 Separator	-----------------------------------------------------
-TABLE_CATALOG	NULL
-TABLE_SCHEMA	test4
-TABLE_NAME	t6
-TABLE_TYPE	BASE TABLE
-ENGINE	ndbcluster
-VERSION	10
-ROW_FORMAT	Fixed
-TABLE_ROWS	#TBLR#
-AVG_ROW_LENGTH	#ARL#
-DATA_LENGTH	#DL#
-MAX_DATA_LENGTH	#MDL#
-INDEX_LENGTH	#IL#
-DATA_FREE	#DF#
-AUTO_INCREMENT	NULL
-CREATE_TIME	#CRT#
-UPDATE_TIME	#UT#
-CHECK_TIME	#CT#
-TABLE_COLLATION	latin1_swedish_ci
-CHECKSUM	NULL
-CREATE_OPTIONS	#CO#
-TABLE_COMMENT	#TC#
-user_comment	
-Separator	-----------------------------------------------------
 # Switch to connection default and close connection testuser1
 DROP USER testuser1@localhost;
 DROP DATABASE db_datadict;

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

@@ -47,28 +47,34 @@ ACTION_REFERENCE_NEW_ROW	varchar(3)	NO
 CREATED	datetime	YES		NULL	
 SQL_MODE	longtext	NO		NULL	
 DEFINER	longtext	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO			
+COLLATION_CONNECTION	varchar(32)	NO			
+DATABASE_COLLATION	varchar(32)	NO			
 SHOW CREATE TABLE information_schema.TRIGGERS;
 Table	Create Table
 TRIGGERS	CREATE TEMPORARY TABLE `TRIGGERS` (
-  `TRIGGER_CATALOG` varchar(512) default NULL,
-  `TRIGGER_SCHEMA` varchar(64) NOT NULL default '',
-  `TRIGGER_NAME` varchar(64) NOT NULL default '',
-  `EVENT_MANIPULATION` varchar(6) NOT NULL default '',
-  `EVENT_OBJECT_CATALOG` varchar(512) default NULL,
-  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL default '',
-  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL default '',
-  `ACTION_ORDER` bigint(4) NOT NULL default '0',
+  `TRIGGER_CATALOG` varchar(512) DEFAULT NULL,
+  `TRIGGER_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TRIGGER_NAME` varchar(64) NOT NULL DEFAULT '',
+  `EVENT_MANIPULATION` varchar(6) NOT NULL DEFAULT '',
+  `EVENT_OBJECT_CATALOG` varchar(512) DEFAULT NULL,
+  `EVENT_OBJECT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `EVENT_OBJECT_TABLE` varchar(64) NOT NULL DEFAULT '',
+  `ACTION_ORDER` bigint(4) NOT NULL DEFAULT '0',
   `ACTION_CONDITION` longtext,
   `ACTION_STATEMENT` longtext NOT NULL,
-  `ACTION_ORIENTATION` varchar(9) NOT NULL default '',
-  `ACTION_TIMING` varchar(6) NOT NULL default '',
-  `ACTION_REFERENCE_OLD_TABLE` varchar(64) default NULL,
-  `ACTION_REFERENCE_NEW_TABLE` varchar(64) default NULL,
-  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL default '',
-  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL default '',
-  `CREATED` datetime default NULL,
+  `ACTION_ORIENTATION` varchar(9) NOT NULL DEFAULT '',
+  `ACTION_TIMING` varchar(6) NOT NULL DEFAULT '',
+  `ACTION_REFERENCE_OLD_TABLE` varchar(64) DEFAULT NULL,
+  `ACTION_REFERENCE_NEW_TABLE` varchar(64) DEFAULT NULL,
+  `ACTION_REFERENCE_OLD_ROW` varchar(3) NOT NULL DEFAULT '',
+  `ACTION_REFERENCE_NEW_ROW` varchar(3) NOT NULL DEFAULT '',
+  `CREATED` datetime DEFAULT NULL,
   `SQL_MODE` longtext NOT NULL,
-  `DEFINER` longtext NOT NULL
+  `DEFINER` longtext NOT NULL,
+  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
+  `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
+  `DATABASE_COLLATION` varchar(32) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.TRIGGERS;
 Field	Type	Null	Key	Default	Extra
@@ -91,11 +97,14 @@ ACTION_REFERENCE_NEW_ROW	varchar(3)	NO
 CREATED	datetime	YES		NULL	
 SQL_MODE	longtext	NO		NULL	
 DEFINER	longtext	NO		NULL	
+CHARACTER_SET_CLIENT	varchar(32)	NO			
+COLLATION_CONNECTION	varchar(32)	NO			
+DATABASE_COLLATION	varchar(32)	NO			
 SELECT * FROM information_schema.triggers
 WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL
 OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL
 OR action_reference_new_table IS NOT NULL;
-TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER
+TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
 ##################################################################################
 # Testcase 3.2.18.2 + 3.2.18.3: INFORMATION_SCHEMA.TRIGGERS accessible information
 ##################################################################################
@@ -109,9 +118,9 @@ DROP   USER 'testuser3'@'localhost';
 CREATE USER 'testuser3'@'localhost';
 DROP   USER 'testuser4'@'localhost';
 CREATE USER 'testuser4'@'localhost';
-GRANT SUPER ON *.* TO 'testuser1'@'localhost';
-GRANT SUPER ON *.* TO 'testuser3'@'localhost';
-GRANT SUPER ON *.* TO 'testuser4'@'localhost';
+GRANT TRIGGER ON *.* TO 'testuser1'@'localhost';
+GRANT TRIGGER ON *.* TO 'testuser3'@'localhost';
+GRANT TRIGGER ON *.* TO 'testuser4'@'localhost';
 GRANT ALL ON db_datadict.* TO 'testuser1'@'localhost' WITH GRANT OPTION;
 # Establish connection testuser1 (user=testuser1)
 CREATE TABLE db_datadict.t1 (f1 INT, f2 INT, f3 INT)
@@ -119,56 +128,63 @@ ENGINE = <engine_type>;
 CREATE TRIGGER trg1 BEFORE INSERT
 ON db_datadict.t1 FOR EACH ROW SET @test_before = 2, new.f1 = @test_before;
 GRANT ALL ON db_datadict.t1 TO 'testuser2'@'localhost';
+REVOKE TRIGGER ON db_datadict.t1 FROM 'testuser2'@'localhost';
 GRANT SELECT ON db_datadict.t1 TO 'testuser3'@'localhost';
 SELECT * FROM information_schema.triggers
 WHERE trigger_name = 'trg1';
-TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER
-NULL	db_datadict	trg1	INSERT	NULL	db_datadict	t1	0	NULL	SET @test_before = 2, new.f1 = @test_before	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		testuser1@localhost
+TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
+NULL	db_datadict	trg1	INSERT	NULL	db_datadict	t1	0	NULL	SET @test_before = 2, new.f1 = @test_before	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		testuser1@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW TRIGGERS FROM db_datadict;
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
-trg1	INSERT	t1	SET @test_before = 2, new.f1 = @test_before	BEFORE	NULL		testuser1@localhost
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
+trg1	INSERT	t1	SET @test_before = 2, new.f1 = @test_before	BEFORE	NULL		testuser1@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 # Establish connection testuser2 (user=testuser2)
 SHOW GRANTS FOR 'testuser2'@'localhost';
 Grants for testuser2@localhost
 GRANT USAGE ON *.* TO 'testuser2'@'localhost'
-GRANT ALL PRIVILEGES ON `db_datadict`.`t1` TO 'testuser2'@'localhost'
-# No SUPER Privilege --> no result for query
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `db_datadict`.`t1` TO 'testuser2'@'localhost'
+# No TRIGGER Privilege --> no result for query
 SELECT * FROM information_schema.triggers
 WHERE trigger_name = 'trg1';
-TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER
+TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
 SHOW TRIGGERS FROM db_datadict;
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 # Establish connection testuser3 (user=testuser3)
 SHOW GRANTS FOR 'testuser3'@'localhost';
 Grants for testuser3@localhost
-GRANT SUPER ON *.* TO 'testuser3'@'localhost'
+GRANT TRIGGER ON *.* TO 'testuser3'@'localhost'
 GRANT SELECT ON `db_datadict`.`t1` TO 'testuser3'@'localhost'
-# SUPER Privilege + SELECT Privilege on t1 --> result for query
+# TRIGGER Privilege + SELECT Privilege on t1 --> result for query
 SELECT * FROM information_schema.triggers
 WHERE trigger_name = 'trg1';
-TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER
-NULL	db_datadict	trg1	INSERT	NULL	db_datadict	t1	0	NULL	SET @test_before = 2, new.f1 = @test_before	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		testuser1@localhost
+TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
+NULL	db_datadict	trg1	INSERT	NULL	db_datadict	t1	0	NULL	SET @test_before = 2, new.f1 = @test_before	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		testuser1@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW TRIGGERS FROM db_datadict;
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
-trg1	INSERT	t1	SET @test_before = 2, new.f1 = @test_before	BEFORE	NULL		testuser1@localhost
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
+trg1	INSERT	t1	SET @test_before = 2, new.f1 = @test_before	BEFORE	NULL		testuser1@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 # Establish connection testuser4 (user=testuser4)
 SHOW GRANTS FOR 'testuser4'@'localhost';
 Grants for testuser4@localhost
-GRANT SUPER ON *.* TO 'testuser4'@'localhost'
-# SUPER Privilege + no SELECT Privilege on t1 --> no result for query
+GRANT TRIGGER ON *.* TO 'testuser4'@'localhost'
+# TRIGGER Privilege + no SELECT Privilege on t1 --> result for query
+SELECT * FROM db_datadict.t1;
+ERROR 42000: SELECT command denied to user 'testuser4'@'localhost' for table 't1'
+DESC db_datadict.t1;
+ERROR 42000: SELECT command denied to user 'testuser4'@'localhost' for table 't1'
 SELECT * FROM information_schema.triggers
 WHERE trigger_name = 'trg1';
-TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER
+TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
+NULL	db_datadict	trg1	INSERT	NULL	db_datadict	t1	0	NULL	SET @test_before = 2, new.f1 = @test_before	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		testuser1@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW TRIGGERS FROM db_datadict;
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
+trg1	INSERT	t1	SET @test_before = 2, new.f1 = @test_before	BEFORE	NULL		testuser1@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 # Switch to connection default and close connections testuser1 - testuser4
 SELECT * FROM information_schema.triggers
 WHERE trigger_name = 'trg1';
-TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER
-NULL	db_datadict	trg1	INSERT	NULL	db_datadict	t1	0	NULL	SET @test_before = 2, new.f1 = @test_before	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		testuser1@localhost
+TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
+NULL	db_datadict	trg1	INSERT	NULL	db_datadict	t1	0	NULL	SET @test_before = 2, new.f1 = @test_before	ROW	BEFORE	NULL	NULL	OLD	NEW	NULL		testuser1@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW TRIGGERS FROM db_datadict;
-Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
-trg1	INSERT	t1	SET @test_before = 2, new.f1 = @test_before	BEFORE	NULL		testuser1@localhost
+Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
+trg1	INSERT	t1	SET @test_before = 2, new.f1 = @test_before	BEFORE	NULL		testuser1@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP USER 'testuser1'@'localhost';
 DROP USER 'testuser2'@'localhost';
 DROP USER 'testuser3'@'localhost';

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

@@ -35,10 +35,10 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE information_schema.USER_PRIVILEGES;
 Table	Create Table
 USER_PRIVILEGES	CREATE TEMPORARY TABLE `USER_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(512) default NULL,
-  `PRIVILEGE_TYPE` varchar(64) NOT NULL default '',
-  `IS_GRANTABLE` varchar(3) NOT NULL default ''
+  `GRANTEE` varchar(81) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(512) DEFAULT NULL,
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.USER_PRIVILEGES;
 Field	Type	Null	Key	Default	Extra
@@ -76,10 +76,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 #
 # Add GRANT OPTION db_datadict.* to testuser1;
 GRANT UPDATE ON db_datadict.* TO 'testuser1'@'localhost' WITH GRANT OPTION;
@@ -93,10 +93,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 # Establish connection testuser1 (user=testuser1)
 SELECT * FROM information_schema.user_privileges
 WHERE grantee LIKE '''testuser%'''
@@ -105,10 +105,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for testuser1@localhost
 GRANT USAGE ON *.* TO 'testuser1'@'localhost'
@@ -130,10 +130,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	testuser1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 GRANT SELECT ON *.* TO 'testuser1'@'localhost' WITH GRANT OPTION;
 #
 # Here <SELECT YES> is shown correctly for testuser1;
@@ -147,10 +147,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	testuser1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 # Switch to connection testuser1
 SELECT * FROM information_schema.user_privileges
 WHERE grantee LIKE '''testuser%'''
@@ -159,10 +159,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser1'@'localhost'	NULL	SELECT	YES
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	testuser1		Y	N	N	N	N	N	N	N	N	N	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for testuser1@localhost
 GRANT SELECT ON *.* TO 'testuser1'@'localhost' WITH GRANT OPTION
@@ -207,10 +207,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 # Switch to connection testuser1
 SELECT * FROM information_schema.user_privileges
 WHERE grantee LIKE '''testuser%'''
@@ -253,10 +253,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 # Switch to connection testuser1
 SELECT * FROM information_schema.user_privileges
 WHERE grantee LIKE '''testuser%'''
@@ -265,10 +265,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for testuser1@localhost
 GRANT USAGE ON *.* TO 'testuser1'@'localhost'
@@ -284,10 +284,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 SHOW GRANTS;
 Grants for testuser1@localhost
 GRANT USAGE ON *.* TO 'testuser1'@'localhost'
@@ -309,10 +309,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'testuser3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
-localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
-localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections
+localhost	testuser1		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser2		N	Y	Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
+localhost	testuser3		N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0
 # Switch to connection testuser1
 SELECT * FROM information_schema.user_privileges
 WHERE grantee LIKE '''testuser%'''

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

@@ -36,17 +36,21 @@ CHECK_OPTION	varchar(8)	NO
 IS_UPDATABLE	varchar(3)	NO			
 DEFINER	varchar(77)	NO			
 SECURITY_TYPE	varchar(7)	NO			
+CHARACTER_SET_CLIENT	varchar(32)	NO			
+COLLATION_CONNECTION	varchar(32)	NO			
 SHOW CREATE TABLE information_schema.VIEWS;
 Table	Create Table
 VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
-  `TABLE_CATALOG` varchar(512) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `TABLE_CATALOG` varchar(512) DEFAULT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
   `VIEW_DEFINITION` longtext NOT NULL,
-  `CHECK_OPTION` varchar(8) NOT NULL default '',
-  `IS_UPDATABLE` varchar(3) NOT NULL default '',
-  `DEFINER` varchar(77) NOT NULL default '',
-  `SECURITY_TYPE` varchar(7) NOT NULL default ''
+  `CHECK_OPTION` varchar(8) NOT NULL DEFAULT '',
+  `IS_UPDATABLE` varchar(3) NOT NULL DEFAULT '',
+  `DEFINER` varchar(77) NOT NULL DEFAULT '',
+  `SECURITY_TYPE` varchar(7) NOT NULL DEFAULT '',
+  `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
+  `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.VIEWS;
 Field	Type	Null	Key	Default	Extra
@@ -58,6 +62,8 @@ CHECK_OPTION	varchar(8)	NO
 IS_UPDATABLE	varchar(3)	NO			
 DEFINER	varchar(77)	NO			
 SECURITY_TYPE	varchar(7)	NO			
+CHARACTER_SET_CLIENT	varchar(32)	NO			
+COLLATION_CONNECTION	varchar(32)	NO			
 SELECT table_catalog, table_schema, table_name
 FROM information_schema.views WHERE table_catalog IS NOT NULL;
 table_catalog	table_schema	table_name
@@ -81,24 +87,24 @@ GRANT SELECT ON db_datadict.v_granted_to_1 TO 'testuser1'@'localhost';
 GRANT SHOW VIEW, CREATE VIEW ON db_datadict.* TO 'testuser2'@'localhost';
 SELECT * FROM information_schema.views
 WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
-NULL	db_datadict	v_granted_glob	/* ALGORITHM=UNDEFINED */ select `db_datadict`.`t1`.`f2` AS `f2`,`db_datadict`.`t1`.`f3` AS `f3` from `db_datadict`.`t1`	NONE	YES	root@localhost	DEFINER
-NULL	db_datadict	v_granted_to_1	/* ALGORITHM=UNDEFINED */ select `db_datadict`.`t1`.`f1` AS `f1`,`db_datadict`.`t1`.`f2` AS `f2`,`db_datadict`.`t1`.`f3` AS `f3` from `db_datadict`.`t1`	NONE	YES	root@localhost	DEFINER
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION
+NULL	db_datadict	v_granted_glob	select `db_datadict`.`t1`.`f2` AS `f2`,`db_datadict`.`t1`.`f3` AS `f3` from `db_datadict`.`t1`	NONE	YES	root@localhost	DEFINER	latin1	latin1_swedish_ci
+NULL	db_datadict	v_granted_to_1	select `db_datadict`.`t1`.`f1` AS `f1`,`db_datadict`.`t1`.`f2` AS `f2`,`db_datadict`.`t1`.`f3` AS `f3` from `db_datadict`.`t1`	NONE	YES	root@localhost	DEFINER	latin1	latin1_swedish_ci
 # Establish connection testuser1 (user=testuser1)
 SELECT * FROM information_schema.views
 WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
-NULL	db_datadict	v_granted_to_1		NONE	YES	root@localhost	DEFINER
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION
+NULL	db_datadict	v_granted_to_1		NONE	YES	root@localhost	DEFINER	latin1	latin1_swedish_ci
 # Establish connection testuser2 (user=testuser2)
 SELECT * FROM information_schema.views
 WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
-NULL	db_datadict	v_granted_glob		NONE	YES	root@localhost	DEFINER
-NULL	db_datadict	v_granted_to_1		NONE	YES	root@localhost	DEFINER
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION
+NULL	db_datadict	v_granted_glob		NONE	YES	root@localhost	DEFINER	latin1	latin1_swedish_ci
+NULL	db_datadict	v_granted_to_1		NONE	YES	root@localhost	DEFINER	latin1	latin1_swedish_ci
 # Establish connection test_no_views (user=test_no_views)
 SELECT * FROM information_schema.views
 WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION
 # Switch to connection default and close all other connections
 DROP USER 'testuser1'@'localhost';
 DROP USER 'testuser2'@'localhost';
@@ -117,12 +123,12 @@ DROP   USER 'testuser1'@'localhost';
 CREATE USER 'testuser1'@'localhost';
 SELECT * FROM information_schema.views
 WHERE table_name LIKE 't1_%';
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION
 CREATE VIEW test.t1_view AS SELECT DISTINCT f1 FROM test.t1_table;
 SELECT * FROM information_schema.views
 WHERE table_name LIKE 't1_%';
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
-NULL	test	t1_view	/* ALGORITHM=UNDEFINED */ select distinct `test`.`t1_table`.`f1` AS `f1` from `test`.`t1_table`	NONE	NO	root@localhost	DEFINER
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE	CHARACTER_SET_CLIENT	COLLATION_CONNECTION
+NULL	test	t1_view	select distinct `test`.`t1_table`.`f1` AS `f1` from `test`.`t1_table`	NONE	NO	root@localhost	DEFINER	latin1	latin1_swedish_ci
 SELECT table_name,definer FROM information_schema.views
 WHERE table_name = 't1_view';
 table_name	definer
@@ -186,8 +192,6 @@ WHERE table_name LIKE 't1_%'
 ORDER BY table_name;
 table_name
 t1_view
-Warnings:
-Warning	1356	View 'db_datadict.t1_view' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 CREATE TABLE test.t1_table (f1 BIGINT, f2 CHAR(10))
 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci COMMENT = 'Initial Comment'
 ENGINE = <engine_type>;

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

-SET @NO_REFRESH = IF( '' = '', 0, 1);

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

 
 --source suite/funcs_1/storedproc/load_sp_tb.inc
 --------------------------------------------------------------------------------
-SET @@global.max_heap_table_size=4294967295;
-SET @@session.max_heap_table_size=4294967295;
 
 --source suite/funcs_1/storedproc/cleanup_sp_tb.inc
 --------------------------------------------------------------------------------

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

 
 --source suite/funcs_1/storedproc/load_sp_tb.inc
 --------------------------------------------------------------------------------
-SET @@global.max_heap_table_size=4294967295;
-SET @@session.max_heap_table_size=4294967295;
 
 --source suite/funcs_1/storedproc/cleanup_sp_tb.inc
 --------------------------------------------------------------------------------

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

 
 --source suite/funcs_1/storedproc/load_sp_tb.inc
 --------------------------------------------------------------------------------
-SET @@global.max_heap_table_size=4294967295;
-SET @@session.max_heap_table_size=4294967295;
 
 --source suite/funcs_1/storedproc/cleanup_sp_tb.inc
 --------------------------------------------------------------------------------

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

 
 --source suite/funcs_1/storedproc/load_sp_tb.inc
 --------------------------------------------------------------------------------
-SET @@global.max_heap_table_size=4294967295;
-SET @@session.max_heap_table_size=4294967295;
 
 --source suite/funcs_1/storedproc/cleanup_sp_tb.inc
 --------------------------------------------------------------------------------

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

 
 --source suite/funcs_1/storedproc/load_sp_tb.inc
 --------------------------------------------------------------------------------
-SET @@global.max_heap_table_size=4294967295;
-SET @@session.max_heap_table_size=4294967295;
 
 --source suite/funcs_1/storedproc/cleanup_sp_tb.inc
 --------------------------------------------------------------------------------

mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result → mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result

@@ -35,16 +35,16 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-1	root	localhost	information_schema	Query	TIME	NULL	SHOW processlist
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-1	root	localhost	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	localhost	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-1	root	localhost	information_schema	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	localhost	information_schema	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
 INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -105,13 +105,13 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-2	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-2	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM processlist  ORDER BY id
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-2	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
 INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -170,10 +170,10 @@ Grants for ddicttestuser1@localhost
 GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-2	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-2	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
 ####################################################################################
 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
 SHOW/SELECT shows all processes/threads.
@@ -183,14 +183,14 @@ Grants for ddicttestuser1@localhost
 GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-1	root	localhost	information_schema	Sleep	TIME		NULL
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	root	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-3	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-1	root	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 5 Grant PROCESS privilege to anonymous user.
 connection default (user=root)
@@ -206,16 +206,16 @@ Grants for @localhost
 GRANT PROCESS ON *.* TO ''@'localhost'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-1	root	localhost	information_schema	Sleep	TIME		NULL
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-4		localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	root	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID		localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-4		localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-1	root	localhost	information_schema	Sleep	TIME		NULL
+ID		localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 6 Revoke PROCESS privilege from ddicttestuser1
 connection default (user=root)
@@ -231,14 +231,14 @@ Grants for ddicttestuser1@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-5	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 7 Revoke PROCESS privilege from anonymous user + disconnect ddicttestuser1
 connection default (user=root)
@@ -254,8 +254,8 @@ Grants for @localhost
 GRANT USAGE ON *.* TO ''@'localhost'
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-6		localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-4		localhost	information_schema	Sleep	TIME		NULL
+ID		localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
+ID		localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
 connection default (user=root)
@@ -270,16 +270,16 @@ Grants for ddicttestuser1@localhost
 GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-7	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 9 Revoke SUPER privilege from user ddicttestuser1
 connection default (user=root)
@@ -295,18 +295,18 @@ Grants for ddicttestuser1@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-8	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-8	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 10 Grant SUPER privilege with grant option to user ddicttestuser1.
 connection default (user=root)
@@ -343,30 +343,30 @@ Grants for ddicttestuser2@localhost
 GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-1	root	localhost	information_schema	Sleep	TIME		NULL
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-4		localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-6		localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-11	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	root	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID		localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID		localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-11	ddicttestuser2	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-6		localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-4		localhost	information_schema	Sleep	TIME		NULL
-3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-1	root	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser2	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID		localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID		localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 11 User ddicttestuser1 revokes PROCESS privilege from user ddicttestuser2
 connection ddicttestuser1;
@@ -381,12 +381,12 @@ Grants for ddicttestuser2@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-11	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
-12	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-12	ddicttestuser2	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-11	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser2	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
 connection default (user=root)
@@ -404,24 +404,24 @@ GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
 ERROR 28000: Access denied for user 'ddicttestuser1'@'localhost' (using password: YES)
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-13	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-13	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 12 Revoke the SELECT privilege from user ddicttestuser1
 connection default (user=root)
@@ -439,26 +439,26 @@ Grants for ddicttestuser1@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-13	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-14	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-14	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
-13	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-8	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-2	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 12.2 Revoke only the SELECT privilege on the information_schema from ddicttestuser1.
 connection default (user=root)

mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result → mysql-test/suite/funcs_1/r/processlist_priv_ps.result

@@ -35,16 +35,16 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-3	root	localhost	information_schema	Query	TIME	NULL	SHOW processlist
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-3	root	localhost	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	localhost	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-3	root	localhost	information_schema	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	localhost	information_schema	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
 INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -105,13 +105,13 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-4	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-4	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
+ID	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM processlist  ORDER BY id
 SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-4	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
+ID	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO FROM processlist  ORDER BY id
 CREATE TEMPORARY TABLE test.t_processlist AS SELECT * FROM processlist;
 UPDATE test.t_processlist SET user='horst' WHERE id=1  ;
 INSERT INTO processlist SELECT * FROM test.t_processlist;
@@ -170,10 +170,10 @@ Grants for ddicttestuser1@localhost
 GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-4	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-4	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
 ####################################################################################
 4.2 New connection con101 (ddicttestuser1 with PROCESS privilege)
 SHOW/SELECT shows all processes/threads.
@@ -183,14 +183,14 @@ Grants for ddicttestuser1@localhost
 GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-3	root	localhost	information_schema	Sleep	TIME		NULL
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	root	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-5	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	root	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 5 Grant PROCESS privilege to anonymous user.
 connection default (user=root)
@@ -206,16 +206,16 @@ Grants for @localhost
 GRANT PROCESS ON *.* TO ''@'localhost'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-3	root	localhost	information_schema	Sleep	TIME		NULL
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-6		localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	root	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID		localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-6		localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	root	localhost	information_schema	Sleep	TIME		NULL
+ID		localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 6 Revoke PROCESS privilege from ddicttestuser1
 connection default (user=root)
@@ -231,14 +231,14 @@ Grants for ddicttestuser1@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-7	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 7 Revoke PROCESS privilege from anonymous user + disconnect ddicttestuser1
 connection default (user=root)
@@ -254,8 +254,8 @@ Grants for @localhost
 GRANT USAGE ON *.* TO ''@'localhost'
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-8		localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-6		localhost	information_schema	Sleep	TIME		NULL
+ID		localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
+ID		localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 8 Grant SUPER (does not imply PROCESS) privilege to ddicttestuser1
 connection default (user=root)
@@ -270,16 +270,16 @@ Grants for ddicttestuser1@localhost
 GRANT SUPER ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-9	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-9	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 9 Revoke SUPER privilege from user ddicttestuser1
 connection default (user=root)
@@ -295,18 +295,18 @@ Grants for ddicttestuser1@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-10	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-10	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 10 Grant SUPER privilege with grant option to user ddicttestuser1.
 connection default (user=root)
@@ -343,30 +343,30 @@ Grants for ddicttestuser2@localhost
 GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-3	root	localhost	information_schema	Sleep	TIME		NULL
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-6		localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-8		localhost	information_schema	Sleep	TIME		NULL
-9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-13	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	root	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID		localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID		localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-13	ddicttestuser2	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-8		localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-6		localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-3	root	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser2	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID		localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID		localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	root	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 11 User ddicttestuser1 revokes PROCESS privilege from user ddicttestuser2
 connection ddicttestuser1;
@@ -381,12 +381,12 @@ Grants for ddicttestuser2@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-13	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
-14	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser2	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-14	ddicttestuser2	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-13	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser2	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser2	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 11.2 Revoke SUPER,PROCESS,GRANT OPTION privilege from user ddicttestuser1
 connection default (user=root)
@@ -404,24 +404,24 @@ GRANT PROCESS ON *.* TO 'ddicttestuser2'@'localhost';
 ERROR 28000: Access denied for user 'ddicttestuser1'@'localhost' (using password: YES)
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-15	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-15	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 12 Revoke the SELECT privilege from user ddicttestuser1
 connection default (user=root)
@@ -439,26 +439,26 @@ Grants for ddicttestuser1@localhost
 GRANT USAGE ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1'
 SHOW processlist;
 Id	User	Host	db	Command	Time	State	Info
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-15	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-16	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Query	TIME	NULL	SHOW processlist
 SELECT * FROM information_schema.processlist;
 ID	USER	HOST	DB	COMMAND	TIME	STATE	INFO
-16	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
-15	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-12	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-11	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-10	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-9	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-7	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-5	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
-4	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Execute	TIME	executing	SELECT * FROM information_schema.processlist
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
+ID	ddicttestuser1	localhost	information_schema	Sleep	TIME		NULL
 ####################################################################################
 12.2 Revoke only the SELECT privilege on the information_schema from ddicttestuser1.
 connection default (user=root)

mysql-test/suite/funcs_1/r/a_processlist_val_no_prot.result → mysql-test/suite/funcs_1/r/processlist_val_no_prot.result

@@ -152,3 +152,4 @@ COUNT(*)
 
 ----- close connection ddicttestuser1 -----
 DROP USER ddicttestuser1@'localhost';
+DROP TABLE test.t1;

mysql-test/suite/funcs_1/r/b_processlist_val_ps.result → mysql-test/suite/funcs_1/r/processlist_val_ps.result

@@ -152,3 +152,4 @@ COUNT(*)
 
 ----- close connection ddicttestuser1 -----
 DROP USER ddicttestuser1@'localhost';
+DROP TABLE test.t1;

mysql-test/suite/funcs_1/storedproc/storedproc_master.inc

@@ -4782,13 +4782,13 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
-delimiter //;
---error ER_PARSE_ERROR
-CREATE PROCEDURE sp1()
-  read_only:BEGIN
-    SELECT @x;
-END//
-delimiter ;//
+# delimiter //;
+# --error ER_PARSE_ERROR
+# CREATE PROCEDURE sp1()
+#   read_only:BEGIN
+#     SELECT @x;
+# END//
+# delimiter ;//
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;

mysql-test/suite/funcs_1/t/disabled.def

@@ -14,4 +14,3 @@ innodb_storedproc_06 : bug#33464 DROP FUNCTION let server hang
 myisam_storedproc_06 : bug#33464 DROP FUNCTION let server hang
 memory_storedproc_06 : bug#33464 DROP FUNCTION let server hang
 ndb_storedproc_06 :    bug#33464 DROP FUNCTION let server hang
-ndb__datadict: 2007-10-08 mleich Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results

mysql-test/suite/funcs_1/t/is_engines.test

+# suite/funcs_1/t/is_engines.test
+#
+# Check the layout of information_schema.engines
+#
+# Note:
+#    This test is not intended
+#    - to show information about the all time existing tables
+#      within the databases information_schema and mysql
+#    - for checking storage engine properties
+#      Therefore please do not alter $engine_type and $other_engine_type.
+#      Some results of the subtests depend on the storage engines assigned.
+#
+# Author:
+# 2008-02-29 mleich WL#4203 Reorganize and fix the data dictionary tests of
+#                           testsuite funcs_1
+#
+
+# --source suite/funcs_1/datadict/datadict.pre
+
+let $engine_type       = MEMORY;
+let $other_engine_type = MyISAM;
+
+let $is_table = ENGINES;
+
+# The table INFORMATION_SCHEMA.ENGINES must exist
+eval SHOW TABLES FROM information_schema LIKE '$is_table';
+
+--echo #######################################################################
+--echo # Testcase 3.2.1.1: INFORMATION_SCHEMA tables can be queried via SELECT
+--echo #######################################################################
+# Ensure that every INFORMATION_SCHEMA table can be queried with a SELECT
+# statement, just as if it were an ordinary user-defined table.
+#
+--source suite/funcs_1/datadict/is_table_query.inc
+
+
+--echo #########################################################################
+--echo # Testcase 3.2.12.1: INFORMATION_SCHEMA.ENGINES layout
+--echo #########################################################################
+# Ensure that the INFORMATION_SCHEMA.ENGINES table has the following columns,
+# in the following order:
+#
+# ENGINE 
+# SUPPORT
+# COMMENT
+# TRANSACTIONS
+# XA
+# SAVEPOINTS
+#
+# Value      Meaning
+# YES        The feature is supported and is active.
+# NO         The feature is not supported = The server was compiled without
+#            support for the feature.
+# DISABLED   The feature is supported but has been disabled.
+#
+eval DESCRIBE          information_schema.$is_table;
+eval SHOW CREATE TABLE information_schema.$is_table;
+eval SHOW COLUMNS FROM information_schema.$is_table;
+
+# Note: Retrieval of information within information_schema.columns about
+#       information_schema.engines is in is_columns_is.test.
+
+# FIXME: Check the regression tests and implement tests checking the
+#        functionality if missing.
+
+
+--echo ########################################################################
+--echo # Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and
+--echo #           DDL on INFORMATION_SCHEMA tables are not supported
+--echo ########################################################################
+# 3.2.1.3:  Ensure that no user may execute an INSERT statement on any
+#           INFORMATION_SCHEMA table.
+# 3.2.1.4:  Ensure that no user may execute an UPDATE statement on any
+#           INFORMATION_SCHEMA table.
+# 3.2.1.5:  Ensure that no user may execute a DELETE statement on any
+#           INFORMATION_SCHEMA table.
+# 3.2.1.8:  Ensure that no user may create an index on an
+#           INFORMATION_SCHEMA table.
+# 3.2.1.9:  Ensure that no user may alter the definition of an
+#           INFORMATION_SCHEMA table.
+# 3.2.1.10: Ensure that no user may drop an INFORMATION_SCHEMA table.
+# 3.2.1.11: Ensure that no user may move an INFORMATION_SCHEMA table to any
+#           other database.
+# 3.2.1.12: Ensure that no user may directly add to, alter, or delete any data
+#           in an INFORMATION_SCHEMA table.
+#
+--disable_warnings
+DROP DATABASE IF EXISTS db_datadict;
+--enable_warnings
+CREATE DATABASE db_datadict;
+--replace_result $engine_type <engine_type>
+eval
+CREATE TABLE db_datadict.t1 (f1 BIGINT)
+ENGINE = $engine_type;
+
+--error ER_DBACCESS_DENIED_ERROR
+INSERT INTO information_schema.engines
+SELECT * FROM information_schema.engines;
+
+--error ER_DBACCESS_DENIED_ERROR
+UPDATE information_schema.engines SET engine = '1234567';
+
+--error ER_DBACCESS_DENIED_ERROR
+DELETE FROM information_schema.engines WHERE support IN ('DEFAULT','YES');
+--error ER_DBACCESS_DENIED_ERROR
+TRUNCATE information_schema.engines;
+
+--error ER_DBACCESS_DENIED_ERROR
+CREATE INDEX my_idx_on_engines ON information_schema.engines(engine);
+
+--error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE information_schema.engines DROP PRIMARY KEY;
+--error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE information_schema.engines ADD f1 INT;
+
+--error ER_DBACCESS_DENIED_ERROR
+DROP TABLE information_schema.engines;
+
+--error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE information_schema.engines RENAME db_datadict.engines;
+--error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE information_schema.engines RENAME information_schema.xengines;
+
+# Cleanup
+DROP DATABASE db_datadict;
+

mysql-test/suite/funcs_1/t/is_engines_archive.test

+# suite/funcs_1/t/is_engines_archive.test
+#
+# Check the content of information_schema.engines
+# Variant for storage engine ARCHIVE
+#
+# Author:
+# 2008-01-23 mleich WL#4203 Reorganize and fix the data dictionary tests of
+#                           testsuite funcs_1
+#
+
+let $engine_type= ARCHIVE;
+--source include/have_archive.inc
+--vertical_results
+eval SELECT * FROM information_schema.engines
+WHERE ENGINE = '$engine_type';

mysql-test/suite/funcs_1/t/is_engines_blackhole.test

+# suite/funcs_1/t/is_engines_blackhole.test
+#
+# Check the content of information_schema.engines
+# Variant for storage engine BLACKHOLE
+#
+# Author:
+# 2008-01-23 mleich WL#4203 Reorganize and fix the data dictionary tests of
+#                           testsuite funcs_1
+#
+
+let $engine_type= BLACKHOLE;
+--source include/have_blackhole.inc
+--vertical_results
+eval SELECT * FROM information_schema.engines
+WHERE ENGINE = '$engine_type';

mysql-test/suite/funcs_1/t/is_engines_csv.test

+# suite/funcs_1/t/is_engines_csv.test
+#
+# Check the content of information_schema.engines
+# Variant for storage engine CSV
+#
+# Author:
+# 2008-01-23 mleich WL#4203 Reorganize and fix the data dictionary tests of
+#                           testsuite funcs_1
+#
+
+let $engine_type= CSV;
+--source include/have_csv.inc
+--vertical_results
+eval SELECT * FROM information_schema.engines
+WHERE ENGINE = '$engine_type';

mysql-test/suite/funcs_1/t/is_engines_federated.test

+# suite/funcs_1/t/is_engines_federated.test
+#
+# Check the content of information_schema.engines
+# Variant for storage engine FEDERATED
+#
+# Author:
+# 2008-01-23 mleich WL#4203 Reorganize and fix the data dictionary tests of
+#                           testsuite funcs_1
+#
+
+let $engine_type= FEDERATED;
+--source include/have_federated_db.inc
+--vertical_results
+eval SELECT * FROM information_schema.engines
+WHERE ENGINE = '$engine_type';

mysql-test/suite/funcs_1/t/is_engines_innodb.test

+# suite/funcs_1/t/is_engines_innodb.test
+#
+# Check the content of information_schema.engines
+# Variant for storage engine InnoDB
+#
+# Author:
+# 2008-01-23 mleich WL#4203 Reorganize and fix the data dictionary tests of
+#                           testsuite funcs_1
+#
+
+let $engine_type= InnoDB;
+--source include/have_innodb.inc
+--vertical_results
+eval SELECT * FROM information_schema.engines
+WHERE ENGINE = '$engine_type';

mysql-test/suite/funcs_1/t/is_engines_memory.test

+# suite/funcs_1/t/is_engines_memory.test
+#
+# Check the content of information_schema.engines
+# Variant for storage engine MEMORY
+#
+# Author:
+# 2008-01-23 mleich WL#4203 Reorganize and fix the data dictionary tests of
+#                           testsuite funcs_1
+#
+
+let $engine_type= MEMORY;
+--vertical_results
+eval SELECT * FROM information_schema.engines
+WHERE ENGINE = '$engine_type';

mysql-test/suite/funcs_1/t/is_engines_merge.test

+# suite/funcs_1/t/is_engines_innodb.test
+#
+# Check the content of information_schema.engines
+# Variant for storage engine InnoDB
+#
+# Author:
+# 2008-01-23 mleich WL#4203 Reorganize and fix the data dictionary tests of
+#                           testsuite funcs_1
+#
+
+let $engine_type= MRG_MYISAM;
+--vertical_results
+eval SELECT * FROM information_schema.engines
+WHERE ENGINE = '$engine_type';

mysql-test/suite/funcs_1/t/is_engines_myisam.test

+# suite/funcs_1/t/is_tables_myisam.test
+#
+# Check the content of information_schema.engines
+# Variant for storage engine MyISAM
+#
+# Author:
+# 2008-01-23 mleich WL#4203 Reorganize and fix the data dictionary tests of
+#                           testsuite funcs_1
+#
+
+let $engine_type= MyISAM;
+--vertical_results
+eval SELECT * FROM information_schema.engines
+WHERE ENGINE = '$engine_type';

mysql-test/suite/funcs_1/t/is_engines_ndb.test

+# suite/funcs_1/t/is_engines_ndb.test
+#
+# Check the content of information_schema.engines
+# Variant for storage engine NDB
+#
+# Author:
+# 2008-01-23 mleich WL#4203 Reorganize and fix the data dictionary tests of
+#                           testsuite funcs_1
+#
+
+let $engine_type= ndbcluster;
+--source include/have_ndb.inc
+--vertical_results
+eval SELECT * FROM information_schema.engines
+WHERE ENGINE = '$engine_type';

mysql-test/suite/funcs_1/t/is_events.test

+# suite/funcs_1/t/is_events.test
+#
+# Check the layout of information_schema.events and some functionality of it.
+#
+#    This test is not intended for checking storage engine properties
+#    Therefore please do not alter $engine_type and $other_engine_type.
+#
+# Author:
+# 2008-02-29 mleich WL#4203 Reorganize and fix the data dictionary tests of
+#                           testsuite funcs_1
+#
+
+# --source suite/funcs_1/datadict/datadict.pre
+
+let $engine_type       = MEMORY;
+let $other_engine_type = MyISAM;
+
+let $is_table = EVENTS;
+
+# The table INFORMATION_SCHEMA.EVENTS must exist
+eval SHOW TABLES FROM information_schema LIKE '$is_table';
+
+--echo #######################################################################
+--echo # Testcase 3.2.1.1: INFORMATION_SCHEMA tables can be queried via SELECT
+--echo #######################################################################
+# Ensure that every INFORMATION_SCHEMA table can be queried with a SELECT
+# statement, just as if it were an ordinary user-defined table.
+#
+--source suite/funcs_1/datadict/is_table_query.inc
+
+
+--echo #########################################################################
+--echo # Testcase 3.2.12.1: INFORMATION_SCHEMA.EVENTS layout
+--echo #########################################################################
+# Ensure that the INFORMATION_SCHEMA.EVENTS table has the following columns,
+# in the following order:
+#
+# EVENT_CATALOG       always NULL
+# EVENT_SCHEMA        The name of the schema (database) to which this
+#                     event belongs.
+# EVENT_NAME          The name of the event.
+# DEFINER             The user who created the event.
+#                     'user_name'@'host_name'  format!
+# TIME_ZONE           The time zone in effect when schedule for the event was
+#                     last modified
+# EVENT_BODY          The language used for the statements in the event's
+#                     DO clause. (always SQL)
+# EVENT_DEFINITION    The text of the SQL statement making up the event's
+#                     DO clause.
+# EVENT_TYPE          One of the two values ONE TIME or RECURRING.
+# EXECUTE_AT          one-time event: DATETIME value specified in the AT clause
+#                                     of the CREATE EVENT statement used to
+#                                     create the event
+#                     or of the last ALTER EVENT statement that modified
+#                     the event.
+# INTERVAL_VALUE      recurring events; numeric portion of the event's
+#                     EVERY clause.
+# INTERVAL_FIELD      recurring events: units portion of the EVERY clause
+#                     governing the timing of the event, prefixed with
+#                     'INTERVAL_'.  Example: 'INTERVAL_DAY'
+# SQL_MODE            The SQL mode in effect at the time the event was created
+#                     or altered.
+# STARTS              For recurring event whose definition includes a STARTS
+#                     clause, this column contains the corresponding
+#                     DATETIME value. If there is no STARTS clause affecting
+#                     the timing of the event, this column is empty.
+# ENDS                For a recurring event whose definition includes a ENDS
+#                     clause, this column contains the corresponding DATETIME
+#                     value. If there is no ENDS clause affecting the timing
+#                     of the event, this column contains NULL.
+# STATUS              ENABLED, DISABLED or SLAVESIDE_DISABLED
+# ON_COMPLETION       PRESERVE or NOT PRESERVE.
+# CREATED             Date and time of event creation
+# LAST_ALTERED        Date and time of the last event modification
+#                     never modified -> value = CREATED
+# LAST_EXECUTED       Date and time of start of last event execution
+#                     never executed -> value IS NULL.
+# EVENT_COMMENT       The text of a comment. Default: empty string.
+# ORIGINATOR          The server ID of the MySQL server on which the event was
+#                     created; used in replication. Default: 0
+# CHARACTER_SET_CLIENT Session value of the character_set_client system variable
+#                      when the event was created.
+# COLLATION_CONNECTION Session value of the collation_connection system
+#                      variable when the event was created.
+# DATABASE_COLLATION  Collation of the database with which the event
+#                     is associated.
+#
+eval DESCRIBE          information_schema.$is_table;
+eval SHOW CREATE TABLE information_schema.$is_table;
+eval SHOW COLUMNS FROM information_schema.$is_table;
+
+# Note: Retrieval of information within information_schema.columns about
+#       information_schema.events is in is_columns_is.test.
+
+# Check event_catalog event_body, event_type, event_type, status, on_completion
+SELECT event_catalog, event_name, event_body, event_type, event_type,
+       status, on_completion
+FROM information_schema.events
+WHERE event_catalog IS NOT NULL or
+      event_body NOT IN ('SQL') or
+      event_type NOT IN ('ONE TIME','RECURRING') or
+      status NOT IN ('ENABLED','DISABLED','SLAVESIDE_DISABLED') or
+      on_completion NOT IN ('PRESERVE','NOT PRESERVE');
+
+# FIXME:  Check the regression tests and implement tests checking the
+#         functionality if missing.
+
+
+--echo ########################################################################
+--echo # Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and
+--echo #           DDL on INFORMATION_SCHEMA tables are not supported
+--echo ########################################################################
+# 3.2.1.3:  Ensure that no user may execute an INSERT statement on any
+#           INFORMATION_SCHEMA table.
+# 3.2.1.4:  Ensure that no user may execute an UPDATE statement on any
+#           INFORMATION_SCHEMA table.
+# 3.2.1.5:  Ensure that no user may execute a DELETE statement on any
+#           INFORMATION_SCHEMA table.
+# 3.2.1.8:  Ensure that no user may create an index on an
+#           INFORMATION_SCHEMA table.
+# 3.2.1.9:  Ensure that no user may alter the definition of an
+#           INFORMATION_SCHEMA table.
+# 3.2.1.10: Ensure that no user may drop an INFORMATION_SCHEMA table.
+# 3.2.1.11: Ensure that no user may move an INFORMATION_SCHEMA table to any
+#           other database.
+# 3.2.1.12: Ensure that no user may directly add to, alter, or delete any data
+#           in an INFORMATION_SCHEMA table.
+#
+--disable_warnings
+DROP DATABASE IF EXISTS db_datadict;
+--enable_warnings
+CREATE DATABASE db_datadict;
+--replace_result $engine_type <engine_type>
+eval
+CREATE TABLE db_datadict.t1 (f1 BIGINT)
+ENGINE = $engine_type;
+
+--error ER_DBACCESS_DENIED_ERROR
+INSERT INTO information_schema.events
+SELECT * FROM information_schema.events;
+
+--error ER_DBACCESS_DENIED_ERROR
+UPDATE information_schema.events SET event_name = '1234567'
+WHERE table_name = 't1';
+
+--error ER_DBACCESS_DENIED_ERROR
+DELETE FROM information_schema.events WHERE event_catalog IS NULL;
+--error ER_DBACCESS_DENIED_ERROR
+TRUNCATE information_schema.events;
+
+--error ER_DBACCESS_DENIED_ERROR
+CREATE INDEX my_idx_on_events ON information_schema.events(event_name);
+
+--error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE information_schema.events DROP PRIMARY KEY;
+--error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE information_schema.events ADD f1 INT;
+
+--error ER_DBACCESS_DENIED_ERROR
+DROP TABLE information_schema.events;
+
+--error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE information_schema.events RENAME db_datadict.events;
+--error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE information_schema.events RENAME information_schema.xevents;
+
+# Cleanup
+DROP DATABASE db_datadict;
+

mysql-test/suite/funcs_1/t/is_routines.test

@@ -66,6 +66,10 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
 # ROUTINE_COMMENT (shows the comment, if any, defined for the routine;
 #         otherwise NULL),
 # DEFINER (shows the user who created the routine).
+# Starting with MySQL 5.1
+# CHARACTER_SET_CLIENT
+# COLLATION_CONNECTION
+# DATABASE_COLLATION
 #
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval DESCRIBE          information_schema.$is_table;

mysql-test/suite/funcs_1/t/is_triggers.test

@@ -91,7 +91,7 @@ WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL
 #           trigger on which the current user or PUBLIC has privileges.
 # 3.2.18.3: Ensure that the table does not show any information on any trigger
 #           on which the current user and public have no privileges.
-# The SUPER privilege is required for
+# The SUPER (before 5.1.22) or TRIGGER (since 5.1.22) privilege is required for
 # - creation of triggers
 # - retrieval in INFORMATION_SCHEMA.TRIGGERS (affects size of result set)
 #
@@ -112,9 +112,9 @@ CREATE USER 'testuser3'@'localhost';
 DROP   USER 'testuser4'@'localhost';
 CREATE USER 'testuser4'@'localhost';
 
-GRANT SUPER ON *.* TO 'testuser1'@'localhost';
-GRANT SUPER ON *.* TO 'testuser3'@'localhost';
-GRANT SUPER ON *.* TO 'testuser4'@'localhost';
+GRANT TRIGGER ON *.* TO 'testuser1'@'localhost';
+GRANT TRIGGER ON *.* TO 'testuser3'@'localhost';
+GRANT TRIGGER ON *.* TO 'testuser4'@'localhost';
 GRANT ALL ON db_datadict.* TO 'testuser1'@'localhost' WITH GRANT OPTION;
 
 let $my_select = SELECT * FROM information_schema.triggers
@@ -130,6 +130,7 @@ ENGINE = $engine_type;
 CREATE TRIGGER trg1 BEFORE INSERT
 ON db_datadict.t1 FOR EACH ROW SET @test_before = 2, new.f1 = @test_before;
 GRANT ALL ON db_datadict.t1 TO 'testuser2'@'localhost';
+REVOKE TRIGGER ON db_datadict.t1 FROM 'testuser2'@'localhost';
 GRANT SELECT ON db_datadict.t1 TO 'testuser3'@'localhost';
 eval $my_select;
 eval $my_show;
@@ -138,7 +139,7 @@ eval $my_show;
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser2, localhost, testuser2, , db_datadict);
 SHOW GRANTS FOR 'testuser2'@'localhost';
---echo # No SUPER Privilege --> no result for query
+--echo # No TRIGGER Privilege --> no result for query
 eval $my_select;
 eval $my_show;
 
@@ -146,7 +147,7 @@ eval $my_show;
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser3, localhost, testuser3, , test);
 SHOW GRANTS FOR 'testuser3'@'localhost';
---echo # SUPER Privilege + SELECT Privilege on t1 --> result for query
+--echo # TRIGGER Privilege + SELECT Privilege on t1 --> result for query
 eval $my_select;
 eval $my_show;
 
@@ -154,7 +155,10 @@ eval $my_show;
 --replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK
 connect (testuser4, localhost, testuser4, , test);
 SHOW GRANTS FOR 'testuser4'@'localhost';
---echo # SUPER Privilege + no SELECT Privilege on t1 --> no result for query
+--echo # TRIGGER Privilege + no SELECT Privilege on t1 --> result for query
+--disable_abort_on_error
+SELECT * FROM db_datadict.t1;
+DESC db_datadict.t1;
 eval $my_select;
 eval $my_show;
 

mysql-test/suite/funcs_1/t/is_views.test

@@ -52,6 +52,9 @@ eval SHOW TABLES FROM information_schema LIKE '$is_table';
 # IS_UPDATABLE (shows whether the view is an updatable view),
 # DEFINER (added with 5.0.14),
 # SECURITY_TYPE (added with 5.0.14).
+# Since MySQL 5.1
+# CHARACTER_SET_CLIENT
+# COLLATION_CONNECTION
 #
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
 eval DESCRIBE          information_schema.$is_table;

mysql-test/suite/funcs_1/t/ndb__datadict.test

-#### suite/funcs_1/t/datadict_ndb.test
-#
---source include/have_ndb.inc
-
-let $engine_type= ndb;
-# $OTHER_ENGINE_TYPE must be
-# - <> $engine_type
-# - all time available like MyISAM or MEMORY
-let $OTHER_ENGINE_TYPE= MEMORY;
-
---source suite/funcs_1/datadict/datadict_master.inc

mysql-test/suite/funcs_1/t/ndb__load.test

-##### suite/funcs_1/funcs_1/t/ndb__load.test
-
-# ndb tables should be used
-#
-# 1. Check if ndb is available
---source include/have_ndb.inc
-# 2. Set $engine_type
-let $engine_type= ndb;
-
-# Decide, if the objects are to be (re)created 
-#
-# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
-#   That means all objects have to be (re)created within the current script.
-#
-# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
-#   That means the current script must not (re)create any object and every 
-#   testscript/case (re)creates only the objects it needs.
-
-eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
-
-let $run= `SELECT @NO_REFRESH`;
-if ($run)
-{
-    # Create some objects needed in many testcases
-    USE test;
-    --source suite/funcs_1/include/ndb_tb1.inc
-    --source suite/funcs_1/include/ndb_tb2.inc
-    --source suite/funcs_1/include/ndb_tb3.inc
-    --source suite/funcs_1/include/ndb_tb4.inc
-
-    # The database test1 is needed for the VIEW testcases
-    --disable_warnings
-    DROP DATABASE IF EXISTS test1;
-    --enable_warnings
-    CREATE DATABASE test1;
-    USE test1;
-    --source suite/funcs_1/include/ndb_tb2.inc
-    USE test;
-  
-    # These tables are needed for the stored procedure testscases
-    --source suite/funcs_1/include/sp_tb.inc
-}
-

mysql-test/suite/funcs_1/t/a_processlist_priv_no_prot.test → mysql-test/suite/funcs_1/t/processlist_priv_no_prot.test

-########## suite/funcs_1/t/a_processlist_priv_no_prot.test #############
+############ suite/funcs_1/t/processlist_priv_no_prot.test #############
 #                                                                      #
 # Testing of privileges around                                         #
 #     SELECT ... PROCESSLIST/SHOW PROCESSLIST                          #
@@ -9,12 +9,6 @@
 # There is important documentation within                              #
 #       suite/funcs_1/datadict/processlist_priv.inc                    #
 #                                                                      #
-# Note(mleich):                                                        #
-#    The name "a_process..." with the unusual prefix "a_" is           #
-#    caused by the fact that this test should run as first test, that  #
-#    means direct after server startup. Otherwise the connection IDs   #
-#    within the processlist would differ.                              #
-#                                                                      #
 # Creation:                                                            #
 # 2007-08-14 mleich  Create this test as part of                       #
 #                    WL#3982 Test information_schema.processlist       #

mysql-test/suite/funcs_1/t/b_processlist_priv_ps.test → mysql-test/suite/funcs_1/t/processlist_priv_ps.test

-########### suite/funcs_1/t/b_processlist_priv_ps.test #################
+############# suite/funcs_1/t/processlist_priv_ps.test #################
 #                                                                      #
 # Testing of privileges around                                         #
 #     SELECT ... PROCESSLIST/SHOW PROCESSLIST                          #
@@ -9,12 +9,6 @@
 # There is important documentation within                              #
 #       suite/funcs_1/datadict/processlist_priv.inc                    #
 #                                                                      #
-# Note(mleich):                                                        #
-#    The name "b_process..." with the unusual prefix "b_" is           #
-#    caused by the fact that this test should run as first test, that  #
-#    means direct after server startup. Otherwise the connection IDs   #
-#    within the processlist would differ.                              #
-#                                                                      #
 # Creation:                                                            #
 # 2007-08-14 mleich  Create this test as part of                       #
 #                    WL#3982 Test information_schema.processlist       #

mysql-test/suite/funcs_1/t/a_processlist_val_no_prot.test → mysql-test/suite/funcs_1/t/processlist_val_no_prot.test

-########### suite/funcs_1/t/a_processlist_val_no_prot.test #############
+############# suite/funcs_1/t/processlist_val_no_prot.test #############
 #                                                                      #
 # Testing of values within INFORMATION_SCHEMA.PROCESSLIST              #
 #                                                                      #
@@ -8,12 +8,6 @@
 # There is important documentation within                              #
 #       suite/funcs_1/datadict/processlist_val.inc                     #
 #                                                                      #
-# Note(mleich):                                                        #
-#    The name "a_process..." with the unusual prefix "a_" is           #
-#    caused by the fact that this test should run as second test, that #
-#    means direct after server startup and a_processlist_priv_no_prot. #
-#    Otherwise the connection IDs within the processlist would differ. #
-#                                                                      #
 # Creation:                                                            #
 # 2007-08-09 mleich Implement this test as part of                     #
 #                   WL#3982 Test information_schema.processlist        #

mysql-test/suite/funcs_1/t/b_processlist_val_ps.test → mysql-test/suite/funcs_1/t/processlist_val_ps.test

-############## suite/funcs_1/t/b_processlist_val_ps.test ###############
+################ suite/funcs_1/t/processlist_val_ps.test ###############
 #                                                                      #
 # Testing of values within INFORMATION_SCHEMA.PROCESSLIST              #
 #                                                                      #
@@ -8,12 +8,6 @@
 # There is important documentation within                              #
 #       suite/funcs_1/datadict/processlist_val.inc                     #
 #                                                                      #
-# Note(mleich):                                                        #
-#    The name "b_process..." with the unusual prefix "b_" is           #
-#    caused by the fact that this test should run as second test, that #
-#    means direct after server startup and b_processlist_priv_ps.      #
-#    Otherwise the connection IDs within the processlist would differ. #
-#                                                                      #
 # Creation:                                                            #
 # 2007-08-09 mleich Implement this test as part of                     #
 #                   WL#3982 Test information_schema.processlist        #