Fix a bad BitKeeper dependency structure for the "funcs_1" suite:

Step 2: Restore the 5.1 contents in the 5.0-dependent files. mysql-test/suite/funcs_1/cursors/cursors_master.test: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/datadict/datadict_master.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/datadict/datadict_tables.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb__datadict.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_func_view.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_storedproc.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_storedproc_02.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_storedproc_10.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_trig_0102.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_trig_03.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_trig_0407.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_trig_08.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_trig_09.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_trig_frkey.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_views.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory__datadict.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_func_view.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_storedproc.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_storedproc_02.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_storedproc_10.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_trig_0102.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_trig_03.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_trig_0407.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_trig_08.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_trig_09.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_trig_1011ext.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_views.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam__datadict.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_func_view.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_storedproc.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_storedproc_02.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_storedproc_10.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_trig_0102.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_trig_03.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_trig_0407.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_trig_08.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_trig_09.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_views.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/storedproc/storedproc_02.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/storedproc/storedproc_10.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/storedproc/storedproc_master.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/triggers/triggers_0102.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/triggers/triggers_03.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/triggers/triggers_0407.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/triggers/triggers_08.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/triggers/triggers_09.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/views/func_view.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/views/views_master.inc: Restore the 5.1 contents in the 5.0-dependent file.
author: unknown <joerg@debian.(none)> 2007-07-27 15:41:27 +0200
committer: unknown <joerg@debian.(none)> 2007-07-27 15:41:27 +0200
commit: 39f3cda7c7fa75c0208d58495e42b5dc0cc6a061 (patch)
tree: 751dc890f01720274fd385de97ca90d4167603ad /mysql-test/suite
parent: 072db2f2e4f187dd06c6f637acadddedca00e940 (diff)
download: mariadb-git-39f3cda7c7fa75c0208d58495e42b5dc0cc6a061.tar.gz
51 files changed, 12379 insertions, 6951 deletions
diff --git a/mysql-test/suite/funcs_1/cursors/cursors_master.test b/mysql-test/suite/funcs_1/cursors/cursors_master.test
index 19961503b77..cf4c9e56dfa 100644
--- a/mysql-test/suite/funcs_1/cursors/cursors_master.test
+++ b/mysql-test/suite/funcs_1/cursors/cursors_master.test
@@ -1,4 +1,3 @@
 #### suite/funcs_1/cursors/cursors_master.test
-
 let $message= NOT YET IMPLEMENTED: cursor tests;
 --source include/show_msg80.inc
diff --git a/mysql-test/suite/funcs_1/datadict/datadict_master.inc b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
index 03d3eeb3777..6088a5c5143 100644
--- a/mysql-test/suite/funcs_1/datadict/datadict_master.inc
+++ b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
@@ -3881,11 +3881,11 @@ let $message= Testcase 3.2.20.1:;
 let $is_table= referential_constraints;
 # when table is implemented remove this and the next 4 lines and "enable" 5th line:
 # and don't forget to add the test description to QATestPlanV50func
-let $message= checking a table that will be implemented later;
---source include/show_msg.inc
---error 1109
+#let $message= checking a table that will be implemented later;
+#--source include/show_msg.inc
+#--error 1109
 eval DESC $is_table;
-#--source suite/funcs_1/datadict/datadict_show_table_design.inc
+--source suite/funcs_1/datadict/datadict_show_table_design.inc
 # -------------------------------------------------------------------------------------------------------
 
 
diff --git a/mysql-test/suite/funcs_1/datadict/datadict_tables.inc b/mysql-test/suite/funcs_1/datadict/datadict_tables.inc
index ea6e7c5d534..14e39c083b0 100644
--- a/mysql-test/suite/funcs_1/datadict/datadict_tables.inc
+++ b/mysql-test/suite/funcs_1/datadict/datadict_tables.inc
@@ -58,5 +58,5 @@ eval $dd_part1 triggers                              $dd_part2;
 --error 1109
 eval $dd_part1 parameters $dd_part2;
 
---error 1109
+--error 0,1109
 eval $dd_part1 referential_constraints $dd_part2;
diff --git a/mysql-test/suite/funcs_1/r/innodb__datadict.result b/mysql-test/suite/funcs_1/r/innodb__datadict.result
index 675f30da14a..25c5fbbf358 100644
--- a/mysql-test/suite/funcs_1/r/innodb__datadict.result
+++ b/mysql-test/suite/funcs_1/r/innodb__datadict.result
@@ -435,10 +435,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -461,7 +472,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -482,7 +493,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -503,7 +514,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	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -524,7 +535,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -545,7 +556,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -563,10 +574,199 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	ENGINES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	EVENTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	FILES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PARTITIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PLUGINS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PROCESSLIST
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	REFERENTIAL_CONSTRAINTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -587,7 +787,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -608,7 +808,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -629,7 +829,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -647,10 +847,52 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -671,7 +913,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -692,7 +934,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -713,7 +955,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -734,7 +976,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -755,7 +997,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -776,7 +1018,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -901,6 +1143,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	event
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Events
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -922,6 +1185,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	general_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	General log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1027,6 +1311,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	ndb_binlog_index
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	latin1_swedish_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	plugin
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_bin
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL plugins
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1069,6 +1395,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	servers
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL Foreign Servers table
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	slow_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Slow log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1534,6 +1902,8 @@ t.table_type, t.engine
 from schemata s inner join tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	CSV
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
@@ -1566,6 +1936,13 @@ NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
@@ -1578,6 +1955,14 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1585,6 +1970,8 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	CSV
 NULL	information_schema	utf8	BASE TABLE	InnoDB
 NULL	information_schema	utf8	BASE TABLE	InnoDB
 NULL	information_schema	utf8	BASE TABLE	InnoDB
@@ -1617,6 +2004,15 @@ NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
@@ -1633,9 +2029,17 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	CSV
 NULL	mysql	latin1	BASE TABLE	InnoDB
 NULL	mysql	latin1	BASE TABLE	InnoDB
 NULL	mysql	latin1	BASE TABLE	InnoDB
@@ -1668,6 +2072,14 @@ NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
@@ -1680,6 +2092,13 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -1687,6 +2106,8 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	CSV
 NULL	test	latin1	BASE TABLE	InnoDB
 NULL	test	latin1	BASE TABLE	InnoDB
 NULL	test	latin1	BASE TABLE	InnoDB
@@ -1719,6 +2140,13 @@ NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
@@ -1731,6 +2159,14 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -1738,6 +2174,8 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	CSV
 NULL	test1	latin1	BASE TABLE	InnoDB
 NULL	test1	latin1	BASE TABLE	InnoDB
 NULL	test1	latin1	BASE TABLE	InnoDB
@@ -1770,6 +2208,13 @@ NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
@@ -1782,6 +2227,14 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -1789,6 +2242,8 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	CSV
 NULL	test4	latin1	BASE TABLE	InnoDB
 NULL	test4	latin1	BASE TABLE	InnoDB
 NULL	test4	latin1	BASE TABLE	InnoDB
@@ -1821,6 +2276,12 @@ NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
@@ -1833,6 +2294,15 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -1858,14 +2328,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -1880,6 +2350,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			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	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			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	SQL_MODE	12		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	ENDS	14	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	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	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	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			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	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_SCHEMA	6	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	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	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DELETED_ROWS	12	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	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			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	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATION_TIME	20	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	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	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	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	TABLE_ROWS	27	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	DATA_LENGTH	29	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	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1892,6 +2431,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	SUBPARTITION_NAME	5	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_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_LENGTH	15	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	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			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_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_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_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			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	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1922,6 +2515,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 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	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1942,20 +2539,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -2006,20 +2603,20 @@ NULL	db_datadict	v1	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_genera
 NULL	db_datadict	v1	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select,insert,update,references	
-NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select,insert,update,references	
 NULL	db_datadict	vu	u	1		NO	varchar	81	243	NULL	NULL	utf8	utf8_general_ci	varchar(81)			select,insert,update,references	
@@ -2053,10 +2650,36 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	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	
 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	Event_priv	21	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	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		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	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			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	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	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	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			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	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	ends	12	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	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
+NULL	mysql	event	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	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			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	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			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	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			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	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+NULL	mysql	general_log	argument	6	NULL	YES	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	
@@ -2090,6 +2713,16 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	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	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	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			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	inserts	4	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	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	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			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	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			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	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		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	
@@ -2114,13 +2747,33 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 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	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			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	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			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	Username	4		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	Socket	7		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	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	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	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			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	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			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	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
+NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	server_id	10	NULL	YES	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	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		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	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	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	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		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	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	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	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			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	
@@ -2165,14 +2818,16 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			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	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			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	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_connections	36	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	Event_priv	30	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	ssl_type	32		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	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	
+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_connections	38	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	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -2539,7 +3194,7 @@ cp932	cp932_japanese_ci	SJIS for Windows Japanese	2
 eucjpms	eucjpms_japanese_ci	UJIS for Windows Japanese	3
 select sum(id) from collations;
 sum(id)
-10741
+10840
 select collation_name, character_set_name into @x,@y
 from collation_character_set_applicability limit 1;
 select @x, @y;
@@ -2564,6 +3219,8 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -2575,6 +3232,8 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
+NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
+NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	1	NULL	NULL		BTREE	
@@ -2584,6 +3243,7 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -2614,6 +3274,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -2629,6 +3290,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -2639,6 +3301,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -2654,6 +3317,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -2664,6 +3328,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -2679,6 +3344,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select * from schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -2696,6 +3362,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -2710,6 +3378,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 select * from table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 select * from column_privileges;
@@ -2718,6 +3388,7 @@ select * from table_constraints;
 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	PRIMARY	mysql	help_category	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
@@ -2727,8 +3398,11 @@ NULL	mysql	PRIMARY	mysql	help_relation	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_topic	PRIMARY KEY
 NULL	mysql	name	mysql	help_topic	UNIQUE
 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
@@ -2746,6 +3420,8 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_category	name	1	NULL	NULL	NULL	NULL
@@ -2757,6 +3433,8 @@ NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_topic	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -2765,6 +3443,7 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -2780,7 +3459,7 @@ NULL	mysql	PRIMARY	NULL	mysql	user	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	user	User	2	NULL	NULL	NULL	NULL
 select count(*) as max_recs from key_column_usage;
 max_recs
-40
+45
 select max(cardinality) from statistics;
 max(cardinality)
 393
@@ -2801,10 +3480,21 @@ Table or view 'COLLATIONS' is associated with the database 'information_schema'.
 Table or view 'COLLATION_CHARACTER_SET_APPLICABILITY' is associated with the database 'information_schema'.
 Table or view 'COLUMNS' is associated with the database 'information_schema'.
 Table or view 'COLUMN_PRIVILEGES' is associated with the database 'information_schema'.
+Table or view 'ENGINES' is associated with the database 'information_schema'.
+Table or view 'EVENTS' is associated with the database 'information_schema'.
+Table or view 'FILES' is associated with the database 'information_schema'.
+Table or view 'GLOBAL_STATUS' is associated with the database 'information_schema'.
+Table or view 'GLOBAL_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'KEY_COLUMN_USAGE' is associated with the database 'information_schema'.
+Table or view 'PARTITIONS' is associated with the database 'information_schema'.
+Table or view 'PLUGINS' is associated with the database 'information_schema'.
+Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
+Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
 Table or view 'SCHEMA_PRIVILEGES' is associated with the database 'information_schema'.
+Table or view 'SESSION_STATUS' is associated with the database 'information_schema'.
+Table or view 'SESSION_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'STATISTICS' is associated with the database 'information_schema'.
 Table or view 'TABLES' is associated with the database 'information_schema'.
 Table or view 'TABLE_CONSTRAINTS' is associated with the database 'information_schema'.
@@ -2817,14 +3507,20 @@ Table or view 'vu' is associated with the database 'db_datadict'.
 Table or view 'vu1' is associated with the database 'db_datadict'.
 Table or view 'columns_priv' is associated with the database 'mysql'.
 Table or view 'db' is associated with the database 'mysql'.
+Table or view 'event' is associated with the database 'mysql'.
 Table or view 'func' is associated with the database 'mysql'.
+Table or view 'general_log' is associated with the database 'mysql'.
 Table or view 'help_category' is associated with the database 'mysql'.
 Table or view 'help_keyword' is associated with the database 'mysql'.
 Table or view 'help_relation' is associated with the database 'mysql'.
 Table or view 'help_topic' is associated with the database 'mysql'.
 Table or view 'host' is associated with the database 'mysql'.
+Table or view 'ndb_binlog_index' is associated with the database 'mysql'.
+Table or view 'plugin' is associated with the database 'mysql'.
 Table or view 'proc' is associated with the database 'mysql'.
 Table or view 'procs_priv' is associated with the database 'mysql'.
+Table or view 'servers' is associated with the database 'mysql'.
+Table or view 'slow_log' is associated with the database 'mysql'.
 Table or view 'tables_priv' is associated with the database 'mysql'.
 Table or view 'time_zone' is associated with the database 'mysql'.
 Table or view 'time_zone_leap_second' is associated with the database 'mysql'.
@@ -2871,12 +3567,12 @@ select * from table_constraints limit 0,5;
 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	PRIMARY	mysql	help_category	PRIMARY KEY
-NULL	mysql	name	mysql	help_category	UNIQUE
 select count(*) as max_recs from key_column_usage limit 0,5;
 max_recs
-40
+45
 select information_schema.tables.table_name as "table name",
 count(distinct(column_name)) as "no of columns in the table"
   from information_schema.tables left outer join information_schema.columns on
@@ -2889,19 +3585,36 @@ COLLATION_CHARACTER_SET_APPLICABILITY	2
 COLUMNS	19
 columns_priv	7
 COLUMN_PRIVILEGES	7
-db	20
+db	22
+ENGINES	6
+event	18
+EVENTS	21
+FILES	38
 func	4
+general_log	6
+GLOBAL_STATUS	2
+GLOBAL_VARIABLES	2
 help_category	4
 help_keyword	2
 help_relation	2
 help_topic	6
-host	19
+host	20
 KEY_COLUMN_USAGE	12
+ndb_binlog_index	7
+PARTITIONS	25
+plugin	2
+PLUGINS	10
 proc	16
+PROCESSLIST	8
 procs_priv	8
+REFERENTIAL_CONSTRAINTS	11
 ROUTINES	20
 SCHEMATA	5
 SCHEMA_PRIVILEGES	5
+servers	9
+SESSION_STATUS	2
+SESSION_VARIABLES	2
+slow_log	11
 STATISTICS	15
 t1	6
 t10	6
@@ -2927,7 +3640,7 @@ time_zone_name	2
 time_zone_transition	3
 time_zone_transition_type	5
 TRIGGERS	19
-user	37
+user	39
 USER_PRIVILEGES	4
 v1	21
 VIEWS	8
@@ -2941,7 +3654,7 @@ CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_P
 NULL	information_schema	utf8	utf8_general_ci	NULL
 SELECT * FROM tables                                LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
 SELECT * FROM columns                               LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 NULL	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -2986,7 +3699,7 @@ TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATA
 SELECT * FROM parameters LIMIT 1;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT * FROM referential_constraints LIMIT 1;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	UNIQUE_CONSTRAINT_CATALOG	UNIQUE_CONSTRAINT_SCHEMA	UNIQUE_CONSTRAINT_NAME	MATCH_OPTION	UPDATE_RULE	DELETE_RULE	TABLE_NAME	REFERENCED_TABLE_NAME
 use db_datadict;
 select * from schemata;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
@@ -3076,7 +3789,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3097,7 +3810,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3118,7 +3831,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	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3139,7 +3852,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3160,7 +3873,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3178,10 +3891,199 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	ENGINES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	EVENTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	FILES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PARTITIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PLUGINS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PROCESSLIST
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	REFERENTIAL_CONSTRAINTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3202,7 +4104,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3223,7 +4125,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3244,7 +4146,28 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3262,10 +4185,31 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3286,7 +4230,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3307,7 +4251,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3328,7 +4272,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3349,7 +4293,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3370,7 +4314,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3391,7 +4335,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3516,6 +4460,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	event
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Events
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3537,6 +4502,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	general_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	General log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3642,6 +4628,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	ndb_binlog_index
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	latin1_swedish_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	plugin
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_bin
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL plugins
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3684,6 +4712,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	servers
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL Foreign Servers table
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	slow_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Slow log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4149,6 +5219,8 @@ t.table_type, t.engine
 from information_schema.schemata s inner join information_schema.tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	CSV
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
 NULL	db_datadict	latin1	BASE TABLE	InnoDB
@@ -4181,6 +5253,11 @@ NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
@@ -4193,6 +5270,16 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -4200,6 +5287,8 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	CSV
 NULL	information_schema	utf8	BASE TABLE	InnoDB
 NULL	information_schema	utf8	BASE TABLE	InnoDB
 NULL	information_schema	utf8	BASE TABLE	InnoDB
@@ -4232,6 +5321,11 @@ NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
@@ -4244,6 +5338,16 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -4251,6 +5355,8 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	CSV
 NULL	mysql	latin1	BASE TABLE	InnoDB
 NULL	mysql	latin1	BASE TABLE	InnoDB
 NULL	mysql	latin1	BASE TABLE	InnoDB
@@ -4283,6 +5389,10 @@ NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
@@ -4295,6 +5405,17 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -4302,6 +5423,8 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	CSV
 NULL	test	latin1	BASE TABLE	InnoDB
 NULL	test	latin1	BASE TABLE	InnoDB
 NULL	test	latin1	BASE TABLE	InnoDB
@@ -4334,6 +5457,13 @@ NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
@@ -4346,6 +5476,14 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -4353,6 +5491,8 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	CSV
 NULL	test1	latin1	BASE TABLE	InnoDB
 NULL	test1	latin1	BASE TABLE	InnoDB
 NULL	test1	latin1	BASE TABLE	InnoDB
@@ -4385,6 +5525,15 @@ NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
@@ -4401,9 +5550,17 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	CSV
 NULL	test4	latin1	BASE TABLE	InnoDB
 NULL	test4	latin1	BASE TABLE	InnoDB
 NULL	test4	latin1	BASE TABLE	InnoDB
@@ -4436,6 +5593,15 @@ NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
@@ -4452,6 +5618,12 @@ NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	VIEW	NULL
 NULL	test4	latin1	VIEW	NULL
 NULL	test4	latin1	VIEW	NULL
@@ -4522,9 +5694,9 @@ select * from information_schema.table_constraints limit 0, 5;
 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	PRIMARY	mysql	help_category	PRIMARY KEY
-NULL	mysql	name	mysql	help_category	UNIQUE
 select * from information_schema.key_column_usage limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Host	1	NULL	NULL	NULL	NULL
@@ -4534,7 +5706,7 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Table_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 select count(*) as max_recs from information_schema.key_column_usage limit 0, 5;
 max_recs
-40
+45
 
 root: check with db name
 ------------------------
@@ -4543,34 +5715,34 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-51
+68
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-657
+842
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
 SELECT COUNT(*) FROM information_schema. collations                            ;
 COUNT(*)
-126
+127
 SELECT COUNT(*) FROM information_schema. collation_character_set_applicability ;
 COUNT(*)
-126
+128
 SELECT COUNT(*) FROM information_schema. routines                              ;
 COUNT(*)
 1
 SELECT COUNT(*) FROM information_schema. statistics                            ;
 COUNT(*)
-43
+48
 SELECT COUNT(*) FROM information_schema. views                                 ;
 COUNT(*)
 3
 SELECT COUNT(*) FROM information_schema. user_privileges                       ;
 COUNT(*)
-75
+81
 SELECT COUNT(*) FROM information_schema. schema_privileges                     ;
 COUNT(*)
-28
+32
 SELECT COUNT(*) FROM information_schema. table_privileges                      ;
 COUNT(*)
 0
@@ -4579,17 +5751,18 @@ COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. table_constraints                     ;
 COUNT(*)
-20
+24
 SELECT COUNT(*) FROM information_schema. key_column_usage                      ;
 COUNT(*)
-40
+45
 SELECT COUNT(*) FROM information_schema. triggers                              ;
 COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. parameters ;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT COUNT(*) FROM information_schema. referential_constraints ;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+COUNT(*)
+0
 USE db_datadict;
 DROP VIEW v1, vu1, vu;
 DROP PROCEDURE db_datadict.sp_1;
@@ -4607,10 +5780,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-48
+65
 select count(*) as the_cols from columns;
 the_cols
-632
+817
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -4648,10 +5821,21 @@ information_schema, COLLATIONS
 information_schema, COLLATION_CHARACTER_SET_APPLICABILITY
 information_schema, COLUMNS
 information_schema, COLUMN_PRIVILEGES
+information_schema, ENGINES
+information_schema, EVENTS
+information_schema, FILES
+information_schema, GLOBAL_STATUS
+information_schema, GLOBAL_VARIABLES
 information_schema, KEY_COLUMN_USAGE
+information_schema, PARTITIONS
+information_schema, PLUGINS
+information_schema, PROCESSLIST
+information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
 information_schema, SCHEMA_PRIVILEGES
+information_schema, SESSION_STATUS
+information_schema, SESSION_VARIABLES
 information_schema, STATISTICS
 information_schema, TABLES
 information_schema, TABLE_CONSTRAINTS
@@ -4661,14 +5845,20 @@ information_schema, USER_PRIVILEGES
 information_schema, VIEWS
 mysql, columns_priv
 mysql, db
+mysql, event
 mysql, func
+mysql, general_log
 mysql, help_category
 mysql, help_keyword
 mysql, help_relation
 mysql, help_topic
 mysql, host
+mysql, ndb_binlog_index
+mysql, plugin
 mysql, proc
 mysql, procs_priv
+mysql, servers
+mysql, slow_log
 mysql, tables_priv
 mysql, time_zone
 mysql, time_zone_leap_second
@@ -4714,7 +5904,7 @@ NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
 select sum(ordinal_position) from key_column_usage;
 sum(ordinal_position)
-77
+83
 select * from schemata limit 0,5;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
 NULL	information_schema	utf8	utf8_general_ci	NULL
@@ -4761,6 +5951,8 @@ grantee
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
+'root'@'127.0.0.1'
+'root'@'127.0.0.1'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
@@ -4786,6 +5978,10 @@ grantee
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
+'root'@'<SERVER_NAME>'
+'root'@'<SERVER_NAME>'
+'root'@'localhost'
+'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
@@ -6294,6 +7490,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6309,6 +7506,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6319,6 +7517,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6334,6 +7533,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6344,6 +7544,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6359,6 +7560,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6439,6 +7641,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6454,6 +7657,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6464,6 +7668,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6479,6 +7684,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6489,6 +7695,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6504,6 +7711,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401013'@'localhost'	NULL	USAGE	NO
 select *
@@ -6570,6 +7778,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6585,6 +7794,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6595,6 +7805,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6610,6 +7821,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6620,6 +7832,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6635,6 +7848,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6713,6 +7927,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6728,6 +7943,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6738,6 +7954,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6753,6 +7970,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6763,6 +7981,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6778,6 +7997,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6852,6 +8072,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6867,6 +8088,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6877,6 +8099,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6892,6 +8115,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6902,6 +8126,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6917,6 +8142,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7004,6 +8230,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7019,6 +8246,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7029,6 +8257,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7044,6 +8273,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7054,6 +8284,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7069,6 +8300,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401015'@'localhost'	NULL	USAGE	NO
 select *
@@ -7134,6 +8366,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7149,6 +8382,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7159,6 +8393,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7174,6 +8409,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7184,6 +8420,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7199,6 +8436,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7240,10 +8478,21 @@ information_schema	COLLATIONS	MEMORY
 information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	MEMORY
 information_schema	COLUMNS	MyISAM
 information_schema	COLUMN_PRIVILEGES	MEMORY
+information_schema	ENGINES	MEMORY
+information_schema	EVENTS	MyISAM
+information_schema	FILES	MEMORY
+information_schema	GLOBAL_STATUS	MEMORY
+information_schema	GLOBAL_VARIABLES	MyISAM
 information_schema	KEY_COLUMN_USAGE	MEMORY
+information_schema	PARTITIONS	MyISAM
+information_schema	PLUGINS	MyISAM
+information_schema	PROCESSLIST	MyISAM
+information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
 information_schema	SCHEMA_PRIVILEGES	MEMORY
+information_schema	SESSION_STATUS	MEMORY
+information_schema	SESSION_VARIABLES	MyISAM
 information_schema	STATISTICS	MEMORY
 information_schema	TABLES	MEMORY
 information_schema	TABLE_CONSTRAINTS	MEMORY
@@ -7272,10 +8521,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7302,10 +8562,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7369,6 +8640,7 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
+filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -7383,6 +8655,7 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
+cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -7473,10 +8746,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7515,14 +8799,14 @@ COLUMNS	TABLE_CATALOG	varchar(4096)
 COLUMNS	TABLE_SCHEMA	varchar(64)
 COLUMNS	TABLE_NAME	varchar(64)
 COLUMNS	COLUMN_NAME	varchar(64)
-COLUMNS	ORDINAL_POSITION	bigint(21)
+COLUMNS	ORDINAL_POSITION	bigint(21) unsigned
 COLUMNS	COLUMN_DEFAULT	longtext
 COLUMNS	IS_NULLABLE	varchar(3)
 COLUMNS	DATA_TYPE	varchar(64)
-COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21)
-COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21)
-COLUMNS	NUMERIC_PRECISION	bigint(21)
-COLUMNS	NUMERIC_SCALE	bigint(21)
+COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned
+COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21) unsigned
+COLUMNS	NUMERIC_PRECISION	bigint(21) unsigned
+COLUMNS	NUMERIC_SCALE	bigint(21) unsigned
 COLUMNS	CHARACTER_SET_NAME	varchar(64)
 COLUMNS	COLLATION_NAME	varchar(64)
 COLUMNS	COLUMN_TYPE	longtext
@@ -7537,6 +8821,75 @@ COLUMN_PRIVILEGES	TABLE_NAME	varchar(64)
 COLUMN_PRIVILEGES	COLUMN_NAME	varchar(64)
 COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 COLUMN_PRIVILEGES	IS_GRANTABLE	varchar(3)
+ENGINES	ENGINE	varchar(64)
+ENGINES	SUPPORT	varchar(8)
+ENGINES	COMMENT	varchar(80)
+ENGINES	TRANSACTIONS	varchar(3)
+ENGINES	XA	varchar(3)
+ENGINES	SAVEPOINTS	varchar(3)
+EVENTS	EVENT_CATALOG	varchar(64)
+EVENTS	EVENT_SCHEMA	varchar(64)
+EVENTS	EVENT_NAME	varchar(64)
+EVENTS	DEFINER	varchar(77)
+EVENTS	TIME_ZONE	varchar(64)
+EVENTS	EVENT_BODY	varchar(8)
+EVENTS	EVENT_DEFINITION	longtext
+EVENTS	EVENT_TYPE	varchar(9)
+EVENTS	EXECUTE_AT	datetime
+EVENTS	INTERVAL_VALUE	varchar(256)
+EVENTS	INTERVAL_FIELD	varchar(18)
+EVENTS	SQL_MODE	longtext
+EVENTS	STARTS	datetime
+EVENTS	ENDS	datetime
+EVENTS	STATUS	varchar(18)
+EVENTS	ON_COMPLETION	varchar(12)
+EVENTS	CREATED	datetime
+EVENTS	LAST_ALTERED	datetime
+EVENTS	LAST_EXECUTED	datetime
+EVENTS	EVENT_COMMENT	varchar(64)
+EVENTS	ORIGINATOR	bigint(10)
+FILES	FILE_ID	bigint(4)
+FILES	FILE_NAME	varchar(64)
+FILES	FILE_TYPE	varchar(20)
+FILES	TABLESPACE_NAME	varchar(64)
+FILES	TABLE_CATALOG	varchar(64)
+FILES	TABLE_SCHEMA	varchar(64)
+FILES	TABLE_NAME	varchar(64)
+FILES	LOGFILE_GROUP_NAME	varchar(64)
+FILES	LOGFILE_GROUP_NUMBER	bigint(4)
+FILES	ENGINE	varchar(64)
+FILES	FULLTEXT_KEYS	varchar(64)
+FILES	DELETED_ROWS	bigint(4)
+FILES	UPDATE_COUNT	bigint(4)
+FILES	FREE_EXTENTS	bigint(4)
+FILES	TOTAL_EXTENTS	bigint(4)
+FILES	EXTENT_SIZE	bigint(4)
+FILES	INITIAL_SIZE	bigint(21) unsigned
+FILES	MAXIMUM_SIZE	bigint(21) unsigned
+FILES	AUTOEXTEND_SIZE	bigint(21) unsigned
+FILES	CREATION_TIME	datetime
+FILES	LAST_UPDATE_TIME	datetime
+FILES	LAST_ACCESS_TIME	datetime
+FILES	RECOVER_TIME	bigint(4)
+FILES	TRANSACTION_COUNTER	bigint(4)
+FILES	VERSION	bigint(21) unsigned
+FILES	ROW_FORMAT	varchar(10)
+FILES	TABLE_ROWS	bigint(21) unsigned
+FILES	AVG_ROW_LENGTH	bigint(21) unsigned
+FILES	DATA_LENGTH	bigint(21) unsigned
+FILES	MAX_DATA_LENGTH	bigint(21) unsigned
+FILES	INDEX_LENGTH	bigint(21) unsigned
+FILES	DATA_FREE	bigint(21) unsigned
+FILES	CREATE_TIME	datetime
+FILES	UPDATE_TIME	datetime
+FILES	CHECK_TIME	datetime
+FILES	CHECKSUM	bigint(21) unsigned
+FILES	STATUS	varchar(20)
+FILES	EXTRA	varchar(255)
+GLOBAL_STATUS	VARIABLE_NAME	varchar(64)
+GLOBAL_STATUS	VARIABLE_VALUE	decimal(22,7)
+GLOBAL_VARIABLES	VARIABLE_NAME	varchar(64)
+GLOBAL_VARIABLES	VARIABLE_VALUE	longtext
 KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar(4096)
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar(64)
@@ -7549,6 +8902,60 @@ KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint(10)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar(64)
+PARTITIONS	TABLE_CATALOG	varchar(4096)
+PARTITIONS	TABLE_SCHEMA	varchar(64)
+PARTITIONS	TABLE_NAME	varchar(64)
+PARTITIONS	PARTITION_NAME	varchar(64)
+PARTITIONS	SUBPARTITION_NAME	varchar(64)
+PARTITIONS	PARTITION_ORDINAL_POSITION	bigint(21) unsigned
+PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint(21) unsigned
+PARTITIONS	PARTITION_METHOD	varchar(12)
+PARTITIONS	SUBPARTITION_METHOD	varchar(12)
+PARTITIONS	PARTITION_EXPRESSION	longtext
+PARTITIONS	SUBPARTITION_EXPRESSION	longtext
+PARTITIONS	PARTITION_DESCRIPTION	longtext
+PARTITIONS	TABLE_ROWS	bigint(21) unsigned
+PARTITIONS	AVG_ROW_LENGTH	bigint(21) unsigned
+PARTITIONS	DATA_LENGTH	bigint(21) unsigned
+PARTITIONS	MAX_DATA_LENGTH	bigint(21) unsigned
+PARTITIONS	INDEX_LENGTH	bigint(21) unsigned
+PARTITIONS	DATA_FREE	bigint(21) unsigned
+PARTITIONS	CREATE_TIME	datetime
+PARTITIONS	UPDATE_TIME	datetime
+PARTITIONS	CHECK_TIME	datetime
+PARTITIONS	CHECKSUM	bigint(21) unsigned
+PARTITIONS	PARTITION_COMMENT	varchar(80)
+PARTITIONS	NODEGROUP	varchar(12)
+PARTITIONS	TABLESPACE_NAME	varchar(64)
+PLUGINS	PLUGIN_NAME	varchar(64)
+PLUGINS	PLUGIN_VERSION	varchar(20)
+PLUGINS	PLUGIN_STATUS	varchar(10)
+PLUGINS	PLUGIN_TYPE	varchar(80)
+PLUGINS	PLUGIN_TYPE_VERSION	varchar(20)
+PLUGINS	PLUGIN_LIBRARY	varchar(64)
+PLUGINS	PLUGIN_LIBRARY_VERSION	varchar(20)
+PLUGINS	PLUGIN_AUTHOR	varchar(64)
+PLUGINS	PLUGIN_DESCRIPTION	longtext
+PLUGINS	PLUGIN_LICENSE	varchar(80)
+PROCESSLIST	ID	bigint(4)
+PROCESSLIST	USER	varchar(16)
+PROCESSLIST	HOST	varchar(64)
+PROCESSLIST	DB	varchar(64)
+PROCESSLIST	COMMAND	varchar(16)
+PROCESSLIST	TIME	bigint(7)
+PROCESSLIST	STATE	varchar(64)
+PROCESSLIST	INFO	longtext
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar(4096)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar(64)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar(64)
+REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar(64)
+REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar(64)
+REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar(64)
 ROUTINES	SPECIFIC_NAME	varchar(64)
 ROUTINES	ROUTINE_CATALOG	varchar(4096)
 ROUTINES	ROUTINE_SCHEMA	varchar(64)
@@ -7579,6 +8986,10 @@ SCHEMA_PRIVILEGES	TABLE_CATALOG	varchar(4096)
 SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar(64)
 SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar(3)
+SESSION_STATUS	VARIABLE_NAME	varchar(64)
+SESSION_STATUS	VARIABLE_VALUE	decimal(22,7)
+SESSION_VARIABLES	VARIABLE_NAME	varchar(64)
+SESSION_VARIABLES	VARIABLE_VALUE	longtext
 STATISTICS	TABLE_CATALOG	varchar(4096)
 STATISTICS	TABLE_SCHEMA	varchar(64)
 STATISTICS	TABLE_NAME	varchar(64)
@@ -7599,20 +9010,20 @@ TABLES	TABLE_SCHEMA	varchar(64)
 TABLES	TABLE_NAME	varchar(64)
 TABLES	TABLE_TYPE	varchar(64)
 TABLES	ENGINE	varchar(64)
-TABLES	VERSION	bigint(21)
+TABLES	VERSION	bigint(21) unsigned
 TABLES	ROW_FORMAT	varchar(10)
-TABLES	TABLE_ROWS	bigint(21)
-TABLES	AVG_ROW_LENGTH	bigint(21)
-TABLES	DATA_LENGTH	bigint(21)
-TABLES	MAX_DATA_LENGTH	bigint(21)
-TABLES	INDEX_LENGTH	bigint(21)
-TABLES	DATA_FREE	bigint(21)
-TABLES	AUTO_INCREMENT	bigint(21)
+TABLES	TABLE_ROWS	bigint(21) unsigned
+TABLES	AVG_ROW_LENGTH	bigint(21) unsigned
+TABLES	DATA_LENGTH	bigint(21) unsigned
+TABLES	MAX_DATA_LENGTH	bigint(21) unsigned
+TABLES	INDEX_LENGTH	bigint(21) unsigned
+TABLES	DATA_FREE	bigint(21) unsigned
+TABLES	AUTO_INCREMENT	bigint(21) unsigned
 TABLES	CREATE_TIME	datetime
 TABLES	UPDATE_TIME	datetime
 TABLES	CHECK_TIME	datetime
 TABLES	TABLE_COLLATION	varchar(64)
-TABLES	CHECKSUM	bigint(21)
+TABLES	CHECKSUM	bigint(21) unsigned
 TABLES	CREATE_OPTIONS	varchar(255)
 TABLES	TABLE_COMMENT	varchar(80)
 TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
@@ -8014,6 +9425,7 @@ cp1250_general_ci
 cp1250_czech_cs
 cp1250_croatian_ci
 cp1250_bin
+cp1250_polish_ci
 gbk_chinese_ci
 gbk_bin
 latin5_turkish_ci
@@ -8221,10 +9633,10 @@ MAXLEN	bigint(3)	NO		0
 SHOW CREATE TABLE 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8302,12 +9714,12 @@ SORTLEN	bigint(3)	NO		0
 SHOW CREATE TABLE 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8378,6 +9790,7 @@ cp1250_general_ci	cp1250	26	Yes	Yes	1
 cp1250_czech_cs	cp1250	34		Yes	2
 cp1250_croatian_ci	cp1250	44		Yes	1
 cp1250_bin	cp1250	66		Yes	1
+cp1250_polish_ci	cp1250	99		Yes	1
 gbk_chinese_ci	gbk	28	Yes	Yes	1
 gbk_bin	gbk	87		Yes	1
 latin5_turkish_ci	latin5	30	Yes		0
@@ -8471,8 +9884,8 @@ CHARACTER_SET_NAME	varchar(64)	NO
 SHOW CREATE TABLE 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8525,6 +9938,7 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
+filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -8539,6 +9953,7 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
+cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -8637,13 +10052,13 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE column_privileges;
 Table	Create Table
 COLUMN_PRIVILEGES	CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8749,6 +10164,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_3'@'localhost'	NULL	db_datadict	SHOW VIEW	NO
 'user_3'@'localhost'	NULL	db_datadict	CREATE ROUTINE	NO
 'user_3'@'localhost'	NULL	db_datadict	ALTER ROUTINE	NO
+'user_3'@'localhost'	NULL	db_datadict	EVENT	NO
+'user_3'@'localhost'	NULL	db_datadict	TRIGGER	NO
 SELECT * FROM information_schema.column_privileges
 WHERE grantee LIKE "'user%"
  ORDER BY grantee, table_name, column_name, privilege_type;
@@ -8789,14 +10206,14 @@ TABLE_CATALOG	varchar(4096)	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			
@@ -8807,25 +10224,25 @@ COLUMN_COMMENT	varchar(255)	NO
 SHOW CREATE TABLE columns;
 Table	Create Table
 COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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(20) NOT NULL DEFAULT '',
+  `PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
+  `COLUMN_COMMENT` varchar(255) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8842,14 +10259,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -8897,14 +10314,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -8919,6 +10336,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			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	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			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	SQL_MODE	12		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	ENDS	14	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	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	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	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			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	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_SCHEMA	6	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	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	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DELETED_ROWS	12	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	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			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	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATION_TIME	20	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	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	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	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	TABLE_ROWS	27	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	DATA_LENGTH	29	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	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -8931,6 +10417,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	SUBPARTITION_NAME	5	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_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_LENGTH	15	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	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			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_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_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_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			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	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -8961,6 +10501,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 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	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -8981,20 +10525,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -9067,10 +10611,36 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	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	
 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	Event_priv	21	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	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		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	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			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	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	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	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			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	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	ends	12	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	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
+NULL	mysql	event	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	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			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	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			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	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			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	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+NULL	mysql	general_log	argument	6	NULL	YES	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	
@@ -9104,6 +10674,16 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	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	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	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			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	inserts	4	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	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	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			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	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			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	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		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	
@@ -9128,13 +10708,33 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 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	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			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	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			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	Username	4		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	Socket	7		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	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	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	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			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	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			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	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
+NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	server_id	10	NULL	YES	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	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		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	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	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	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		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	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	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	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			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	
@@ -9179,14 +10779,16 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			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	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			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	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_connections	36	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	Event_priv	30	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	ssl_type	32		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	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	
+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_connections	38	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	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -9535,14 +11137,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -9557,6 +11159,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			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	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			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	SQL_MODE	12		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	ENDS	14	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	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	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	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			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	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_SCHEMA	6	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	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	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DELETED_ROWS	12	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	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			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	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATION_TIME	20	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	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	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	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	TABLE_ROWS	27	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	DATA_LENGTH	29	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	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9569,6 +11240,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	SUBPARTITION_NAME	5	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_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_LENGTH	15	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	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			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_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_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_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			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	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9599,6 +11324,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 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	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9619,20 +11348,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -9969,14 +11698,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -9991,6 +11720,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			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	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			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	SQL_MODE	12		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	ENDS	14	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	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	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	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			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	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_SCHEMA	6	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	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	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DELETED_ROWS	12	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	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			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	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATION_TIME	20	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	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	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	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	TABLE_ROWS	27	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	DATA_LENGTH	29	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	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10003,6 +11801,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	SUBPARTITION_NAME	5	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_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_LENGTH	15	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	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			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_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_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_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			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	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10033,6 +11885,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 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	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10053,20 +11909,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -10409,7 +12265,9 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 1.0000	set	latin1	latin1_swedish_ci
 1.0000	text	latin1	latin1_swedish_ci
 1.0000	tinytext	latin1	latin1_swedish_ci
+1.0000	varchar	latin1	latin1_swedish_ci
 1.0000	longtext	utf8	utf8_general_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,
@@ -10499,14 +12357,14 @@ 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
@@ -10521,6 +12379,75 @@ 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)
+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)
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
+3.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 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)
@@ -10533,6 +12460,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	4096	12288	utf8	utf8_general_ci	varchar(4096)
+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	4096	12288	utf8	utf8_general_ci	varchar(4096)
+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	4096	12288	utf8	utf8_general_ci	varchar(4096)
+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	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	ROUTINES	ROUTINE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -10563,6 +12544,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)
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
+3.0000	information_schema	SESSION_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	STATISTICS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 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)
@@ -10583,20 +12568,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	4096	12288	utf8	utf8_general_ci	varchar(4096)
@@ -10669,10 +12654,36 @@ 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	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	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	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
@@ -10706,6 +12717,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')
@@ -10730,13 +12751,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	4096	12288	utf8	utf8_general_ci	varchar(4096)
+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')
@@ -10781,6 +12822,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
@@ -11141,18 +13184,18 @@ REFERENCED_COLUMN_NAME	varchar(64)	YES		NULL
 SHOW CREATE TABLE key_column_usage;
 Table	Create Table
 KEY_COLUMN_USAGE	CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
-  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11213,6 +13256,8 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_keyword	help_keyword_id	1	NULL	NULL	NULL	NULL
@@ -11221,6 +13266,8 @@ NULL	mysql	PRIMARY	NULL	mysql	help_relation	help_topic_id	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -11229,6 +13276,7 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -11290,26 +13338,26 @@ DEFINER	varchar(77)	NO
 SHOW CREATE TABLE routines;
 Table	Create Table
 ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
-  `SPECIFIC_NAME` varchar(64) NOT NULL default '',
-  `ROUTINE_CATALOG` varchar(4096) 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(4096) 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 ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11634,11 +13682,11 @@ SQL_PATH	varchar(4096)	YES		NULL
 SHOW CREATE TABLE schemata;
 Table	Create Table
 SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
-  `CATALOG_NAME` varchar(4096) 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(4096) default NULL
+  `CATALOG_NAME` varchar(4096) 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(4096) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11717,12 +13765,12 @@ CONSTRAINT_TYPE	varchar(64)	NO
 SHOW CREATE TABLE table_constraints;
 Table	Create Table
 TABLE_CONSTRAINTS	CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` (
-  `CONSTRAINT_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11797,12 +13845,12 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE table_privileges;
 Table	Create Table
 TABLE_PRIVILEGES	CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11856,6 +13904,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
+'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = USER();
@@ -11865,7 +13914,7 @@ SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = "'user_2'@'localhost'";
 USER()	COUNT(*)
-user_2@localhost	11
+user_2@localhost	12
 connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -11885,6 +13934,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
+'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 'user_1'@'localhost'	NULL	db_datadict	tb1	SELECT	NO
 'user_3'@'localhost'	NULL	db_datadict	tb3	SELECT	NO
 	
@@ -11907,46 +13957,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 tables;
 Table	Create Table
 TABLES	CREATE TEMPORARY TABLE `TABLES` (
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11964,20 +14014,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 
@@ -12005,22 +14055,33 @@ GRANT SELECT ON db_datadict.v3 to 'user_3'@'localhost';
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12045,22 +14106,33 @@ connect(localhost,user_2,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12083,22 +14155,33 @@ connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12122,22 +14205,33 @@ root@localhost	db_datadict
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12147,14 +14241,20 @@ NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	N
 NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	NULL	VIEW
 NULL	mysql	columns_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Column privileges
 NULL	mysql	db	BASE TABLE	MyISAM	10	Fixed	3	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Database privileges
+NULL	mysql	event	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Events
 NULL	mysql	func	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		User defined functions
+NULL	mysql	general_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		General log
 NULL	mysql	help_category	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help categories
 NULL	mysql	help_keyword	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help keywords
 NULL	mysql	help_relation	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		keyword-topic relation
 NULL	mysql	help_topic	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help topics
 NULL	mysql	host	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Host privileges;  Merged with database privileges
+NULL	mysql	ndb_binlog_index	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
+NULL	mysql	plugin	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		MySQL plugins
 NULL	mysql	proc	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Stored Procedures
 NULL	mysql	procs_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Procedure privileges
+NULL	mysql	servers	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		MySQL Foreign Servers table
+NULL	mysql	slow_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Slow log
 NULL	mysql	tables_priv	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Table privileges
 NULL	mysql	time_zone	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	6	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zones
 NULL	mysql	time_zone_leap_second	BASE TABLE	MyISAM	10	Fixed	22	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Leap seconds information for time zones
@@ -12202,14 +14302,14 @@ SECURITY_TYPE	varchar(7)	NO
 SHOW CREATE TABLE views;
 Table	Create Table
 VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) 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 ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12297,21 +14397,21 @@ COMMENT	varchar(16)	YES		NULL
 SHOW CREATE TABLE statistics;
 Table	Create Table
 STATISTICS	CREATE TEMPORARY TABLE `STATISTICS` (
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12389,6 +14489,8 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -12400,6 +14502,8 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
+NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
+NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	0	NULL	NULL		BTREE	
@@ -12409,6 +14513,7 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -12458,11 +14563,11 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE schema_privileges;
 Table	Create Table
 SCHEMA_PRIVILEGES	CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12509,6 +14614,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -12523,6 +14630,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401502,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -12570,6 +14679,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -12584,6 +14695,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401503_1,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -12620,10 +14733,10 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE user_privileges;
 Table	Create Table
 USER_PRIVILEGES	CREATE TEMPORARY TABLE `USER_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) DEFAULT NULL,
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12665,10 +14778,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12688,10 +14801,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12703,10 +14816,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -12730,10 +14843,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12750,10 +14863,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12767,10 +14880,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12782,10 +14895,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	SELECT	YES
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 user_1@localhost
 GRANT SELECT ON *.* TO 'user_1'@'localhost' WITH GRANT OPTION
@@ -12829,10 +14942,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12882,10 +14995,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12897,10 +15010,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -12917,10 +15030,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -12943,10 +15056,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -13003,23 +15116,23 @@ DEFINER	longtext	NO
 SHOW CREATE TABLE triggers;
 Table	Create Table
 TRIGGERS	CREATE TEMPORARY TABLE `TRIGGERS` (
-  `TRIGGER_CATALOG` varchar(4096) 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(4096) 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(4096) 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(4096) 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
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -13067,11 +15180,70 @@ ERROR 42S02: Unknown table 'parameters' in information_schema
 
 Testcase 3.2.20.1:
 --------------------------------------------------------------------------------
-
-checking a table that will be implemented later
------------------------------------------------
 DESC referential_constraints;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+Field	Type	Null	Key	Default	Extra
+CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO			
+CONSTRAINT_NAME	varchar(64)	NO			
+UNIQUE_CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
+UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
+UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
+MATCH_OPTION	varchar(64)	NO			
+UPDATE_RULE	varchar(64)	NO			
+DELETE_RULE	varchar(64)	NO			
+TABLE_NAME	varchar(64)	NO			
+REFERENCED_TABLE_NAME	varchar(64)	NO			
+USE information_schema;
+DESC referential_constraints;
+Field	Type	Null	Key	Default	Extra
+CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO			
+CONSTRAINT_NAME	varchar(64)	NO			
+UNIQUE_CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
+UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
+UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
+MATCH_OPTION	varchar(64)	NO			
+UPDATE_RULE	varchar(64)	NO			
+DELETE_RULE	varchar(64)	NO			
+TABLE_NAME	varchar(64)	NO			
+REFERENCED_TABLE_NAME	varchar(64)	NO			
+SHOW CREATE TABLE referential_constraints;
+Table	Create Table
+REFERENTIAL_CONSTRAINTS	CREATE TEMPORARY TABLE `REFERENTIAL_CONSTRAINTS` (
+  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `UNIQUE_CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `UNIQUE_CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `UNIQUE_CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `MATCH_OPTION` varchar(64) NOT NULL DEFAULT '',
+  `UPDATE_RULE` varchar(64) NOT NULL DEFAULT '',
+  `DELETE_RULE` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `REFERENCED_TABLE_NAME` varchar(64) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
+SELECT COUNT(*) FROM information_schema.columns
+WHERE table_schema = 'information_schema'
+  AND table_name   = 'referential_constraints'
+ORDER BY ordinal_position;
+COUNT(*)
+11
+SELECT * FROM information_schema.columns
+WHERE table_schema = 'information_schema'
+  AND table_name   = 'referential_constraints'
+ORDER BY ordinal_position;
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	
 
 *** End of Data Dictionary Tests ***
 --------------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result
index 764aac53414..ab4508fb302 100644
--- a/mysql-test/suite/funcs_1/r/innodb_func_view.result
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result
@@ -9,7 +9,7 @@ CREATE TABLE t1_values
 id BIGINT AUTO_INCREMENT,
 select_id BIGINT,
 PRIMARY KEY(id)
-) ENGINE = 'InnoDB' ;
+) ENGINE = <engine_to_be_tested>;
 ALTER TABLE t1_values ADD my_char_30        CHAR(30);
 ALTER TABLE t1_values ADD my_varchar_1000   VARCHAR(1000);
 ALTER TABLE t1_values ADD my_binary_30      BINARY(30);
@@ -123,10 +123,8 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '1 17:58';
 INSERT INTO t1_values SET select_id = @select_id,
 my_bigint = 1758;
-
-some statements disabled because of
-Bug#12440: CAST(data type DOUBLE AS TIME) strange results
---------------------------------------------------------------------------------
+INSERT INTO t1_values SET select_id = @select_id,
+my_double = +1.758E+3;
 INSERT INTO t1_values SET select_id = @select_id,
 my_char_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
@@ -135,29 +133,20 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_binary_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '-3333.3333';
-
-some statements disabled because of
-Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian
---------------------------------------------------------------------------------
+INSERT INTO t1_values SET select_id = @select_id,
+my_double = -0.33333333E+4;
 
 "Attention: CAST --> SIGNED INTEGER
-            The file with expected results suffers from
-            Bug#5083 Big integer values are inserted as negative into 
-                     decimal/string columns
             Bug#5913 Traditional mode: BIGINT range not correctly delimited
-            Both have the status: To be fixed later"
---------------------------------------------------------------------------------
-
-some statements disabled because of
-Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result
+            Status: To be fixed later"
 --------------------------------------------------------------------------------
 
 "Attention: CAST --> UNSIGNED INTEGER
-            The file with expected results suffers from Bug 5083 5913 9809"
+            The file with expected results suffers from Bug 5913"
 --------------------------------------------------------------------------------
 
 some statements disabled because of
-Bugs#8663: cant use bgint unsigned as input to cast
+Bug#5913 Traditional mode: BIGINT range not correctly delimited
 --------------------------------------------------------------------------------
 SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values';
@@ -175,11 +164,6 @@ SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values';
-
-"Attention: IF(my_year IS NULL, ...
-            The file with expected results suffers from 
-            Bug#11689. successful CREATE VIEW but SELECT on view fails."
---------------------------------------------------------------------------------
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_varchar_1000),
@@ -202,7 +186,7 @@ SET @my_select =
 'SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values';
 
 "Attention: LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', <numeric column>)
-            The file with expected results suffers from Bug 10963 11728"
+            The file with expected results suffers from Bug 10963"
             and the testcases with length = BIGINT or DOUBLE column are deactivated,
 because there are 32/64 Bit differences
 --------------------------------------------------------------------------------
@@ -216,8 +200,9 @@ SET @my_select = 'SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
+SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 SET @my_select = 
-'SELECT LOAD_FILE(''../log/current_test''), id FROM t1_values';
+'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -299,19 +284,19 @@ SET sql_mode = '';
 --------------------------------------------------------------------------------
 CREATE VIEW v1 AS SELECT my_char_30, id FROM t1_values;
 SELECT my_char_30, id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL;
+WHERE select_id = 190 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL);
+WHERE select_id = 190 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values;
 SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL;
+WHERE select_id = 189 OR select_id IS NULL order by id;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -323,7 +308,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select concat(_latin1'A',`t1_values`.`my_char_30`) AS `CONCAT('A',my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL);
+WHERE select_id = 189 OR select_id IS NULL) order by id;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -337,13 +322,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL;
+WHERE select_id = 188 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varbinary_1000`) AS `LTRIM(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL);
+WHERE select_id = 188 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -351,13 +336,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL;
+WHERE select_id = 187 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_binary_30`) AS `LTRIM(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL);
+WHERE select_id = 187 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -365,13 +350,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL;
+WHERE select_id = 186 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varchar_1000`) AS `LTRIM(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL);
+WHERE select_id = 186 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -379,13 +364,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL;
+WHERE select_id = 185 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_char_30`) AS `LTRIM(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL);
+WHERE select_id = 185 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -393,13 +378,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL;
+WHERE select_id = 184 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varbinary_1000`) AS `LOWER(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL);
+WHERE select_id = 184 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -407,13 +392,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL;
+WHERE select_id = 183 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_binary_30`) AS `LOWER(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL);
+WHERE select_id = 183 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -421,13 +406,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL;
+WHERE select_id = 182 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LOWER(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL);
+WHERE select_id = 182 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -435,13 +420,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL;
+WHERE select_id = 181 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_char_30`) AS `LOWER(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL);
+WHERE select_id = 181 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -449,13 +434,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL;
+WHERE select_id = 180 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_decimal`) AS `LOCATE('-', ' - -ABC', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL);
+WHERE select_id = 180 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -463,13 +448,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL;
+WHERE select_id = 179 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_double`) AS `LOCATE('-', ' - -ABC', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL);
+WHERE select_id = 179 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -477,13 +462,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL;
+WHERE select_id = 178 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_bigint`) AS `LOCATE('-', ' - -ABC', my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL);
+WHERE select_id = 178 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -491,13 +476,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL;
+WHERE select_id = 177 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varbinary_1000`,3) AS `LOCATE('-', my_varbinary_1000, 3)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL);
+WHERE select_id = 177 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -505,13 +490,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL;
+WHERE select_id = 176 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_binary_30`,3) AS `LOCATE('-', my_binary_30, 3)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL);
+WHERE select_id = 176 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -519,13 +504,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL;
+WHERE select_id = 175 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varchar_1000`,3) AS `LOCATE('-', my_varchar_1000, 3)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL);
+WHERE select_id = 175 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -533,13 +518,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL;
+WHERE select_id = 174 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_char_30`,3) AS `LOCATE('-', my_char_30, 3)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL);
+WHERE select_id = 174 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -547,13 +532,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL;
+WHERE select_id = 173 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varbinary_1000, my_binary_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL);
+WHERE select_id = 173 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -561,13 +546,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL;
+WHERE select_id = 172 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varbinary_1000, my_varchar_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL);
+WHERE select_id = 172 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -575,13 +560,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL;
+WHERE select_id = 171 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varbinary_1000, my_char_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL);
+WHERE select_id = 171 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -589,13 +574,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL;
+WHERE select_id = 170 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varbinary_1000, my_varbinary_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL);
+WHERE select_id = 170 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -603,13 +588,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL;
+WHERE select_id = 169 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_binary_30, my_varbinary_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL);
+WHERE select_id = 169 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -617,13 +602,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL;
+WHERE select_id = 168 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_binary_30, my_varchar_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL);
+WHERE select_id = 168 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -631,13 +616,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL;
+WHERE select_id = 167 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_binary_30, my_char_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL);
+WHERE select_id = 167 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -645,13 +630,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL;
+WHERE select_id = 166 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_binary_30, my_binary_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL);
+WHERE select_id = 166 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -659,13 +644,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL;
+WHERE select_id = 165 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varchar_1000, my_varbinary_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL);
+WHERE select_id = 165 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -673,13 +658,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL;
+WHERE select_id = 164 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varchar_1000, my_binary_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL);
+WHERE select_id = 164 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -687,13 +672,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL;
+WHERE select_id = 163 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varchar_1000, my_char_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL);
+WHERE select_id = 163 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -701,13 +686,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL;
+WHERE select_id = 162 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varchar_1000, my_varchar_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL);
+WHERE select_id = 162 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -715,13 +700,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL;
+WHERE select_id = 161 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_char_30, my_varbinary_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL);
+WHERE select_id = 161 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -729,13 +714,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL;
+WHERE select_id = 160 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_char_30, my_binary_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL);
+WHERE select_id = 160 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -743,13 +728,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL;
+WHERE select_id = 159 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_char_30, my_varchar_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL);
+WHERE select_id = 159 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -757,13 +742,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values;
 SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL;
+WHERE select_id = 158 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_char_30, my_char_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL);
+WHERE select_id = 158 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -771,13 +756,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL;
+WHERE select_id = 157 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varbinary_1000`) AS `LOCATE('char', my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL);
+WHERE select_id = 157 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -785,13 +770,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL;
+WHERE select_id = 156 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_binary_30`) AS `LOCATE('char', my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL);
+WHERE select_id = 156 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -799,13 +784,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL;
+WHERE select_id = 155 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varchar_1000`) AS `LOCATE('char', my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL);
+WHERE select_id = 155 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -813,46 +798,46 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL;
+WHERE select_id = 154 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `LOCATE('char', my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL);
+WHERE select_id = 154 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../log/current_test'), id FROM t1_values;
-SELECT LOAD_FILE('../log/current_test'), id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL;
-LOAD_FILE('../log/current_test')	id
-CURRENT_TEST: innodb_func_view
+CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
+SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+WHERE select_id = 153 OR select_id IS NULL order by id;
+LOAD_FILE('../tmp/func_view.dat')	id
+äÄ@
 	1
-CURRENT_TEST: innodb_func_view
+äÄ@
 	2
-CURRENT_TEST: innodb_func_view
+äÄ@
 	3
-CURRENT_TEST: innodb_func_view
+äÄ@
 	4
-CURRENT_TEST: innodb_func_view
+äÄ@
 	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../log/current_test') AS `LOAD_FILE('../log/current_test')`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL);
-LOAD_FILE('../log/current_test')	id
-CURRENT_TEST: innodb_func_view
+WHERE select_id = 153 OR select_id IS NULL) order by id;
+LOAD_FILE('../tmp/func_view.dat')	id
+äÄ@
 	1
-CURRENT_TEST: innodb_func_view
+äÄ@
 	2
-CURRENT_TEST: innodb_func_view
+äÄ@
 	3
-CURRENT_TEST: innodb_func_view
+äÄ@
 	4
-CURRENT_TEST: innodb_func_view
+äÄ@
 	5
 DROP VIEW v1;
 
@@ -861,13 +846,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL;
+WHERE select_id = 152 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varbinary_1000`) AS `LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL);
+WHERE select_id = 152 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -875,13 +860,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL;
+WHERE select_id = 151 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_binary_30`) AS `LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL);
+WHERE select_id = 151 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -889,13 +874,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL;
+WHERE select_id = 150 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varchar_1000`) AS `LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL);
+WHERE select_id = 150 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -903,19 +888,19 @@ CREATE VIEW v1 AS SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL;
+WHERE select_id = 149 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_char_30`) AS `LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL);
+WHERE select_id = 149 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values;
 SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL;
+WHERE select_id = 148 OR select_id IS NULL order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -930,7 +915,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(_latin1'AaBbCcDdEeFfGgHhIiJj������',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL);
+WHERE select_id = 148 OR select_id IS NULL) order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -945,7 +930,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values;
 SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL;
+WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -957,7 +942,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varbinary_1000`,2) AS `LEFT(my_varbinary_1000, 2)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL);
+WHERE select_id = 147 OR select_id IS NULL) order by id;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -969,7 +954,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values;
 SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL;
+WHERE select_id = 146 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 
@@ -981,7 +966,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL);
+WHERE select_id = 146 OR select_id IS NULL) order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 
@@ -993,7 +978,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values;
 SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL;
+WHERE select_id = 145 OR select_id IS NULL order by id;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1005,7 +990,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varchar_1000`,2) AS `LEFT(my_varchar_1000, 2)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL);
+WHERE select_id = 145 OR select_id IS NULL) order by id;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1017,7 +1002,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values;
 SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL;
+WHERE select_id = 144 OR select_id IS NULL order by id;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1029,7 +1014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_char_30`,2) AS `LEFT(my_char_30, 2)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL);
+WHERE select_id = 144 OR select_id IS NULL) order by id;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1043,13 +1028,13 @@ CREATE VIEW v1 AS SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL;
+WHERE select_id = 143 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LCASE(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL);
+WHERE select_id = 143 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1057,13 +1042,13 @@ CREATE VIEW v1 AS SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values;
 SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL;
+WHERE select_id = 142 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `INSTR(my_char_30, 'char')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL);
+WHERE select_id = 142 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1071,7 +1056,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL;
+WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1083,7 +1068,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varbinary_1000`) AS `BIT_LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL);
+WHERE select_id = 141 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1097,7 +1082,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL;
+WHERE select_id = 140 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240	
@@ -1109,7 +1094,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL);
+WHERE select_id = 140 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240	
@@ -1123,7 +1108,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL;
+WHERE select_id = 139 OR select_id IS NULL order by id;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1135,7 +1120,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varchar_1000`) AS `BIT_LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL);
+WHERE select_id = 139 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1149,7 +1134,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL;
+WHERE select_id = 138 OR select_id IS NULL order by id;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1161,7 +1146,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_char_30`) AS `BIT_LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL);
+WHERE select_id = 138 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1175,7 +1160,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values;
 SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL;
+WHERE select_id = 137 OR select_id IS NULL order by id;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1187,7 +1172,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_year`,_latin1'IS_NULL') AS `IFNULL(my_year,'IS_NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL);
+WHERE select_id = 137 OR select_id IS NULL) order by id;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1201,7 +1186,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values;
 SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL;
+WHERE select_id = 136 OR select_id IS NULL order by id;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1213,7 +1198,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_time`,_latin1'IS_NULL') AS `IFNULL(my_time,'IS_NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL);
+WHERE select_id = 136 OR select_id IS NULL) order by id;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1227,7 +1212,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values;
 SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL;
+WHERE select_id = 135 OR select_id IS NULL order by id;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1239,7 +1224,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_timestamp`,_latin1'IS_NULL') AS `IFNULL(my_timestamp,'IS_NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL);
+WHERE select_id = 135 OR select_id IS NULL) order by id;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1253,7 +1238,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values;
 SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL;
+WHERE select_id = 134 OR select_id IS NULL order by id;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1265,7 +1250,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_date`,_latin1'IS_NULL') AS `IFNULL(my_date,'IS_NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL);
+WHERE select_id = 134 OR select_id IS NULL) order by id;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1279,7 +1264,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values;
 SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL;
+WHERE select_id = 133 OR select_id IS NULL order by id;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1291,7 +1276,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_datetime`,_latin1'IS_NULL') AS `IFNULL(my_datetime,'IS_NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL);
+WHERE select_id = 133 OR select_id IS NULL) order by id;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1305,7 +1290,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values;
 SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL;
+WHERE select_id = 132 OR select_id IS NULL order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1317,7 +1302,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_double`,_latin1'IS_NULL') AS `IFNULL(my_double,'IS_NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL);
+WHERE select_id = 132 OR select_id IS NULL) order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1331,7 +1316,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values;
 SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL;
+WHERE select_id = 131 OR select_id IS NULL order by id;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1343,7 +1328,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_decimal`,_latin1'IS_NULL') AS `IFNULL(my_decimal,'IS_NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL);
+WHERE select_id = 131 OR select_id IS NULL) order by id;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1357,7 +1342,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values;
 SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL;
+WHERE select_id = 130 OR select_id IS NULL order by id;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1369,7 +1354,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_bigint`,_latin1'IS_NULL') AS `IFNULL(my_bigint,'IS_NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL);
+WHERE select_id = 130 OR select_id IS NULL) order by id;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1383,7 +1368,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL;
+WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1395,7 +1380,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varbinary_1000`,_latin1'IS_NULL') AS `IFNULL(my_varbinary_1000,'IS_NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL);
+WHERE select_id = 129 OR select_id IS NULL) order by id;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1409,7 +1394,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values;
 SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL;
+WHERE select_id = 128 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 
@@ -1421,7 +1406,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,_latin1'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL);
+WHERE select_id = 128 OR select_id IS NULL) order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 
@@ -1435,7 +1420,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values;
 SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL;
+WHERE select_id = 127 OR select_id IS NULL order by id;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1447,7 +1432,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varchar_1000`,_latin1'IS_NULL') AS `IFNULL(my_varchar_1000,'IS_NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL);
+WHERE select_id = 127 OR select_id IS NULL) order by id;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1461,7 +1446,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values;
 SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL;
+WHERE select_id = 126 OR select_id IS NULL order by id;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1473,7 +1458,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_char_30`,_latin1'IS_NULL') AS `IFNULL(my_char_30,'IS_NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL);
+WHERE select_id = 126 OR select_id IS NULL) order by id;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1487,7 +1472,7 @@ CREATE VIEW v1 AS SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values;
 SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL;
+WHERE select_id = 125 OR select_id IS NULL order by id;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1501,7 +1486,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL);
+WHERE select_id = 125 OR select_id IS NULL) order by id;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1516,7 +1501,7 @@ CREATE VIEW v1 AS SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values;
 SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL;
+WHERE select_id = 124 OR select_id IS NULL order by id;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1530,7 +1515,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL);
+WHERE select_id = 124 OR select_id IS NULL) order by id;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1545,7 +1530,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL;
+WHERE select_id = 123 OR select_id IS NULL order by id;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1559,7 +1544,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL);
+WHERE select_id = 123 OR select_id IS NULL) order by id;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1574,7 +1559,7 @@ CREATE VIEW v1 AS SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values;
 SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL;
+WHERE select_id = 122 OR select_id IS NULL order by id;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1588,7 +1573,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL);
+WHERE select_id = 122 OR select_id IS NULL) order by id;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1603,7 +1588,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values;
 SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL;
+WHERE select_id = 121 OR select_id IS NULL order by id;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1617,7 +1602,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL);
+WHERE select_id = 121 OR select_id IS NULL) order by id;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1632,7 +1617,7 @@ CREATE VIEW v1 AS SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values;
 SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL;
+WHERE select_id = 120 OR select_id IS NULL order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1646,7 +1631,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL);
+WHERE select_id = 120 OR select_id IS NULL) order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1661,7 +1646,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values;
 SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL;
+WHERE select_id = 119 OR select_id IS NULL order by id;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1675,7 +1660,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL);
+WHERE select_id = 119 OR select_id IS NULL) order by id;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1690,7 +1675,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values;
 SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL;
+WHERE select_id = 118 OR select_id IS NULL order by id;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1704,7 +1689,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL);
+WHERE select_id = 118 OR select_id IS NULL) order by id;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1719,7 +1704,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL;
+WHERE select_id = 117 OR select_id IS NULL order by id;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1733,7 +1718,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL);
+WHERE select_id = 117 OR select_id IS NULL) order by id;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1748,7 +1733,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL;
+WHERE select_id = 116 OR select_id IS NULL order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1762,7 +1747,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL);
+WHERE select_id = 116 OR select_id IS NULL) order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1777,7 +1762,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL;
+WHERE select_id = 115 OR select_id IS NULL order by id;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1791,7 +1776,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL);
+WHERE select_id = 115 OR select_id IS NULL) order by id;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1806,7 +1791,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values;
 SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL;
+WHERE select_id = 114 OR select_id IS NULL order by id;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1820,7 +1805,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL);
+WHERE select_id = 114 OR select_id IS NULL) order by id;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1835,7 +1820,7 @@ CREATE VIEW v1 AS SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values;
 SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL;
+WHERE select_id = 113 OR select_id IS NULL order by id;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1847,7 +1832,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_year`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_year, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL);
+WHERE select_id = 113 OR select_id IS NULL) order by id;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1861,7 +1846,7 @@ CREATE VIEW v1 AS SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values;
 SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL;
+WHERE select_id = 112 OR select_id IS NULL order by id;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1873,7 +1858,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_time`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_time, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL);
+WHERE select_id = 112 OR select_id IS NULL) order by id;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1887,7 +1872,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL;
+WHERE select_id = 111 OR select_id IS NULL order by id;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1899,7 +1884,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_timestamp`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL);
+WHERE select_id = 111 OR select_id IS NULL) order by id;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1913,7 +1898,7 @@ CREATE VIEW v1 AS SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values;
 SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL;
+WHERE select_id = 110 OR select_id IS NULL order by id;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1925,7 +1910,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_date`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_date, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL);
+WHERE select_id = 110 OR select_id IS NULL) order by id;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1939,7 +1924,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values;
 SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL;
+WHERE select_id = 109 OR select_id IS NULL order by id;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1951,7 +1936,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_datetime`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL);
+WHERE select_id = 109 OR select_id IS NULL) order by id;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1965,7 +1950,7 @@ CREATE VIEW v1 AS SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values;
 SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL;
+WHERE select_id = 108 OR select_id IS NULL order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1977,7 +1962,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_double`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_double, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL);
+WHERE select_id = 108 OR select_id IS NULL) order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1991,7 +1976,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values;
 SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL;
+WHERE select_id = 107 OR select_id IS NULL order by id;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2003,7 +1988,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_decimal`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL);
+WHERE select_id = 107 OR select_id IS NULL) order by id;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2017,7 +2002,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values;
 SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL;
+WHERE select_id = 106 OR select_id IS NULL order by id;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2029,7 +2014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_bigint`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL);
+WHERE select_id = 106 OR select_id IS NULL) order by id;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2043,7 +2028,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL;
+WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2055,7 +2040,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varbinary_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL);
+WHERE select_id = 105 OR select_id IS NULL) order by id;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2069,7 +2054,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL;
+WHERE select_id = 104 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE	
@@ -2086,7 +2071,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_binary_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL);
+WHERE select_id = 104 OR select_id IS NULL) order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE	
@@ -2105,7 +2090,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL;
+WHERE select_id = 103 OR select_id IS NULL order by id;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2117,7 +2102,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varchar_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL);
+WHERE select_id = 103 OR select_id IS NULL) order by id;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2131,7 +2116,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values;
 SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL;
+WHERE select_id = 102 OR select_id IS NULL order by id;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2146,7 +2131,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_char_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL);
+WHERE select_id = 102 OR select_id IS NULL) order by id;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2163,7 +2148,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL;
+WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2175,7 +2160,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using koi8r) AS `CONVERT(my_varbinary_1000 USING koi8r)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL);
+WHERE select_id = 101 OR select_id IS NULL) order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2189,7 +2174,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING koi8r), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL;
+WHERE select_id = 100 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 
@@ -2201,7 +2186,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL);
+WHERE select_id = 100 OR select_id IS NULL) order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 
@@ -2215,7 +2200,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING koi8r), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL;
+WHERE select_id = 99 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2227,7 +2212,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using koi8r) AS `CONVERT(my_varchar_1000 USING koi8r)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL);
+WHERE select_id = 99 OR select_id IS NULL) order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2241,7 +2226,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING koi8r), 
 my_char_30, id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL;
+WHERE select_id = 98 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2253,7 +2238,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using koi8r) AS `CONVERT(my_char_30 USING koi8r)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL);
+WHERE select_id = 98 OR select_id IS NULL) order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2267,7 +2252,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING utf8), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL;
+WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2279,7 +2264,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using utf8) AS `CONVERT(my_varbinary_1000 USING utf8)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL);
+WHERE select_id = 97 OR select_id IS NULL) order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2293,7 +2278,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING utf8), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL;
+WHERE select_id = 96 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 
@@ -2305,7 +2290,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL);
+WHERE select_id = 96 OR select_id IS NULL) order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 
@@ -2319,7 +2304,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING utf8), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL;
+WHERE select_id = 95 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2331,7 +2316,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using utf8) AS `CONVERT(my_varchar_1000 USING utf8)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL);
+WHERE select_id = 95 OR select_id IS NULL) order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2345,7 +2330,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL;
+WHERE select_id = 94 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2357,7 +2342,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using utf8) AS `CONVERT(my_char_30 USING utf8)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL);
+WHERE select_id = 94 OR select_id IS NULL) order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2371,7 +2356,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL;
+WHERE select_id = 93 OR select_id IS NULL order by id;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2383,7 +2368,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as unsigned) AS `CAST(my_year AS UNSIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL);
+WHERE select_id = 93 OR select_id IS NULL) order by id;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2397,7 +2382,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL;
+WHERE select_id = 92 OR select_id IS NULL order by id;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2415,7 +2400,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL);
+WHERE select_id = 92 OR select_id IS NULL) order by id;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2435,7 +2420,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL;
+WHERE select_id = 91 OR select_id IS NULL order by id;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2453,7 +2438,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as unsigned) AS `CAST(my_timestamp AS UNSIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL);
+WHERE select_id = 91 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2473,7 +2458,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL;
+WHERE select_id = 90 OR select_id IS NULL order by id;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2490,7 +2475,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as unsigned) AS `CAST(my_date AS UNSIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL);
+WHERE select_id = 90 OR select_id IS NULL) order by id;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2509,7 +2494,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL;
+WHERE select_id = 89 OR select_id IS NULL order by id;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2526,7 +2511,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as unsigned) AS `CAST(my_datetime AS UNSIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL);
+WHERE select_id = 89 OR select_id IS NULL) order by id;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2545,7 +2530,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL;
+WHERE select_id = 88 OR select_id IS NULL order by id;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2561,7 +2546,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL);
+WHERE select_id = 88 OR select_id IS NULL) order by id;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2579,7 +2564,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL;
+WHERE select_id = 87 OR select_id IS NULL order by id;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2591,7 +2576,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as unsigned) AS `CAST(my_bigint AS UNSIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL);
+WHERE select_id = 87 OR select_id IS NULL) order by id;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2605,7 +2590,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL;
+WHERE select_id = 86 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2622,7 +2607,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as unsigned) AS `CAST(my_varbinary_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL);
+WHERE select_id = 86 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2641,7 +2626,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL;
+WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0	
@@ -2659,7 +2644,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as unsigned) AS `CAST(my_binary_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL);
+WHERE select_id = 85 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0	
@@ -2679,7 +2664,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL;
+WHERE select_id = 84 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2696,7 +2681,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as unsigned) AS `CAST(my_varchar_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL);
+WHERE select_id = 84 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2715,7 +2700,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL;
+WHERE select_id = 83 OR select_id IS NULL order by id;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2732,7 +2717,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as unsigned) AS `CAST(my_char_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL);
+WHERE select_id = 83 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2751,7 +2736,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL;
+WHERE select_id = 82 OR select_id IS NULL order by id;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2763,7 +2748,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as signed) AS `CAST(my_year AS SIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL);
+WHERE select_id = 82 OR select_id IS NULL) order by id;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2777,7 +2762,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL;
+WHERE select_id = 81 OR select_id IS NULL order by id;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2794,7 +2779,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL);
+WHERE select_id = 81 OR select_id IS NULL) order by id;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2813,7 +2798,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL;
+WHERE select_id = 80 OR select_id IS NULL order by id;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2831,7 +2816,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL);
+WHERE select_id = 80 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2851,7 +2836,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL;
+WHERE select_id = 79 OR select_id IS NULL order by id;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2868,7 +2853,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL);
+WHERE select_id = 79 OR select_id IS NULL) order by id;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2887,7 +2872,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL;
+WHERE select_id = 78 OR select_id IS NULL order by id;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2904,7 +2889,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL);
+WHERE select_id = 78 OR select_id IS NULL) order by id;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2919,11 +2904,43 @@ Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS SIGNED INTEGER),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS SIGNED INTEGER),
+my_double, id FROM t1_values
+WHERE select_id = 77 OR select_id IS NULL order by id;
+CAST(my_double AS SIGNED INTEGER)	my_double	id
+NULL	NULL	1
+-9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 77 OR select_id IS NULL) order by id;
+CAST(my_double AS SIGNED INTEGER)	my_double	id
+NULL	NULL	1
+-9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL;
+WHERE select_id = 76 OR select_id IS NULL order by id;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2938,7 +2955,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL);
+WHERE select_id = 76 OR select_id IS NULL) order by id;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2955,7 +2972,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL;
+WHERE select_id = 75 OR select_id IS NULL order by id;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2967,7 +2984,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as signed) AS `CAST(my_bigint AS SIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL);
+WHERE select_id = 75 OR select_id IS NULL) order by id;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2981,7 +2998,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL;
+WHERE select_id = 74 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2997,7 +3014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as signed) AS `CAST(my_varbinary_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL);
+WHERE select_id = 74 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -3015,7 +3032,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL;
+WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0	
@@ -3032,7 +3049,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as signed) AS `CAST(my_binary_30 AS SIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL);
+WHERE select_id = 73 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0	
@@ -3051,7 +3068,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL;
+WHERE select_id = 72 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3067,7 +3084,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as signed) AS `CAST(my_varchar_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL);
+WHERE select_id = 72 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3085,7 +3102,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL;
+WHERE select_id = 71 OR select_id IS NULL order by id;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3101,7 +3118,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as signed) AS `CAST(my_char_30 AS SIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL);
+WHERE select_id = 71 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3119,25 +3136,25 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL;
+WHERE select_id = 70 OR select_id IS NULL order by id;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901.00	1901	2
-2155.00	2155	3
-2000.00	2000	4
-2005.00	2005	5
+1901	1901	2
+2155	2155	3
+2000	2000	4
+2005	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL);
+WHERE select_id = 70 OR select_id IS NULL) order by id;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901.00	1901	2
-2155.00	2155	3
-2000.00	2000	4
-2005.00	2005	5
+1901	1901	2
+2155	2155	3
+2000	2000	4
+2005	2005	5
 DROP VIEW v1;
 
 
@@ -3145,25 +3162,25 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL;
+WHERE select_id = 69 OR select_id IS NULL order by id;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959.00	-838:59:59	2
-8385959.00	838:59:59	3
-130000.00	13:00:00	4
-100000.00	10:00:00	5
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL);
+WHERE select_id = 69 OR select_id IS NULL) order by id;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959.00	-838:59:59	2
-8385959.00	838:59:59	3
-130000.00	13:00:00	4
-100000.00	10:00:00	5
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;
 
 
@@ -3171,25 +3188,35 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL;
+WHERE select_id = 68 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0.00	0000-00-00 00:00:00	1
-19700101030001.00	1970-01-01 03:00:01	2
-20380101025959.00	2038-01-01 02:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+0	0000-00-00 00:00:00	1
+9999999999	1970-01-01 03:00:01	2
+9999999999	2038-01-01 02:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL);
+WHERE select_id = 68 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0.00	0000-00-00 00:00:00	1
-19700101030001.00	1970-01-01 03:00:01	2
-20380101025959.00	2038-01-01 02:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+0	0000-00-00 00:00:00	1
+9999999999	1970-01-01 03:00:01	2
+9999999999	2038-01-01 02:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3197,25 +3224,25 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL;
+WHERE select_id = 67 OR select_id IS NULL order by id;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101.00	0001-01-01	2
-99991231.00	9999-12-31	3
-20040229.00	2004-02-29	4
-20050628.00	2005-06-28	5
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL);
+WHERE select_id = 67 OR select_id IS NULL) order by id;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101.00	0001-01-01	2
-99991231.00	9999-12-31	3
-20040229.00	2004-02-29	4
-20050628.00	2005-06-28	5
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -3223,25 +3250,73 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL;
+WHERE select_id = 66 OR select_id IS NULL order by id;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-10101000000.00	0001-01-01 00:00:00	2
-99991231235959.00	9999-12-31 23:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+9999999999	0001-01-01 00:00:00	2
+9999999999	9999-12-31 23:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL);
+WHERE select_id = 66 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-10101000000.00	0001-01-01 00:00:00	2
-99991231235959.00	9999-12-31 23:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+9999999999	0001-01-01 00:00:00	2
+9999999999	9999-12-31 23:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+DROP VIEW v1;
+
+
+CREATE VIEW v1 AS SELECT CAST(my_double AS DECIMAL),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS DECIMAL),
+my_double, id FROM t1_values
+WHERE select_id = 65 OR select_id IS NULL order by id;
+CAST(my_double AS DECIMAL)	my_double	id
+NULL	NULL	1
+-9999999999	-1.7976931348623e+308	2
+9999999999	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+-3333	-3333.3333	30
+Warnings:
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as decimal) AS `CAST(my_double AS DECIMAL)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 65 OR select_id IS NULL) order by id;
+CAST(my_double AS DECIMAL)	my_double	id
+NULL	NULL	1
+-9999999999	-1.7976931348623e+308	2
+9999999999	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+-3333	-3333.3333	30
+Warnings:
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3249,25 +3324,31 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL;
+WHERE select_id = 64 OR select_id IS NULL order by id;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
-0.00	0.000000000000000000000000000000	4
--1.00	-1.000000000000000000000000000000	5
+-9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
+0	0.000000000000000000000000000000	4
+-1	-1.000000000000000000000000000000	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL);
+WHERE select_id = 64 OR select_id IS NULL) order by id;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
-0.00	0.000000000000000000000000000000	4
--1.00	-1.000000000000000000000000000000	5
+-9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
+0	0.000000000000000000000000000000	4
+-1	-1.000000000000000000000000000000	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3275,25 +3356,31 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL;
+WHERE select_id = 63 OR select_id IS NULL order by id;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9223372036854775808.00	-9223372036854775808	2
-9223372036854775807.00	9223372036854775807	3
-0.00	0	4
--1.00	-1	5
+-9999999999	-9223372036854775808	2
+9999999999	9223372036854775807	3
+0	0	4
+-1	-1	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL);
+WHERE select_id = 63 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9223372036854775808.00	-9223372036854775808	2
-9223372036854775807.00	9223372036854775807	3
-0.00	0	4
--1.00	-1	5
+-9999999999	-9223372036854775808	2
+9999999999	9223372036854775807	3
+0	0	4
+-1	-1	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3301,14 +3388,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL;
+WHERE select_id = 62 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	28
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	29
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3318,14 +3405,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL);
+WHERE select_id = 62 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	28
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	29
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3337,14 +3424,14 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL;
+WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0.00	
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 
--1.00	-1
--3333.33	-3333.3333
+0	
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$-- 
+-1	-1
+-3333	-3333.3333
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3359,14 +3446,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL);
+WHERE select_id = 61 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0.00	
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 
--1.00	-1
--3333.33	-3333.3333
+0	
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$-- 
+-1	-1
+-3333	-3333.3333
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3383,14 +3470,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL;
+WHERE select_id = 60 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	26
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3400,14 +3487,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL);
+WHERE select_id = 60 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	26
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3419,14 +3506,14 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL;
+WHERE select_id = 59 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$--	4
--1.00	-1	5
--3333.33	-3333.3333	25
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$--	4
+-1	-1	5
+-3333	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3439,14 +3526,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL);
+WHERE select_id = 59 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$--	4
--1.00	-1	5
--3333.33	-3333.3333	25
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$--	4
+-1	-1	5
+-3333	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3461,7 +3548,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL;
+WHERE select_id = 58 OR select_id IS NULL order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3473,7 +3560,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as time) AS `CAST(my_year AS TIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL);
+WHERE select_id = 58 OR select_id IS NULL) order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3487,7 +3574,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL;
+WHERE select_id = 57 OR select_id IS NULL order by id;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3499,7 +3586,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as time) AS `CAST(my_time AS TIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL);
+WHERE select_id = 57 OR select_id IS NULL) order by id;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3513,7 +3600,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL;
+WHERE select_id = 56 OR select_id IS NULL order by id;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3525,7 +3612,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as time) AS `CAST(my_timestamp AS TIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL);
+WHERE select_id = 56 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3539,7 +3626,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL;
+WHERE select_id = 55 OR select_id IS NULL order by id;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3551,7 +3638,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as time) AS `CAST(my_date AS TIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL);
+WHERE select_id = 55 OR select_id IS NULL) order by id;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3565,7 +3652,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL;
+WHERE select_id = 54 OR select_id IS NULL order by id;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3577,7 +3664,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as time) AS `CAST(my_datetime AS TIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL);
+WHERE select_id = 54 OR select_id IS NULL) order by id;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3587,11 +3674,45 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS TIME),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS TIME),
+my_double, id FROM t1_values
+WHERE select_id = 53 OR select_id IS NULL order by id;
+CAST(my_double AS TIME)	my_double	id
+NULL	NULL	1
+NULL	-1.7976931348623e+308	2
+NULL	1.7976931348623e+308	3
+00:00:00	0	4
+-00:00:01	-1	5
+00:17:58	1758	25
+Warnings:
+Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 53 OR select_id IS NULL) order by id;
+CAST(my_double AS TIME)	my_double	id
+NULL	NULL	1
+NULL	-1.7976931348623e+308	2
+NULL	1.7976931348623e+308	3
+00:00:00	0	4
+-00:00:01	-1	5
+00:17:58	1758	25
+Warnings:
+Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL;
+WHERE select_id = 52 OR select_id IS NULL order by id;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3607,7 +3728,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL);
+WHERE select_id = 52 OR select_id IS NULL) order by id;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3625,7 +3746,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL;
+WHERE select_id = 51 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3642,7 +3763,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as time) AS `CAST(my_varbinary_1000 AS TIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL);
+WHERE select_id = 51 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3661,7 +3782,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL;
+WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00	
@@ -3680,7 +3801,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as time) AS `CAST(my_binary_30 AS TIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL);
+WHERE select_id = 50 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00	
@@ -3701,7 +3822,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL;
+WHERE select_id = 49 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3718,7 +3839,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as time) AS `CAST(my_varchar_1000 AS TIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL);
+WHERE select_id = 49 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3737,7 +3858,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL;
+WHERE select_id = 48 OR select_id IS NULL order by id;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3754,7 +3875,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as time) AS `CAST(my_char_30 AS TIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL);
+WHERE select_id = 48 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3773,7 +3894,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL;
+WHERE select_id = 47 OR select_id IS NULL order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3781,16 +3902,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as datetime) AS `CAST(my_year AS DATETIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL);
+WHERE select_id = 47 OR select_id IS NULL) order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3798,10 +3919,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -3809,35 +3930,31 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL;
+WHERE select_id = 46 OR select_id IS NULL order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 00:00:00	13:00:00	4
-0000-00-00 00:00:00	10:00:00	5
+0000-00-00 13:00:00	13:00:00	4
+0000-00-00 10:00:00	10:00:00	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL);
+WHERE select_id = 46 OR select_id IS NULL) order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 00:00:00	13:00:00	4
-0000-00-00 00:00:00	10:00:00	5
+0000-00-00 13:00:00	13:00:00	4
+0000-00-00 10:00:00	10:00:00	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
 DROP VIEW v1;
 
 
@@ -3845,7 +3962,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL;
+WHERE select_id = 45 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3857,7 +3974,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as datetime) AS `CAST(my_timestamp AS DATETIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL);
+WHERE select_id = 45 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3871,7 +3988,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL;
+WHERE select_id = 44 OR select_id IS NULL order by id;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -3883,7 +4000,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as datetime) AS `CAST(my_date AS DATETIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL);
+WHERE select_id = 44 OR select_id IS NULL) order by id;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -3897,7 +4014,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL;
+WHERE select_id = 43 OR select_id IS NULL order by id;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -3909,7 +4026,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as datetime) AS `CAST(my_datetime AS DATETIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL);
+WHERE select_id = 43 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -3923,7 +4040,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL;
+WHERE select_id = 42 OR select_id IS NULL order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -3932,17 +4049,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL);
+WHERE select_id = 42 OR select_id IS NULL) order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -3951,11 +4068,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -3963,7 +4080,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL;
+WHERE select_id = 41 OR select_id IS NULL order by id;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3972,17 +4089,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL);
+WHERE select_id = 41 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3991,11 +4108,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -4003,7 +4120,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL;
+WHERE select_id = 40 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4012,16 +4129,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as datetime) AS `CAST(my_varbinary_1000 AS DATETIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL);
+WHERE select_id = 40 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4030,10 +4147,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4041,7 +4158,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL;
+WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL	
@@ -4050,17 +4167,17 @@ NULL	 ---äÖüß@µ*$-- 
 NULL	-1
 2005-06-27 17:58:00	2005-06-27 17:58
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as datetime) AS `CAST(my_binary_30 AS DATETIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL);
+WHERE select_id = 39 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL	
@@ -4069,10 +4186,10 @@ NULL	 ---äÖüß@µ*$-- 
 NULL	-1
 2005-06-27 17:58:00	2005-06-27 17:58
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 DROP VIEW v1;
 
@@ -4081,7 +4198,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL;
+WHERE select_id = 38 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4090,16 +4207,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as datetime) AS `CAST(my_varchar_1000 AS DATETIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL);
+WHERE select_id = 38 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4108,10 +4225,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4119,7 +4236,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL;
+WHERE select_id = 37 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4128,16 +4245,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$--'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as datetime) AS `CAST(my_char_30 AS DATETIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL);
+WHERE select_id = 37 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4146,10 +4263,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$--'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4157,7 +4274,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL;
+WHERE select_id = 36 OR select_id IS NULL order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4165,16 +4282,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as date) AS `CAST(my_year AS DATE)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL);
+WHERE select_id = 36 OR select_id IS NULL) order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4182,10 +4299,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -4193,7 +4310,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL;
+WHERE select_id = 35 OR select_id IS NULL order by id;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4205,7 +4322,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL);
+WHERE select_id = 35 OR select_id IS NULL) order by id;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4219,7 +4336,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL;
+WHERE select_id = 34 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4231,7 +4348,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as date) AS `CAST(my_timestamp AS DATE)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL);
+WHERE select_id = 34 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4245,7 +4362,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL;
+WHERE select_id = 33 OR select_id IS NULL order by id;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4257,7 +4374,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as date) AS `CAST(my_date AS DATE)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL);
+WHERE select_id = 33 OR select_id IS NULL) order by id;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4271,7 +4388,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL;
+WHERE select_id = 32 OR select_id IS NULL order by id;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4283,7 +4400,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as date) AS `CAST(my_datetime AS DATE)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL);
+WHERE select_id = 32 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4297,7 +4414,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL;
+WHERE select_id = 31 OR select_id IS NULL order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4306,16 +4423,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL);
+WHERE select_id = 31 OR select_id IS NULL) order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4324,10 +4441,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4335,7 +4452,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL;
+WHERE select_id = 30 OR select_id IS NULL order by id;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4344,16 +4461,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL);
+WHERE select_id = 30 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4362,10 +4479,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4373,7 +4490,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL;
+WHERE select_id = 29 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4382,16 +4499,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as date) AS `CAST(my_varbinary_1000 AS DATE)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL);
+WHERE select_id = 29 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4400,10 +4517,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4411,7 +4528,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL;
+WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL	
@@ -4420,17 +4537,17 @@ NULL	 ---äÖüß@µ*$-- 
 NULL	-1
 2005-06-27	2005-06-27
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as date) AS `CAST(my_binary_30 AS DATE)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL);
+WHERE select_id = 28 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL	
@@ -4439,10 +4556,10 @@ NULL	 ---äÖüß@µ*$-- 
 NULL	-1
 2005-06-27	2005-06-27
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 DROP VIEW v1;
 
@@ -4451,7 +4568,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL;
+WHERE select_id = 27 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4460,16 +4577,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as date) AS `CAST(my_varchar_1000 AS DATE)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL);
+WHERE select_id = 27 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4478,10 +4595,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4489,7 +4606,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL;
+WHERE select_id = 26 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4498,16 +4615,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$--'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as date) AS `CAST(my_char_30 AS DATE)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL);
+WHERE select_id = 26 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4516,10 +4633,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$--'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4527,7 +4644,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL;
+WHERE select_id = 25 OR select_id IS NULL order by id;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4539,7 +4656,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset latin1) AS `CAST(my_year AS CHAR)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL);
+WHERE select_id = 25 OR select_id IS NULL) order by id;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4553,7 +4670,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL;
+WHERE select_id = 24 OR select_id IS NULL order by id;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4565,7 +4682,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset latin1) AS `CAST(my_time AS CHAR)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL);
+WHERE select_id = 24 OR select_id IS NULL) order by id;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4579,7 +4696,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL;
+WHERE select_id = 23 OR select_id IS NULL order by id;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4591,7 +4708,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset latin1) AS `CAST(my_timestamp AS CHAR)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL);
+WHERE select_id = 23 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4605,7 +4722,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL;
+WHERE select_id = 22 OR select_id IS NULL order by id;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4617,7 +4734,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset latin1) AS `CAST(my_date AS CHAR)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL);
+WHERE select_id = 22 OR select_id IS NULL) order by id;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4631,7 +4748,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL;
+WHERE select_id = 21 OR select_id IS NULL order by id;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4643,7 +4760,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset latin1) AS `CAST(my_datetime AS CHAR)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL);
+WHERE select_id = 21 OR select_id IS NULL) order by id;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4657,7 +4774,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL;
+WHERE select_id = 20 OR select_id IS NULL order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4669,7 +4786,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset latin1) AS `CAST(my_double AS CHAR)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL);
+WHERE select_id = 20 OR select_id IS NULL) order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4683,7 +4800,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL;
+WHERE select_id = 19 OR select_id IS NULL order by id;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4695,7 +4812,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset latin1) AS `CAST(my_decimal AS CHAR)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL);
+WHERE select_id = 19 OR select_id IS NULL) order by id;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4709,7 +4826,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL;
+WHERE select_id = 18 OR select_id IS NULL order by id;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4721,7 +4838,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset latin1) AS `CAST(my_bigint AS CHAR)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL);
+WHERE select_id = 18 OR select_id IS NULL) order by id;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4735,7 +4852,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL;
+WHERE select_id = 17 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4747,7 +4864,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset latin1) AS `CAST(my_varbinary_1000 AS CHAR)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL);
+WHERE select_id = 17 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4761,7 +4878,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL;
+WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 
@@ -4773,7 +4890,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL);
+WHERE select_id = 16 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 
@@ -4787,7 +4904,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL;
+WHERE select_id = 15 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4799,7 +4916,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset latin1) AS `CAST(my_varchar_1000 AS CHAR)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL);
+WHERE select_id = 15 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4813,7 +4930,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL;
+WHERE select_id = 14 OR select_id IS NULL order by id;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4825,7 +4942,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset latin1) AS `CAST(my_char_30 AS CHAR)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL);
+WHERE select_id = 14 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4839,7 +4956,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL;
+WHERE select_id = 13 OR select_id IS NULL order by id;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4851,7 +4968,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset binary) AS `CAST(my_year AS BINARY)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL);
+WHERE select_id = 13 OR select_id IS NULL) order by id;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4865,7 +4982,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL;
+WHERE select_id = 12 OR select_id IS NULL order by id;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4877,7 +4994,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset binary) AS `CAST(my_time AS BINARY)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL);
+WHERE select_id = 12 OR select_id IS NULL) order by id;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4891,7 +5008,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL;
+WHERE select_id = 11 OR select_id IS NULL order by id;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4903,7 +5020,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset binary) AS `CAST(my_timestamp AS BINARY)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL);
+WHERE select_id = 11 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4917,7 +5034,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL;
+WHERE select_id = 10 OR select_id IS NULL order by id;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4929,7 +5046,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset binary) AS `CAST(my_date AS BINARY)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL);
+WHERE select_id = 10 OR select_id IS NULL) order by id;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4943,7 +5060,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL;
+WHERE select_id = 9 OR select_id IS NULL order by id;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4955,7 +5072,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset binary) AS `CAST(my_datetime AS BINARY)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL);
+WHERE select_id = 9 OR select_id IS NULL) order by id;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4969,7 +5086,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL;
+WHERE select_id = 8 OR select_id IS NULL order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4981,7 +5098,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset binary) AS `CAST(my_double AS BINARY)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL);
+WHERE select_id = 8 OR select_id IS NULL) order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4995,7 +5112,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL;
+WHERE select_id = 7 OR select_id IS NULL order by id;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5007,7 +5124,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset binary) AS `CAST(my_decimal AS BINARY)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL);
+WHERE select_id = 7 OR select_id IS NULL) order by id;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5021,7 +5138,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL;
+WHERE select_id = 6 OR select_id IS NULL order by id;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5033,7 +5150,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset binary) AS `CAST(my_bigint AS BINARY)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL);
+WHERE select_id = 6 OR select_id IS NULL) order by id;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5047,7 +5164,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL;
+WHERE select_id = 5 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5059,7 +5176,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset binary) AS `CAST(my_varbinary_1000 AS BINARY)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL);
+WHERE select_id = 5 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5073,7 +5190,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL;
+WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 
@@ -5085,7 +5202,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL);
+WHERE select_id = 4 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 
@@ -5099,7 +5216,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL;
+WHERE select_id = 3 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5111,7 +5228,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset binary) AS `CAST(my_varchar_1000 AS BINARY)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL);
+WHERE select_id = 3 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5125,7 +5242,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL;
+WHERE select_id = 2 OR select_id IS NULL order by id;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5137,7 +5254,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset binary) AS `CAST(my_char_30 AS BINARY)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL);
+WHERE select_id = 2 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5149,7 +5266,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT sqrt(my_bigint), my_bigint, id FROM t1_values;
 SELECT sqrt(my_bigint), my_bigint, id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL;
+WHERE select_id = 1 OR select_id IS NULL order by id;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -5163,7 +5280,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sqrt(`t1_values`.`my_bigint`) AS `sqrt(my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL);
+WHERE select_id = 1 OR select_id IS NULL) order by id;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc.result b/mysql-test/suite/funcs_1/r/innodb_storedproc.result
index f05c7ef73c4..fbc908b8ccf 100644
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc.result
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc.result
@@ -3,19 +3,16 @@
 .                         IMPORTANT NOTICE:
 .                         -----------------
 .
-.  FIXME: The <engine>_storedproc.result files are still NOT CHECKED
-.         for correctness!
+.  FIXME: The .result files are still NOT CHECKED for correctness!
 .
 .  FIXME: Several tests are affected by known problems around DECIMAL
-.  FIXME: and NUMERIC that needs to be checked again after WL#2984
+.  FIXME: and NUMERIC that will be checked again after WL#2984 once
 .  FIXME: has been completed. Some of them are marked in the result.
 .
-.  This .result file has been checked OK with Linux 5.0.23-bk,
-.  ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
-.
-. This file has been saved although it might contain failures / wrong
-. results to be able to detect _new_ differences in the behaviour.
-. Hopefully the remaining checks can be made soon.
+. Currently (Dec 06, 2005) this .result file is checked OK for Linux
+. with 5.0.17-bk (ChangeSet@1.1975.1.2, 2005-12-05 18:33:48+01:00).
+. Using the available Windows version 5.0.16 there are differences
+. that can be ignored (e.g. WL#2984).
 .
 --------------------------------------------------------------------------------
 	FIXME: There are subtests that are switched off due to known bugs:
@@ -99,20 +96,21 @@ USE db_storedproc;
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
-ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934('aaaa');
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
+f1	f2	f3	f4	f5	f6
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( f1 tinytext ) language sql deterministic sql security definer comment 'this is simple'
   BEGIN
 set @v1 = f1;
 SELECT @v1, @v1;
 END//
-ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( 'abc' );
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
+@v1	@v1
+abc	abc
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 binary ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -121,12 +119,12 @@ SELECT @v1;
 END//
 CALL sp1( 34 );
 @v1
-3
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+34
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 blob ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -139,6 +137,8 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 int )  language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
@@ -151,6 +151,8 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: SP definition accepted with m>60 in DECIMAL(m,n)
@@ -159,19 +161,13 @@ BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
-ERROR 42000: Too big precision 256 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(66, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
-ERROR 42000: Too big precision 66 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(60, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
@@ -179,56 +175,51 @@ SELECT @v1;
 END//
 CALL sp1( 17976931340000 );
 @v1
-17976931340000.000000000000000000000000000000
+17976931340000
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 set("value1", "value1") ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
 CALL sp1( "value1, value1" );
 f1
-value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
-Warning	1265	Data truncated for column 'f1' at row 1
+value1, value1
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) language sql SELECT f1;
 CALL sp1( 'abc' );
@@ -278,9 +269,7 @@ SHOW PROCEDURE status like 'sp1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
 DROP PROCEDURE sp1;
 
 Testcase 4.1.2:
@@ -344,13 +333,11 @@ CREATE FUNCTION fn1( f1 enum("value1", "value1") ) returns decimal(63, 30)  lang
   BEGIN
 return f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SELECT fn1( "value1" );
 fn1( "value1" )
-1.000000000000000000000000000000
+0.000000000000000000000000000000
 Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
+Warning	1292	Truncated incorrect DECIMAL value: 'value1'
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -359,14 +346,11 @@ CREATE FUNCTION fn1( f1 set("value1", "value1") ) returns decimal(63, 30) langua
   BEGIN
 return f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
 SELECT fn1( "value1, value1" );
 fn1( "value1, value1" )
-1.000000000000000000000000000000
+0.000000000000000000000000000000
 Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
-Warning	1265	Data truncated for column 'f1' at row 1
+Warning	1292	Truncated incorrect DECIMAL value: 'value1, value1'
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -457,7 +441,7 @@ CREATE PROCEDURE sp1 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(f1 char(20) )
+sp1		CREATE PROCEDURE `sp1`(f1 char(20) )
 SELECT * from t1 where f2 = f1
 DROP PROCEDURE sp1;
 
@@ -470,7 +454,7 @@ CREATE FUNCTION fn1 (s char(20)) returns char(50)
 return concat('hello, ', s, '!');
 show CREATE FUNCTION fn1;
 Function	sql_mode	Create Function
-fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(s char(20)) RETURNS char(50)
+fn1		CREATE FUNCTION `fn1`(s char(20)) RETURNS char(50)
 return concat('hello, ', s, '!')
 DROP FUNCTION fn1;
 
@@ -514,7 +498,7 @@ CREATE PROCEDURE sp7b (a char (20), out b char(20))
 SELECT f1 into b from t1 where t1.f2= a;
 CALL sp7b('xyz', @out_param);
 Warnings:
-Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data to FETCH
 SELECT @out_param;
 @out_param
 NULL
@@ -527,8 +511,8 @@ END//
 set @c=1;
 CALL sp7c('xyz', @out_param, @c);
 Warnings:
-Warning	1329	No data - zero rows fetched, selected, or processed
-Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data to FETCH
+Warning	1329	No data to FETCH
 SELECT @out_param;
 @out_param
 NULL
@@ -2581,12 +2565,12 @@ alter procedure sp1 sql security definer;
 alter function sp1 sql security definer;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
+sp1		CREATE PROCEDURE `sp1`()
     COMMENT 'this is a procedure'
 set @x= 3
 show CREATE FUNCTION sp1;
 Function	sql_mode	Create Function
-sp1		CREATE DEFINER=`root`@`localhost` FUNCTION `sp1`() RETURNS int(11)
+sp1		CREATE FUNCTION `sp1`() RETURNS int(11)
     COMMENT 'this is a function'
 return 4
 USE db_storedproc;
@@ -4603,9 +4587,6 @@ END begin_label//
 CALL sp1();
 @v1	@v2
 1	2
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
-Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.7:
@@ -4640,9 +4621,6 @@ declare y char;
 SELECT f1, f2 into x, y from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
-Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.9:
@@ -4725,9 +4703,9 @@ fetch cur1 into e;
 SELECT x, y, z, a, b, c, d, e;
 close cur1;
 END//
-ERROR 42000: Too big scale 255 specified for column ''. Maximum is 30.
 CALL sp6();
-ERROR 42000: PROCEDURE db_storedproc.sp6 does not exist
+x	y	z	a	b	c	d	e
+a	1	1.1	value1	1200000000000	mediumtext	2005-02-02 12:12:12	a`
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( )
 BEGIN
@@ -4759,7 +4737,7 @@ BEGIN
 declare x char, integer default '0';
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0';
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -4768,7 +4746,7 @@ BEGIN
 declare x1, x2 char, integer default '0', 1;
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0', 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0', 1;
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -6010,11 +5988,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-000	000	000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6023,7 +5997,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-001	001	001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6050,11 +6024,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000	00000	00000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6063,7 +6033,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00001	00001	00001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6090,11 +6060,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000	00000000	00000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6103,7 +6069,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001	00000001	00000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6130,11 +6096,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6143,7 +6105,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000001	0000000001	0000000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6161,7 +6123,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-18446744073709551615	18446744073709551615	18446744073709551615
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6170,11 +6132,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000000000000000	00000000000000000000	00000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6183,7 +6141,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000000000000001	00000000000000000001	00000000000000000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6192,11 +6150,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--9999999999	-9999999999	-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6207,11 +6161,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6220,11 +6170,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6235,11 +6181,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6250,11 +6192,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6265,11 +6203,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6280,11 +6214,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6295,11 +6225,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6326,7 +6252,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6335,7 +6261,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6344,7 +6270,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.17549e-38	1.17549e-38	1.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6353,7 +6279,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.17549e-38	1.17549e-38	1.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6362,7 +6288,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-01.17549e-38	01.17549e-38	01.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6371,7 +6297,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-01.17549e-38	01.17549e-38	01.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6407,7 +6333,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-2005-02-02 12:20:12	2005-02-02 12:20:12	2005-02-02 12:20:12
+20050202122012	20050202122012	20050202122012
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -12458,13 +12384,10 @@ set @v2 = y;
 END//
 CALL sp1();
 x	y	@x
-NULL	a	3
-Warnings:
-Warning	1265	Data truncated for column 'y' at row 3
-Warning	1265	Data truncated for column 'y' at row 1
+NULL	abaa	3
 SELECT @v1, @v2;
 @v1	@v2
-4	a
+4	a`
 DROP PROCEDURE sp1;
 
 Testcase 4.2.28:
@@ -12531,7 +12454,7 @@ CALL sp1();
 @xx
 0
 Warnings:
-Warning	1264	Out of range value adjusted for column 'xx' at row 1
+Warning	1292	Truncated incorrect INTEGER value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12558,11 +12481,9 @@ set xx = 'temp';
 set @xx = xx;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'xx' at row 1
 SELECT @xx;
 @xx
-t
+temp
 DROP PROCEDURE sp1;
 
 Testcase 4.2.31 - b:
@@ -12580,7 +12501,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1265	Data truncated for column 'xx' at row 1
+Warning	1292	Truncated incorrect DOUBLE value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12606,9 +12527,7 @@ SELECT xx;
 END//
 CALL sp1();
 xx
-0000-00-00 00:00:00
-Warnings:
-Warning	1264	Out of range value adjusted for column 'xx' at row 1
+asd
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12652,7 +12571,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
+Warning	1292	Truncated incorrect INTEGER value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12683,8 +12602,6 @@ declare x char ascii;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12748,8 +12665,6 @@ declare x binary;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12757,8 +12672,6 @@ declare x tinyint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12766,8 +12679,6 @@ declare x tinyint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12775,8 +12686,6 @@ declare x tinyint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12784,8 +12693,6 @@ declare x tinyint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12793,8 +12700,6 @@ declare x smallint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12802,8 +12707,6 @@ declare x smallint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12811,8 +12714,6 @@ declare x smallint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12820,8 +12721,6 @@ declare x smallint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12829,8 +12728,6 @@ declare x mediumint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12838,8 +12735,6 @@ declare x mediumint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12847,8 +12742,6 @@ declare x mediumint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12856,8 +12749,6 @@ declare x mediumint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12865,8 +12756,6 @@ declare x int;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12874,8 +12763,6 @@ declare x int unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12883,8 +12770,6 @@ declare x int zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12892,8 +12777,6 @@ declare x int unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12901,8 +12784,6 @@ declare x bigint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12910,8 +12791,6 @@ declare x bigint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12919,8 +12798,6 @@ declare x bigint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12928,8 +12805,6 @@ declare x bigint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12938,7 +12813,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12947,7 +12822,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12956,7 +12831,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12965,7 +12840,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12974,7 +12849,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12983,7 +12858,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12992,7 +12867,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13001,7 +12876,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                                           ' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13009,8 +12884,6 @@ declare x real;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13018,8 +12891,6 @@ declare x real unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13027,8 +12898,6 @@ declare x real zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13036,8 +12905,6 @@ declare x real unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13045,8 +12912,6 @@ declare x float;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13054,8 +12919,6 @@ declare x float unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13063,8 +12926,6 @@ declare x float zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13072,8 +12933,6 @@ declare x float unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13081,8 +12940,6 @@ declare x date;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13090,8 +12947,6 @@ declare x time;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13099,8 +12954,6 @@ declare x datetime;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13108,8 +12961,6 @@ declare x timestamp;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13117,8 +12968,6 @@ declare x year;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13126,8 +12975,6 @@ declare x year(3);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13135,8 +12982,6 @@ declare x year(4);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13144,8 +12989,6 @@ declare x enum("1enum", "2enum");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13153,8 +12996,6 @@ declare x set("1set", "2set");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.38:
@@ -13802,7 +13643,7 @@ fetch cur1 into newf1, newf2, newf4, newf3;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data - zero rows fetched, selected, or processed
+ERROR 02000: No data to FETCH
 DROP PROCEDURE sp1;
 
 Testcase 4.2.65:
@@ -13828,7 +13669,7 @@ commit;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data - zero rows fetched, selected, or processed
+ERROR 02000: No data to FETCH
 DROP PROCEDURE sp1;
 
 Testcase 4.2.66:
@@ -15085,7 +14926,7 @@ return f1;
 END//
 SELECT fn2(1.84e+19);
 fn2(1.84e+19)
--46744073709551616
+0
 DROP FUNCTION IF EXISTS fn3;
 CREATE FUNCTION fn3( f1 bigint unsigned zerofill) returns bigint unsigned zerofill
 BEGIN
@@ -15104,8 +14945,6 @@ END//
 SELECT fn4(-9.22e+15);
 fn4(-9.22e+15)
 0
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn5;
 CREATE FUNCTION fn5( f1 decimal) returns decimal
 BEGIN
@@ -15133,10 +14972,6 @@ END//
 SELECT fn7(99999999999);
 fn7(99999999999)
 9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn8;
 CREATE FUNCTION fn8( f1 decimal (0) unsigned zerofill) returns decimal (0) unsigned zerofill
 BEGIN
@@ -15145,9 +14980,7 @@ return f1;
 END//
 SELECT fn8(999999999);
 fn8(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn9;
 CREATE FUNCTION fn9( f1 decimal (0) zerofill) returns decimal (0) zerofill
 BEGIN
@@ -15156,10 +14989,7 @@ return f1;
 END//
 SELECT fn9(-1.00e+09);
 fn9(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn10;
 CREATE FUNCTION fn10( f1 decimal (0, 0)) returns decimal (0, 0)
 BEGIN
@@ -15178,10 +15008,6 @@ END//
 SELECT fn11(99999999999);
 fn11(99999999999)
 9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn12;
 CREATE FUNCTION fn12( f1 decimal (0, 0) unsigned zerofill) returns decimal (0, 0) unsigned zerofill
 BEGIN
@@ -15190,9 +15016,7 @@ return f1;
 END//
 SELECT fn12(999999999);
 fn12(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn13;
 CREATE FUNCTION fn13( f1 decimal (0, 0) zerofill) returns decimal (0, 0) zerofill
 BEGIN
@@ -15201,10 +15025,7 @@ return f1;
 END//
 SELECT fn13(-1.00e+09);
 fn13(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn14;
 CREATE FUNCTION fn14( f1 decimal (63, 30)) returns decimal (63, 30)
 BEGIN
@@ -15240,10 +15061,7 @@ return f1;
 END//
 SELECT fn17(-1.00e+21);
 fn17(-1.00e+21)
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+000000000000000000000000000000000.000000000000000000000000000000
 DROP FUNCTION IF EXISTS fn18_d;
 CREATE FUNCTION fn18_d( f1 decimal (64)) returns decimal (64)
 BEGIN
@@ -15279,10 +15097,7 @@ return f1;
 END//
 SELECT fn21_d_z(1.00e+00);
 fn21_d_z(1.00e+00)
-0000000000000000000000000000000000000000000000000000000000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000000000000000000000000000000000000000000000000000000001
 DROP FUNCTION IF EXISTS fn22;
 CREATE FUNCTION fn22( f1 decimal unsigned) returns decimal unsigned
 BEGIN
@@ -15291,10 +15106,7 @@ return f1;
 END//
 SELECT fn22(1.00e+00);
 fn22(1.00e+00)
-10
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn23;
 CREATE FUNCTION fn23( f1 decimal unsigned zerofill) returns decimal unsigned zerofill
 BEGIN
@@ -15303,10 +15115,7 @@ return f1;
 END//
 SELECT fn23(1.00e+00);
 fn23(1.00e+00)
-0000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000001
 DROP FUNCTION IF EXISTS fn24;
 CREATE FUNCTION fn24( f1 decimal zerofill) returns decimal zerofill
 BEGIN
@@ -15315,10 +15124,7 @@ return f1;
 END//
 SELECT fn24(-1.00e+09);
 fn24(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn25;
 CREATE FUNCTION fn25( f1 double) returns double
 BEGIN
@@ -15336,9 +15142,7 @@ return f1;
 END//
 SELECT fn26(1.00e+00);
 fn26(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn27;
 CREATE FUNCTION fn27( f1 double unsigned zerofill) returns double unsigned zerofill
 BEGIN
@@ -15347,9 +15151,7 @@ return f1;
 END//
 SELECT fn27(1.00e+00);
 fn27(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn28;
 CREATE FUNCTION fn28( f1 double zerofill) returns double zerofill
 BEGIN
@@ -15358,9 +15160,7 @@ return f1;
 END//
 SELECT fn28(1.00e+00);
 fn28(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn29;
 CREATE FUNCTION fn29( f1 float) returns float
 BEGIN
@@ -15378,9 +15178,7 @@ return f1;
 END//
 SELECT fn30(1.00e+00);
 fn30(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn31;
 CREATE FUNCTION fn31( f1 float unsigned zerofill) returns float unsigned zerofill
 BEGIN
@@ -15389,9 +15187,7 @@ return f1;
 END//
 SELECT fn31(1.00e+00);
 fn31(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn32;
 CREATE FUNCTION fn32( f1 float zerofill) returns float zerofill
 BEGIN
@@ -15400,9 +15196,7 @@ return f1;
 END//
 SELECT fn32(1.00e+00);
 fn32(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn33;
 CREATE FUNCTION fn33( f1 float(0)) returns float(0)
 BEGIN
@@ -15420,9 +15214,7 @@ return f1;
 END//
 SELECT fn34(1.00e+00);
 fn34(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn35;
 CREATE FUNCTION fn35( f1 float(0) unsigned zerofill) returns float(0) unsigned zerofill
 BEGIN
@@ -15431,9 +15223,7 @@ return f1;
 END//
 SELECT fn35(1.00e+00);
 fn35(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn36;
 CREATE FUNCTION fn36( f1 float(0) zerofill) returns float(0) zerofill
 BEGIN
@@ -15442,9 +15232,7 @@ return f1;
 END//
 SELECT fn36(1.00e+00);
 fn36(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn37;
 CREATE FUNCTION fn37( f1 float(23)) returns float(23)
 BEGIN
@@ -15462,9 +15250,7 @@ return f1;
 END//
 SELECT fn38(1.00e+00);
 fn38(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn39;
 CREATE FUNCTION fn39( f1 float(23) unsigned zerofill) returns float(23) unsigned zerofill
 BEGIN
@@ -15473,9 +15259,7 @@ return f1;
 END//
 SELECT fn39(1.00e+00);
 fn39(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn40;
 CREATE FUNCTION fn40( f1 float(23) zerofill) returns float(23) zerofill
 BEGIN
@@ -15484,9 +15268,7 @@ return f1;
 END//
 SELECT fn40(1.00e+00);
 fn40(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn41;
 CREATE FUNCTION fn41( f1 float(24)) returns float(24)
 BEGIN
@@ -15504,9 +15286,7 @@ return f1;
 END//
 SELECT fn42(1.00e+00);
 fn42(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn43;
 CREATE FUNCTION fn43( f1 float(24) unsigned zerofill) returns float(24) unsigned zerofill
 BEGIN
@@ -15515,9 +15295,7 @@ return f1;
 END//
 SELECT fn43(1.00e+00);
 fn43(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn44;
 CREATE FUNCTION fn44( f1 float(24) zerofill) returns float(24) zerofill
 BEGIN
@@ -15526,9 +15304,7 @@ return f1;
 END//
 SELECT fn44(1.00e+00);
 fn44(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn45;
 CREATE FUNCTION fn45( f1 float(53)) returns float(53)
 BEGIN
@@ -15546,9 +15322,7 @@ return f1;
 END//
 SELECT fn46(1.00e+00);
 fn46(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn47;
 CREATE FUNCTION fn47( f1 float(53) unsigned zerofill) returns float(53) unsigned zerofill
 BEGIN
@@ -15557,9 +15331,7 @@ return f1;
 END//
 SELECT fn47(1.00e+00);
 fn47(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn48;
 CREATE FUNCTION fn48( f1 float(53) zerofill) returns float(53) zerofill
 BEGIN
@@ -15568,9 +15340,7 @@ return f1;
 END//
 SELECT fn48(1.00e+00);
 fn48(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn49;
 CREATE FUNCTION fn49( f1 int) returns int
 BEGIN
@@ -15579,10 +15349,7 @@ return f1;
 END//
 SELECT fn49(-2.15e+09);
 fn49(-2.15e+09)
--2147483638
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-2147483648
 DROP FUNCTION IF EXISTS fn50;
 CREATE FUNCTION fn50( f1 int unsigned) returns int unsigned
 BEGIN
@@ -15618,9 +15385,7 @@ return f1;
 END//
 SELECT fn53(-8388600);
 fn53(-8388600)
--8388598
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388600
 DROP FUNCTION IF EXISTS fn54;
 CREATE FUNCTION fn54( f1 mediumint unsigned) returns mediumint unsigned
 BEGIN
@@ -15647,11 +15412,7 @@ return f1;
 END//
 SELECT fn56(-8388601);
 fn56(-8388601)
-16777215
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn57;
 CREATE FUNCTION fn57( f1 numeric) returns numeric
 BEGIN
@@ -15660,9 +15421,7 @@ return f1;
 END//
 SELECT fn57(-999999999);
 fn57(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn58;
 CREATE FUNCTION fn58( f1 numeric (0)) returns numeric (0)
 BEGIN
@@ -15671,9 +15430,7 @@ return f1;
 END//
 SELECT fn58(-999999999);
 fn58(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn59;
 CREATE FUNCTION fn59( f1 numeric (0) unsigned) returns numeric (0) unsigned
 BEGIN
@@ -15683,9 +15440,6 @@ END//
 SELECT fn59(9999999999);
 fn59(9999999999)
 9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn60;
 CREATE FUNCTION fn60( f1 numeric (0) unsigned zerofill) returns numeric (0) unsigned zerofill
 BEGIN
@@ -15694,9 +15448,7 @@ return f1;
 END//
 SELECT fn60(99999999);
 fn60(99999999)
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0099999999
 DROP FUNCTION IF EXISTS fn61;
 CREATE FUNCTION fn61( f1 numeric (0) zerofill) returns numeric (0) zerofill
 BEGIN
@@ -15705,10 +15457,7 @@ return f1;
 END//
 SELECT fn61(-99999999);
 fn61(-99999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn62;
 CREATE FUNCTION fn62( f1 numeric (0, 0)) returns numeric (0, 0)
 BEGIN
@@ -15717,9 +15466,7 @@ return f1;
 END//
 SELECT fn62(-999999999);
 fn62(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn63;
 CREATE FUNCTION fn63( f1 numeric (0, 0) unsigned) returns numeric (0, 0) unsigned
 BEGIN
@@ -15729,9 +15476,6 @@ END//
 SELECT fn63(9999999999);
 fn63(9999999999)
 9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn64;
 CREATE FUNCTION fn64( f1 numeric (0, 0) unsigned zerofill) returns numeric (0, 0) unsigned zerofill
 BEGIN
@@ -15740,9 +15484,7 @@ return f1;
 END//
 SELECT fn64(99999999);
 fn64(99999999)
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0099999999
 DROP FUNCTION IF EXISTS fn65;
 CREATE FUNCTION fn65( f1 numeric (0, 0) zerofill) returns numeric (0, 0) zerofill
 BEGIN
@@ -15751,10 +15493,7 @@ return f1;
 END//
 SELECT fn65(-99999999);
 fn65(-99999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn66;
 CREATE FUNCTION fn66( f1 numeric (63, 30)) returns numeric (63, 30)
 BEGIN
@@ -15763,12 +15502,7 @@ return f1;
 END//
 SELECT fn66(-1e+36);
 fn66(-1e+36)
--999999999999999999999999999999989.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-999999999999999999999999999999999.999999999999999999999999999999
 DROP FUNCTION IF EXISTS fn67;
 CREATE FUNCTION fn67( f1 numeric (63, 30) unsigned) returns numeric (63, 30) unsigned
 BEGIN
@@ -15778,10 +15512,6 @@ END//
 SELECT fn67(1e+36);
 fn67(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn68;
 CREATE FUNCTION fn68( f1 numeric (63, 30) unsigned zerofill) returns numeric (63, 30) unsigned zerofill
 BEGIN
@@ -15791,10 +15521,6 @@ END//
 SELECT fn68(1e+36);
 fn68(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn69;
 CREATE FUNCTION fn69( f1 numeric (63, 30) zerofill) returns numeric (63, 30) zerofill
 BEGIN
@@ -15803,10 +15529,7 @@ return f1;
 END//
 SELECT fn69(-1e+36);
 fn69(-1e+36)
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+000000000000000000000000000000000.000000000000000000000000000000
 DROP FUNCTION IF EXISTS fn70_n;
 CREATE FUNCTION fn70_n( f1 numeric (64)) returns numeric (64)
 BEGIN
@@ -15854,9 +15577,7 @@ return f1;
 END//
 SELECT fn74(999999999);
 fn74(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999
 DROP FUNCTION IF EXISTS fn75;
 CREATE FUNCTION fn75( f1 numeric unsigned zerofill) returns numeric unsigned zerofill
 BEGIN
@@ -15865,9 +15586,7 @@ return f1;
 END//
 SELECT fn75(999999999);
 fn75(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn76;
 CREATE FUNCTION fn76( f1 numeric zerofill) returns numeric zerofill
 BEGIN
@@ -15876,10 +15595,7 @@ return f1;
 END//
 SELECT fn76(-999999999);
 fn76(-999999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn77;
 CREATE FUNCTION fn77( f1 real) returns real
 BEGIN
@@ -15897,9 +15613,7 @@ return f1;
 END//
 SELECT fn78(1.1);
 fn78(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn79;
 CREATE FUNCTION fn79( f1 real unsigned zerofill) returns real unsigned zerofill
 BEGIN
@@ -15908,9 +15622,7 @@ return f1;
 END//
 SELECT fn79(1.1);
 fn79(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn80;
 CREATE FUNCTION fn80( f1 real zerofill) returns real zerofill
 BEGIN
@@ -15919,9 +15631,7 @@ return f1;
 END//
 SELECT fn80(1.1);
 fn80(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn81;
 CREATE FUNCTION fn81( f1 smallint) returns smallint
 BEGIN
@@ -15957,11 +15667,7 @@ return f1;
 END//
 SELECT fn84(-32601);
 fn84(-32601)
-65535
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn85;
 CREATE FUNCTION fn85( f1 tinyint) returns tinyint
 BEGIN
@@ -15997,11 +15703,7 @@ return f1;
 END//
 SELECT fn88(-101);
 fn88(-101)
-255
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn89;
 CREATE FUNCTION fn89( f1 enum('1enum', '2enum')) returns enum('1enum', '2enum')
 BEGIN
@@ -16057,7 +15759,7 @@ return f1;
 END//
 SELECT fn92( '23:59:59.999999');
 fn92( '23:59:59.999999')
-25:59:59
+26:00:00
 DROP FUNCTION IF EXISTS fn93;
 CREATE FUNCTION fn93( f1 datetime) returns datetime
 BEGIN
@@ -16066,7 +15768,7 @@ return f1;
 END//
 SELECT fn93('1997-12-31 23:59:59.999999');
 fn93('1997-12-31 23:59:59.999999')
-1998-01-02 01:01:00
+1998-01-02 01:01:01
 DROP FUNCTION IF EXISTS fn94;
 CREATE FUNCTION fn94( f1 char) returns char
 BEGIN
@@ -16076,8 +15778,6 @@ END//
 SELECT fn94( 'h');
 fn94( 'h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn95;
 CREATE FUNCTION fn95( f1 char ascii) returns char ascii
 BEGIN
@@ -16087,8 +15787,6 @@ END//
 SELECT fn95('h');
 fn95('h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn96;
 CREATE FUNCTION fn96( f1 char binary) returns char binary
 BEGIN
@@ -16098,8 +15796,6 @@ END//
 SELECT fn96( 'h');
 fn96( 'h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn97;
 CREATE FUNCTION fn97( f1 longtext) returns longtext
 BEGIN
@@ -16221,7 +15917,7 @@ SELECT f1;
 END//
 CALL sp2(1.84e+19);
 f1
-18400000000000000000
+-9223372036854775808
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( f1 bigint unsigned zerofill)
 BEGIN
@@ -16230,7 +15926,7 @@ SELECT f1;
 END//
 CALL sp3(1.84e+17);
 f1
-00184000000000000000
+184000000000000000
 DROP PROCEDURE IF EXISTS sp4;
 CREATE PROCEDURE sp4( f1 bigint zerofill)
 BEGIN
@@ -16239,9 +15935,7 @@ SELECT f1;
 END//
 CALL sp4(-9.22e+15);
 f1
-00000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-9220000000000000
 DROP PROCEDURE IF EXISTS sp5;
 CREATE PROCEDURE sp5( f1 decimal)
 BEGIN
@@ -16253,7 +15947,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: default (10) for DECIMAL not checked, decimal digits shown although not defined
 CALL sp5(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( f1 decimal (0))
 BEGIN
@@ -16265,7 +15959,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp6(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp7;
 CREATE PROCEDURE sp7( f1 decimal (0) unsigned)
 BEGIN
@@ -16274,11 +15968,7 @@ SELECT f1;
 END//
 CALL sp7(99999999999);
 f1
-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+99999999999.000000000
 DROP PROCEDURE IF EXISTS sp8;
 CREATE PROCEDURE sp8( f1 decimal (0) unsigned zerofill)
 BEGIN
@@ -16287,9 +15977,7 @@ SELECT f1;
 END//
 CALL sp8(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp9;
 CREATE PROCEDURE sp9( f1 decimal (0) zerofill)
 BEGIN
@@ -16301,10 +15989,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp9(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp10;
 CREATE PROCEDURE sp10( f1 decimal (0, 0))
 BEGIN
@@ -16316,7 +16001,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp10(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp11;
 CREATE PROCEDURE sp11( f1 decimal (0, 0) unsigned)
 BEGIN
@@ -16328,11 +16013,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp11(99999999999);
 f1
-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+99999999999.000000000
 DROP PROCEDURE IF EXISTS sp12;
 CREATE PROCEDURE sp12( f1 decimal (0, 0) unsigned zerofill)
 BEGIN
@@ -16344,9 +16025,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp12(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp13;
 CREATE PROCEDURE sp13( f1 decimal (0, 0) zerofill)
 BEGIN
@@ -16358,10 +16037,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp13(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp14;
 CREATE PROCEDURE sp14( f1 decimal (63, 30))
 BEGIN
@@ -16373,7 +16049,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp14(-1.00e+21);
 f1
--1000000000000000000000.000000000000000000000000000000
+-1000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp15;
 CREATE PROCEDURE sp15( f1 decimal (63, 30) unsigned)
 BEGIN
@@ -16385,7 +16061,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp15(1.00e+16);
 f1
-10000000000000000.000000000000000000000000000000
+10000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp16;
 CREATE PROCEDURE sp16( f1 decimal (63, 30) unsigned zerofill)
 BEGIN
@@ -16397,7 +16073,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp16(1.00e+16);
 f1
-000000000000000010000000000000000.000000000000000000000000000000
+10000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp17;
 CREATE PROCEDURE sp17( f1 decimal (63, 30) zerofill)
 BEGIN
@@ -16409,10 +16085,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp17(-1.00e+21);
 f1
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp18_d;
 CREATE PROCEDURE sp18_d( f1 decimal (64))
 BEGIN
@@ -16421,7 +16094,7 @@ SELECT f1;
 END//
 CALL sp18_d( -1000000000000000000000000000000 );
 f1
--1000000000000000000000000000000
+-1000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp19_du;
 CREATE PROCEDURE sp19_du( f1 decimal (64) unsigned)
 BEGIN
@@ -16430,10 +16103,10 @@ SELECT f1;
 END//
 CALL sp19_du( 100000000000000000000 );
 f1
-100000000000000000000
+100000000000000000000.000000000
 CALL sp19_du( 1000000000000000000000000 );
 f1
-1000000000000000000000000
+1000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp20_duz;
 CREATE PROCEDURE sp20_duz( f1 decimal (64) unsigned zerofill)
 BEGIN
@@ -16445,10 +16118,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp20_duz( 100000000000000000000 );
 f1
-0000000000000000000000000000000000000000000100000000000000000000
+100000000000000000000.000000000
 CALL sp20_duz( 1000000000000000000000000 );
 f1
-0000000000000000000000000000000000000001000000000000000000000000
+1000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp21;
 CREATE PROCEDURE sp21( f1 decimal (64) zerofill)
 BEGIN
@@ -16460,10 +16133,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp21(1.00e+00);
 f1
-0000000000000000000000000000000000000000000000000000000000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp22;
 CREATE PROCEDURE sp22( f1 decimal unsigned)
 BEGIN
@@ -16475,10 +16145,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp22(1.00e+00);
 f1
-10
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp23;
 CREATE PROCEDURE sp23( f1 decimal unsigned zerofill)
 BEGIN
@@ -16490,10 +16157,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp23(1.00e+00);
 f1
-0000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp24;
 CREATE PROCEDURE sp24( f1 decimal zerofill)
 BEGIN
@@ -16505,10 +16169,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp24(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp25;
 CREATE PROCEDURE sp25( f1 double)
 BEGIN
@@ -16526,9 +16187,7 @@ SELECT f1;
 END//
 CALL sp26(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp27;
 CREATE PROCEDURE sp27( f1 double unsigned zerofill)
 BEGIN
@@ -16537,9 +16196,7 @@ SELECT f1;
 END//
 CALL sp27(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp28;
 CREATE PROCEDURE sp28( f1 double zerofill)
 BEGIN
@@ -16548,9 +16205,7 @@ SELECT f1;
 END//
 CALL sp28(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp29;
 CREATE PROCEDURE sp29( f1 float)
 BEGIN
@@ -16568,9 +16223,7 @@ SELECT f1;
 END//
 CALL sp30(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp31;
 CREATE PROCEDURE sp31( f1 float unsigned zerofill)
 BEGIN
@@ -16579,9 +16232,7 @@ SELECT f1;
 END//
 CALL sp31(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp32;
 CREATE PROCEDURE sp32( f1 float zerofill)
 BEGIN
@@ -16590,9 +16241,7 @@ SELECT f1;
 END//
 CALL sp32(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp33;
 CREATE PROCEDURE sp33( f1 float(0))
 BEGIN
@@ -16610,9 +16259,7 @@ SELECT f1;
 END//
 CALL sp34(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp35;
 CREATE PROCEDURE sp35( f1 float(0) unsigned zerofill)
 BEGIN
@@ -16621,9 +16268,7 @@ SELECT f1;
 END//
 CALL sp35(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp36;
 CREATE PROCEDURE sp36( f1 float(0) zerofill)
 BEGIN
@@ -16632,9 +16277,7 @@ SELECT f1;
 END//
 CALL sp36(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp37;
 CREATE PROCEDURE sp37( f1 float(23))
 BEGIN
@@ -16652,9 +16295,7 @@ SELECT f1;
 END//
 CALL sp38(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp39;
 CREATE PROCEDURE sp39( f1 float(23) unsigned zerofill)
 BEGIN
@@ -16663,9 +16304,7 @@ SELECT f1;
 END//
 CALL sp39(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp40;
 CREATE PROCEDURE sp40( f1 float(23) zerofill)
 BEGIN
@@ -16674,9 +16313,7 @@ SELECT f1;
 END//
 CALL sp40(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp41;
 CREATE PROCEDURE sp41( f1 float(24))
 BEGIN
@@ -16694,9 +16331,7 @@ SELECT f1;
 END//
 CALL sp42(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp43;
 CREATE PROCEDURE sp43( f1 float(24) unsigned zerofill)
 BEGIN
@@ -16705,9 +16340,7 @@ SELECT f1;
 END//
 CALL sp43(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp44;
 CREATE PROCEDURE sp44( f1 float(24) zerofill)
 BEGIN
@@ -16716,9 +16349,7 @@ SELECT f1;
 END//
 CALL sp44(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp45;
 CREATE PROCEDURE sp45( f1 float(53))
 BEGIN
@@ -16736,9 +16367,7 @@ SELECT f1;
 END//
 CALL sp46(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp47;
 CREATE PROCEDURE sp47( f1 float(53) unsigned zerofill)
 BEGIN
@@ -16747,9 +16376,7 @@ SELECT f1;
 END//
 CALL sp47(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp48;
 CREATE PROCEDURE sp48( f1 float(53) zerofill)
 BEGIN
@@ -16758,9 +16385,7 @@ SELECT f1;
 END//
 CALL sp48(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp49;
 CREATE PROCEDURE sp49( f1 int)
 BEGIN
@@ -16769,10 +16394,7 @@ SELECT f1;
 END//
 CALL sp49(-2.15e+09);
 f1
--2147483638
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-2150000000
 DROP PROCEDURE IF EXISTS sp50;
 CREATE PROCEDURE sp50( f1 int unsigned)
 BEGIN
@@ -16799,7 +16421,7 @@ SELECT f1;
 END//
 CALL sp52(2.15e+08);
 f1
-0215000000
+215000000
 DROP PROCEDURE IF EXISTS sp53;
 CREATE PROCEDURE sp53( f1 mediumint)
 BEGIN
@@ -16808,9 +16430,7 @@ SELECT f1;
 END//
 CALL sp53(-8388600);
 f1
--8388598
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388600
 DROP PROCEDURE IF EXISTS sp54;
 CREATE PROCEDURE sp54( f1 mediumint unsigned)
 BEGIN
@@ -16837,11 +16457,7 @@ SELECT f1;
 END//
 CALL sp56(-8388601);
 f1
-16777215
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388602
 DROP PROCEDURE IF EXISTS sp57;
 CREATE PROCEDURE sp57( f1 numeric)
 BEGIN
@@ -16850,9 +16466,7 @@ SELECT f1;
 END//
 CALL sp57(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp58;
 CREATE PROCEDURE sp58( f1 numeric (0))
 BEGIN
@@ -16861,9 +16475,7 @@ SELECT f1;
 END//
 CALL sp58(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp59;
 CREATE PROCEDURE sp59( f1 numeric (0) unsigned)
 BEGIN
@@ -16872,10 +16484,7 @@ SELECT f1;
 END//
 CALL sp59(9999999999);
 f1
-9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+9999999999.000000000
 DROP PROCEDURE IF EXISTS sp60;
 CREATE PROCEDURE sp60( f1 numeric (0) unsigned zerofill)
 BEGIN
@@ -16884,9 +16493,7 @@ SELECT f1;
 END//
 CALL sp60(99999999);
 f1
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+99999999.000000000
 DROP PROCEDURE IF EXISTS sp61;
 CREATE PROCEDURE sp61( f1 numeric (0) zerofill)
 BEGIN
@@ -16895,10 +16502,7 @@ SELECT f1;
 END//
 CALL sp61(-99999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-99999999.000000000
 DROP PROCEDURE IF EXISTS sp62;
 CREATE PROCEDURE sp62( f1 numeric (0, 0))
 BEGIN
@@ -16907,9 +16511,7 @@ SELECT f1;
 END//
 CALL sp62(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp63;
 CREATE PROCEDURE sp63( f1 numeric (0, 0) unsigned)
 BEGIN
@@ -16918,10 +16520,7 @@ SELECT f1;
 END//
 CALL sp63(9999999999);
 f1
-9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+9999999999.000000000
 DROP PROCEDURE IF EXISTS sp64;
 CREATE PROCEDURE sp64( f1 numeric (0, 0) unsigned zerofill)
 BEGIN
@@ -16930,9 +16529,7 @@ SELECT f1;
 END//
 CALL sp64(99999999);
 f1
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+99999999.000000000
 DROP PROCEDURE IF EXISTS sp65;
 CREATE PROCEDURE sp65( f1 numeric (0, 0) zerofill)
 BEGIN
@@ -16941,10 +16538,7 @@ SELECT f1;
 END//
 CALL sp65(-99999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-99999999.000000000
 DROP PROCEDURE IF EXISTS sp66_n;
 CREATE PROCEDURE sp66_n( f1 numeric (63, 30))
 BEGIN
@@ -16953,12 +16547,7 @@ SELECT f1;
 END//
 CALL sp66_n( -1000000000000000000000000000000000000 );
 f1
--999999999999999999999999999999989.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp67_nu;
 CREATE PROCEDURE sp67_nu( f1 numeric (63, 30) unsigned)
 BEGIN
@@ -16967,11 +16556,7 @@ SELECT f1;
 END//
 CALL sp67_nu( 1000000000000000000000000000000000000 );
 f1
-999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp68_nuz;
 CREATE PROCEDURE sp68_nuz( f1 numeric (63, 30) unsigned zerofill)
 BEGIN
@@ -16980,11 +16565,7 @@ SELECT f1;
 END//
 CALL sp68_nuz( 1000000000000000000000000000000000000 );
 f1
-999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp69_n_z;
 CREATE PROCEDURE sp69_n_z( f1 numeric (63, 30) zerofill)
 BEGIN
@@ -16993,10 +16574,7 @@ SELECT f1;
 END//
 CALL sp69_n_z( -1000000000000000000000000000000000000 );
 f1
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp70_n;
 CREATE PROCEDURE sp70_n( f1 numeric (64))
 BEGIN
@@ -17005,7 +16583,7 @@ SELECT f1;
 END//
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
--10000000000000000000000000000000000000000
+-10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp71_nu;
 CREATE PROCEDURE sp71_nu( f1 numeric (64) unsigned)
 BEGIN
@@ -17014,7 +16592,7 @@ SELECT f1;
 END//
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp72_nuz;
 CREATE PROCEDURE sp72_nuz( f1 numeric (64) unsigned zerofill)
 BEGIN
@@ -17023,7 +16601,7 @@ SELECT f1;
 END//
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
-0000000000000000000000010000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp73_n_z;
 CREATE PROCEDURE sp73_n_z( f1 numeric (64) zerofill)
 BEGIN
@@ -17032,7 +16610,7 @@ SELECT f1;
 END//
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
-0000000000000000000000010000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp74;
 CREATE PROCEDURE sp74( f1 numeric unsigned)
 BEGIN
@@ -17041,9 +16619,7 @@ SELECT f1;
 END//
 CALL sp74(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp75;
 CREATE PROCEDURE sp75( f1 numeric unsigned zerofill)
 BEGIN
@@ -17052,9 +16628,7 @@ SELECT f1;
 END//
 CALL sp75(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp76;
 CREATE PROCEDURE sp76( f1 numeric zerofill)
 BEGIN
@@ -17063,10 +16637,7 @@ SELECT f1;
 END//
 CALL sp76(-999999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp77;
 CREATE PROCEDURE sp77( f1 real)
 BEGIN
@@ -17075,7 +16646,7 @@ SELECT f1;
 END//
 CALL sp77(1.1);
 f1
-1.1
+1.10000
 DROP PROCEDURE IF EXISTS sp78;
 CREATE PROCEDURE sp78( f1 real unsigned)
 BEGIN
@@ -17084,9 +16655,7 @@ SELECT f1;
 END//
 CALL sp78(1.1);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp79;
 CREATE PROCEDURE sp79( f1 real unsigned zerofill)
 BEGIN
@@ -17095,9 +16664,7 @@ SELECT f1;
 END//
 CALL sp79(1.1);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp80;
 CREATE PROCEDURE sp80( f1 real zerofill)
 BEGIN
@@ -17106,9 +16673,7 @@ SELECT f1;
 END//
 CALL sp80(1.1);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp81;
 CREATE PROCEDURE sp81( f1 smallint)
 BEGIN
@@ -17144,11 +16709,7 @@ SELECT f1;
 END//
 CALL sp84(-32601);
 f1
-65535
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-32602
 DROP PROCEDURE IF EXISTS sp85;
 CREATE PROCEDURE sp85( f1 tinyint)
 BEGIN
@@ -17184,11 +16745,7 @@ SELECT f1;
 END//
 CALL sp88(-101);
 f1
-255
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-102
 DROP PROCEDURE IF EXISTS sp89;
 DROP PROCEDURE IF EXISTS sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -17208,7 +16765,7 @@ SELECT f1;
 END//
 CALL sp92( '23:59:59.999999');
 f1
-25:59:59
+26:00:00.999997
 DROP PROCEDURE IF EXISTS sp93;
 CREATE PROCEDURE sp93( f1 datetime)
 BEGIN
@@ -17217,7 +16774,7 @@ SELECT f1;
 END//
 CALL sp93('1997-12-31 23:59:59.999999');
 f1
-1998-01-02 01:01:00
+1998-01-02 01:01:01.000001
 DROP PROCEDURE IF EXISTS sp94;
 CREATE PROCEDURE sp94( f1 char)
 BEGIN
@@ -17226,9 +16783,7 @@ SELECT f1;
 END//
 CALL sp94( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp95;
 CREATE PROCEDURE sp95( f1 char ascii)
 BEGIN
@@ -17237,9 +16792,7 @@ SELECT f1;
 END//
 CALL sp95( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp96;
 CREATE PROCEDURE sp96( f1 char binary)
 BEGIN
@@ -17248,9 +16801,7 @@ SELECT f1;
 END//
 CALL sp96( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp97;
 CREATE PROCEDURE sp97( f1 longtext)
 BEGIN
@@ -17295,7 +16846,7 @@ SELECT f1;
 END//
 CALL sp101(51);
 f1
-2061
+61
 DROP PROCEDURE IF EXISTS sp102;
 CREATE PROCEDURE sp102( f1 year(4))
 BEGIN
@@ -17350,8 +16901,6 @@ END//
 CALL sp107(2.00e+13);
 f1
 returned
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 USE db_storedproc;
 DROP DATABASE db1;
 DROP DATABASE IF EXISTS db1;
@@ -17388,9 +16937,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute01();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-2061	2061	2071	2061	2061	2071	2033	2033	2084	2033	2033	2084
+61	61	71	61	61	71	2033	2033	2084	2033	2033	2084
 var1	var2	var3	var4	var5	var6	var7	var8
-2061	2071	2061	2071	2033	2084	2033	2084
+61	71	61	71	2033	2084	2033	2084
 DROP PROCEDURE spexecute01;
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp2;
@@ -17461,9 +17010,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute03();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
+ah	ah	aah	ah	ah	aah	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	helloworld	NULL	helloworld	hellohelloworld
+ah	aah	ah	aah	helloworld	NULL	helloworld	hellohelloworld
 DROP PROCEDURE spexecute03;
 DROP PROCEDURE sp3;
 DROP PROCEDURE IF EXISTS sp4;
@@ -17606,7 +17155,7 @@ SELECT var7, var8;
 END//
 CALL spexecute07();
 var1	var2
-18400000000000000000	NULL
+9223372036854775807	NULL
 var3	var4
 -9220000000000000000	NULL
 var5	var6
@@ -17614,7 +17163,7 @@ var5	var6
 var7	var8
 -9220000000000000000	NULL
 f1	f2	f3
-18400000000000000000	18400000000000000000	NULL
+9223372036854775807	9223372036854775807	NULL
 f4	f5	f6
 -9220000000000000000	-9220000000000000000	NULL
 f7	f8	f9
@@ -17622,7 +17171,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	-9220000000000000000	NULL
 f1	f2	f3
-18353255926290448384	18353255926290448384	18353255926290448384
+-2	-2	-2
 f4	f5	f6
 -9220000000000000000	6744073709551616	6744073709551616
 f7	f8	f9
@@ -17630,7 +17179,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	6744073709551616	6744073709551616
 var1	var2
-18353255926290448384	18353255926290448384
+-2	-2
 var3	var4
 6744073709551616	6744073709551616
 var5	var6
@@ -17688,9 +17237,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute08();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-00368000000000000000	00368000000000000000	00368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+368000000000000000	368000000000000000	368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-00368000000000000000	00368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+368000000000000000	368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute08;
 DROP PROCEDURE sp8;
 DROP PROCEDURE IF EXISTS sp9;
@@ -17742,9 +17291,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute09();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-00000000000000000000	00000000000000000000	00000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-18440000000000000	-18440000000000000	-18439999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-00000000000000000000	00000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-18440000000000000	-18439999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute09;
 DROP PROCEDURE sp9;
 DROP PROCEDURE IF EXISTS sp10;
@@ -17788,9 +17337,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute10();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute10;
 DROP PROCEDURE sp10;
 DROP PROCEDURE IF EXISTS sp11;
@@ -17823,9 +17372,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute11();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000.000000000	1000000000.000000000	1000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000.000000000	1000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute11;
 DROP PROCEDURE sp11;
 DROP PROCEDURE IF EXISTS sp12;
@@ -17858,9 +17407,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute12();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999999.000000000	99999999999.000000000	100000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999999.000000000	100000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute12;
 DROP PROCEDURE sp12;
 DROP PROCEDURE IF EXISTS sp13;
@@ -17893,9 +17442,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute13();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute13;
 DROP PROCEDURE sp13;
 DROP PROCEDURE IF EXISTS sp14;
@@ -17928,9 +17477,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute14();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000000000000000000000000	-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute14;
 DROP PROCEDURE sp14;
 DROP PROCEDURE IF EXISTS sp15;
@@ -17996,9 +17545,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute16();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute16;
 DROP PROCEDURE sp16;
 DROP PROCEDURE IF EXISTS sp17;
@@ -18030,9 +17579,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute17();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute17;
 DROP PROCEDURE sp17;
 DROP PROCEDURE IF EXISTS sp18;
@@ -18064,9 +17613,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute18();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute18;
 DROP PROCEDURE sp18;
 DROP PROCEDURE IF EXISTS sp19;
@@ -18098,9 +17647,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute19();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute19;
 DROP PROCEDURE sp19;
 DROP PROCEDURE IF EXISTS sp20;
@@ -18132,9 +17681,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute20();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute20;
 DROP PROCEDURE sp20;
 DROP PROCEDURE IF EXISTS sp21;
@@ -18166,9 +17715,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute21();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute21;
 DROP PROCEDURE sp21;
 DROP PROCEDURE IF EXISTS sp22;
@@ -18234,9 +17783,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute23();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute23;
 DROP PROCEDURE sp23;
 DROP PROCEDURE IF EXISTS sp24;
@@ -18268,9 +17817,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute24();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.1	1.1	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.1	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute24;
 DROP PROCEDURE sp24;
 DROP PROCEDURE IF EXISTS sp25;
@@ -18302,9 +17851,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute25();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--32758	-32758	-32748	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-65402	-65402	-65392	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--32758	-32748	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-65402	-65392	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute25;
 DROP PROCEDURE sp25;
 DROP PROCEDURE IF EXISTS sp26;
@@ -18370,9 +17919,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute27();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-25:59:59	25:59:59	27:59:59	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+26:00:00.999997	26:00:00.999997	28:00:01.999995	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-25:59:59	27:59:59	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+26:00:00.999997	28:00:01.999995	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute27;
 DROP PROCEDURE sp27;
 DROP PROCEDURE IF EXISTS sp28;
@@ -18404,9 +17953,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute28();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1998-01-02 01:01:00	1998-01-02 01:01:00	1998-01-03 02:02:01	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1998-01-02 01:01:01.000001	1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1998-01-02 01:01:00	1998-01-03 02:02:01	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute28;
 DROP PROCEDURE sp28;
 DROP PROCEDURE IF EXISTS sp29;
@@ -18438,9 +17987,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute29();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute29;
 DROP PROCEDURE sp29;
 DROP PROCEDURE IF EXISTS sp30;
@@ -18472,9 +18021,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute30();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute30;
 DROP PROCEDURE sp30;
 DROP PROCEDURE IF EXISTS sp31;
@@ -18540,9 +18089,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute32();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute32;
 DROP PROCEDURE sp32;
 DROP PROCEDURE IF EXISTS sp33;
@@ -18574,9 +18123,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute33();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute33;
 DROP PROCEDURE sp33;
 DROP PROCEDURE IF EXISTS sp34;
@@ -18642,9 +18191,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute35();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute35;
 DROP PROCEDURE sp35;
 DROP PROCEDURE IF EXISTS sp36;
@@ -18676,9 +18225,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute36();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute36;
 DROP PROCEDURE sp36;
 DROP PROCEDURE IF EXISTS sp37;
@@ -18744,9 +18293,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute38();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute38;
 DROP PROCEDURE sp38;
 DROP PROCEDURE IF EXISTS sp39;
@@ -18778,9 +18327,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute39();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute39;
 DROP PROCEDURE sp39;
 DROP PROCEDURE IF EXISTS sp40;
@@ -18812,9 +18361,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute40();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute40;
 DROP PROCEDURE sp40;
 DROP PROCEDURE IF EXISTS sp41;
@@ -18846,9 +18395,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute41();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute41;
 DROP PROCEDURE sp41;
 DROP PROCEDURE IF EXISTS sp42;
@@ -18880,9 +18429,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute42();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute42;
 DROP PROCEDURE sp42;
 DROP PROCEDURE IF EXISTS sp43;
@@ -18914,9 +18463,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute43();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute43;
 DROP PROCEDURE sp43;
 DROP PROCEDURE IF EXISTS sp44;
@@ -18948,9 +18497,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute44();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute44;
 DROP PROCEDURE sp44;
 DROP PROCEDURE IF EXISTS sp45;
@@ -18982,9 +18531,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute45();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute45;
 DROP PROCEDURE sp45;
 DROP PROCEDURE IF EXISTS sp46;
@@ -19016,9 +18565,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute46();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute46;
 DROP PROCEDURE sp46;
 DROP PROCEDURE IF EXISTS sp47;
@@ -19050,9 +18599,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute47();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute47;
 DROP PROCEDURE sp47;
 DROP PROCEDURE IF EXISTS sp48;
@@ -19084,9 +18633,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute48();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute48;
 DROP PROCEDURE sp48;
 DROP PROCEDURE IF EXISTS sp49;
@@ -19118,9 +18667,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute49();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute49;
 DROP PROCEDURE sp49;
 DROP PROCEDURE IF EXISTS sp50;
@@ -19152,9 +18701,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute50();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute50;
 DROP PROCEDURE sp50;
 DROP PROCEDURE IF EXISTS sp51;
@@ -19186,9 +18735,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute51();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute51;
 DROP PROCEDURE sp51;
 DROP PROCEDURE IF EXISTS sp52;
@@ -19220,9 +18769,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute52();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000000000000000000000000	-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute52;
 DROP PROCEDURE sp52;
 DROP PROCEDURE IF EXISTS sp53;
@@ -19254,9 +18803,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute53();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute53;
 DROP PROCEDURE sp53;
 DROP PROCEDURE IF EXISTS sp54;
@@ -19288,9 +18837,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute54();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute54;
 DROP PROCEDURE sp54;
 DROP PROCEDURE IF EXISTS sp55;
@@ -19322,9 +18871,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute55();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute55;
 DROP PROCEDURE sp55;
 DROP PROCEDURE IF EXISTS sp56;
@@ -19356,9 +18905,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute56();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-2061	2061	2071	2061	2061	2071	2061	2061	2071	2061	2061	2071
+61	61	71	61	61	71	61	61	71	61	61	71
 var1	var2	var3	var4	var5	var6	var7	var8
-2061	2071	2061	2071	2061	2071	2061	2071
+61	71	61	71	61	71	61	71
 DROP PROCEDURE spexecute56;
 DROP PROCEDURE sp56;
 DROP PROCEDURE IF EXISTS sp57;
@@ -19492,9 +19041,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute60();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	a	a	a	a	a	a
+ah	ah	aah	ah	ah	aah	ah	ah	aah	ah	ah	aah
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	a	a	a	a
+ah	aah	ah	aah	ah	aah	ah	aah
 DROP PROCEDURE spexecute60;
 DROP PROCEDURE sp60;
 DROP PROCEDURE IF EXISTS sp61;
@@ -19526,9 +19075,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute61();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	a	a	NULL	a	a	a
+ah	ah	aah	ah	ah	aah	ah	ah	NULL	ah	ah	aah
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	a	NULL	a	a
+ah	aah	ah	aah	ah	NULL	ah	aah
 DROP PROCEDURE spexecute61;
 DROP PROCEDURE sp61;
 DROP PROCEDURE IF EXISTS sp62;
@@ -19628,9 +19177,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute64();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010
+1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	1000000000	1000000010	1000000000	1000000010	1000000000	1000000010
+1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000
 DROP PROCEDURE spexecute64;
 DROP PROCEDURE sp64;
 DROP PROCEDURE IF EXISTS sp65;
@@ -19662,9 +19211,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute65();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+999999999.000000000	999999999.000000000	1000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+999999999.000000000	1000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute65;
 DROP PROCEDURE sp65;
 DROP PROCEDURE IF EXISTS sp66;
@@ -19696,9 +19245,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute66();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000000000000000000000000	10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute66;
 DROP PROCEDURE sp66;
 DROP PROCEDURE IF EXISTS sp67;
@@ -19730,9 +19279,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute67();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute67;
 DROP PROCEDURE sp67;
 DROP PROCEDURE IF EXISTS sp68;
@@ -19764,9 +19313,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute68();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute68;
 DROP PROCEDURE sp68;
 DROP PROCEDURE IF EXISTS sp69;
@@ -19798,9 +19347,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute69();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute69;
 DROP PROCEDURE sp69;
 DROP PROCEDURE IF EXISTS sp70;
@@ -19832,9 +19381,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute70();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute70;
 DROP PROCEDURE sp70;
 DROP PROCEDURE IF EXISTS sp71;
@@ -19866,9 +19415,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute71();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute71;
 DROP PROCEDURE sp71;
 DROP PROCEDURE IF EXISTS sp72;
@@ -19900,9 +19449,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute72();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute72;
 DROP PROCEDURE sp72;
 DROP PROCEDURE IF EXISTS sp73;
@@ -19934,9 +19483,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute73();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute73;
 DROP PROCEDURE sp73;
 DROP PROCEDURE IF EXISTS sp74;
@@ -19968,9 +19517,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute74();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute74;
 DROP PROCEDURE sp74;
 DROP PROCEDURE IF EXISTS sp75;
@@ -20002,9 +19551,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute75();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute75;
 DROP PROCEDURE sp75;
 DROP PROCEDURE IF EXISTS sp76;
@@ -20036,9 +19585,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute76();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute76;
 DROP PROCEDURE sp76;
 DROP PROCEDURE IF EXISTS sp77;
@@ -20070,9 +19619,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute77();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute77;
 DROP PROCEDURE sp77;
 DROP PROCEDURE IF EXISTS sp78;
@@ -20104,9 +19653,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute78();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute78;
 DROP PROCEDURE sp78;
 DROP PROCEDURE IF EXISTS sp79;
@@ -20138,9 +19687,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute79();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute79;
 DROP PROCEDURE sp79;
 DROP PROCEDURE IF EXISTS sp80;
@@ -20172,9 +19721,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute80();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--2147483638	-2147483638	-2147483628	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-2150000000	-2150000000	-2149999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--2147483638	-2147483628	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-2150000000	-2149999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute80;
 DROP PROCEDURE sp80;
 DROP PROCEDURE IF EXISTS sp81;
@@ -20274,9 +19823,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute83();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0215000000	0215000000	0215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+215000000	215000000	215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0215000000	0215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+215000000	215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute83;
 DROP PROCEDURE sp83;
 DROP PROCEDURE IF EXISTS sp84;
@@ -20308,9 +19857,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute84();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388598	-8388598	-8388588	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388600	-8388600	-8388590	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388598	-8388588	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388600	-8388590	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute84;
 DROP PROCEDURE sp84;
 DROP PROCEDURE IF EXISTS sp85;
@@ -20376,9 +19925,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute86();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777210	16777210	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777210	16777210	16777220	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777210	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777210	16777220	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute86;
 DROP PROCEDURE sp86;
 DROP PROCEDURE IF EXISTS sp87;
@@ -20410,9 +19959,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute87();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777215	16777215	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388602	-8388602	-8388592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777215	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388602	-8388592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute87;
 DROP PROCEDURE sp87;
 DROP PROCEDURE IF EXISTS sp88;
@@ -20444,9 +19993,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute88();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute88;
 DROP PROCEDURE sp88;
 DROP PROCEDURE IF EXISTS sp89;
@@ -20478,9 +20027,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute89();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute89;
 DROP PROCEDURE sp89;
 DROP PROCEDURE IF EXISTS sp90;
@@ -20512,9 +20061,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute90();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000000000000000000000000	10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute90;
 DROP PROCEDURE sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -20546,9 +20095,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute91();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000100000000000000000000.000000000000000000000000000000	000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute91;
 DROP PROCEDURE sp91;
 DROP PROCEDURE IF EXISTS sp92;
@@ -20580,9 +20129,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute92();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute92;
 DROP PROCEDURE sp92;
 DROP PROCEDURE IF EXISTS sp93;
@@ -20614,9 +20163,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute93();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute93;
 DROP PROCEDURE sp93;
 DROP PROCEDURE IF EXISTS sp94;
@@ -20682,9 +20231,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute95();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute95;
 DROP PROCEDURE sp95;
 DROP PROCEDURE IF EXISTS sp96;
@@ -20716,9 +20265,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute96();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute96;
 DROP PROCEDURE sp96;
 DROP PROCEDURE IF EXISTS sp97;
@@ -20750,9 +20299,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute97();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65535	65535	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-32602	-32602	-32592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65535	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-32602	-32592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute97;
 DROP PROCEDURE sp97;
 DROP PROCEDURE IF EXISTS sp98;
@@ -20818,9 +20367,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute99();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-252	252	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+252	252	262	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-252	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+252	262	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute99;
 DROP PROCEDURE sp99;
 DROP PROCEDURE IF EXISTS sp100;
@@ -20886,9 +20435,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute101();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-255	255	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-102	-102	-92	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-255	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-102	-92	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute101;
 DROP PROCEDURE sp101;
 USE db_storedproc;
@@ -20914,7 +20463,7 @@ insert into temp_table values(a);
 END//
 show CREATE PROCEDURE sp2;
 Procedure	sql_mode	Create Procedure
-sp2	ALLOW_INVALID_DATES	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
+sp2	ALLOW_INVALID_DATES	CREATE PROCEDURE `sp2`()
 BEGIN
 declare a datetime;
 set a = '2005-03-14 01:01:02';
@@ -20950,7 +20499,7 @@ SELECT not 1 between a and b;
 END//
 show CREATE PROCEDURE sp3;
 Procedure	sql_mode	Create Procedure
-sp3	HIGH_NOT_PRECEDENCE	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp3`()
+sp3	HIGH_NOT_PRECEDENCE	CREATE PROCEDURE `sp3`()
 BEGIN
 declare a int signed;
 declare b int unsigned;
@@ -20993,7 +20542,7 @@ show warnings;
 END//
 show CREATE PROCEDURE sp4;
 Procedure	sql_mode	Create Procedure
-sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE DEFINER="root"@"localhost" PROCEDURE "sp4"()
+sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE PROCEDURE "sp4"()
 BEGIN
 declare a int;
 declare b int;
@@ -21041,14 +20590,14 @@ set @y=@x;
 END//
 show CREATE PROCEDURE sp6a;
 Procedure	sql_mode	Create Procedure
-sp6a		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
+sp6a		CREATE PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
 BEGIN
 set @x=i1;
 set @y=@x;
 END
 show CREATE PROCEDURE sp6b;
 Procedure	sql_mode	Create Procedure
-sp6b		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
+sp6b		CREATE PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
     DETERMINISTIC
 BEGIN
 set @x=i1;
@@ -21056,7 +20605,7 @@ set @y=@x;
 END
 show CREATE PROCEDURE sp6c;
 Procedure	sql_mode	Create Procedure
-sp6c		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
+sp6c		CREATE PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
     COMMENT 'this is a comment'
 BEGIN
 set @x=i1;
@@ -21242,7 +20791,7 @@ END//
 alter function fn1 sql security invoker;
 show  create  function  fn1;
 Function	sql_mode	Create Function
-fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
+fn1		CREATE FUNCTION `fn1`(x int) RETURNS int(11)
     SQL SECURITY INVOKER
 BEGIN
 return x;
@@ -21274,7 +20823,7 @@ END//
 alter procedure sp6 comment 'this is simple';
 show CREATE PROCEDURE sp6;
 Procedure	sql_mode	Create Procedure
-sp6		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6`(i1 int , i2 int)
+sp6		CREATE PROCEDURE `sp6`(i1 int , i2 int)
     COMMENT 'this is simple'
 BEGIN
 set @x=i1;
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
index 5560fb1fd73..60ea7393c73 100755
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
@@ -166,7 +166,7 @@ declare y integer default 1;
 set @x = x;
 set @y = y;
 set @z = 234;
-SELECT f1, f2 into @x, @y from t2 limit 1;
+SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
 SELECT @x, @y, @z, invar;
 BEGIN
 set @x = 2;
@@ -209,7 +209,7 @@ BEGIN
 declare x integer; declare y integer;
 set @x=x;
 set @y=y;
-SELECT f4, f3 into @x, @y from t2 limit 1;
+SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
 SELECT @x, @y;
 END//
 CALL sp1();
@@ -544,6 +544,9 @@ exit handler 2
 exit handler 2
 exit handler 1
 exit handler 1
+Warnings:
+Note	1051	Unknown table 'tqq'
+Note	1051	Unknown table 'tqq'
 create table res_t1(w char unique, x char);
 insert into res_t1 values ('a', 'b');
 CREATE PROCEDURE h1 ()
@@ -1084,7 +1087,8 @@ declare f2_value char(20);
 declare f5_value char(20);
 declare f4_value integer;
 declare f6_value integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
+where f4 >=-5000 order by f4 limit 3;
 open cur1;
 while proceed do
 SELECT count AS 'loop';
@@ -1167,7 +1171,7 @@ of a compound statement ends.
 DROP TABLE IF EXISTS temp1;
 DROP PROCEDURE IF EXISTS sp1;
 create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) );
-SELECT f1, f2, f4, f5 from t2;
+SELECT f1, f2, f4, f5 from t2 order by f4;
 f1	f2	f4	f5
 a`	a`	-5000	a`
 aaa	aaa	-4999	aaa
@@ -1187,21 +1191,21 @@ declare newf1 char(20);
 declare newf2 char(20);
 declare newf5 char(20);
 declare newf4 integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
-declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
+declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
+declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
 open cur1;
 open cur2;
 BEGIN
-declare continue handler for sqlstate '02000' set count = 1;
+declare continue handler for sqlstate '02000' set count=1;
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-1-', count, newf1, newf2, newf4, newf5;
 insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
-set count = 4;
+set count= 4;
 BEGIN
-while count > 0 do
+while count> 0 do
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-2-', count, newf1, newf2, newf4, newf5;
-set count = count - 1;
+set count = count- 1;
 END while;
 SELECT '-3-', count, newf1, newf2, newf4, newf4;
 END;
@@ -1270,8 +1274,10 @@ declare i_newf11 char(20);
 declare i_newf12 char(20);
 declare i_newf13 date;
 declare i_newf14 integer;
-declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
-declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 4;
+declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 3;
 declare continue handler for sqlstate '02000' set proceed=0;
 open cur1;
 open cur2;
@@ -1302,8 +1308,10 @@ DECLARE o_newf11 CHAR(20);
 DECLARE o_newf12 CHAR(20);
 DECLARE o_newf13 DATE;
 DECLARE o_newf14 INTEGER;
-DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
-DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
+DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
+DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
 DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
 OPEN cur1;
 OPEN cur2;
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
index ec2b4850d30..5bb5b3cbbc2 100755
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
@@ -80,7 +80,7 @@ connect(localhost,user_1,,db_storedproc,MYSQL_PORT,MYSQL_SOCK);
 user_1@localhost	db_storedproc
 CREATE PROCEDURE sp31102 () SQL SECURITY INVOKER
 BEGIN
-SELECT * FROM db_storedproc.t1 LIMIT 1;
+SELECT * FROM db_storedproc.t1 WHERE f4=-5000 LIMIT 1;
 END//
 CREATE FUNCTION fn31105(n INT) RETURNS INT
 BEGIN
@@ -209,7 +209,7 @@ CALL sp_ins_1();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -226,7 +226,7 @@ CALL sp_ins_3();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -246,7 +246,7 @@ CALL sp_upd();
 SELECT row_count();
 row_count()
 4
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -279,7 +279,7 @@ COUNT( f1 )	f1
 SELECT row_count();
 row_count()
 3
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
index a2bb203b294..02a82db0901 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_0102.result
@@ -199,6 +199,9 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 for each row set new.f3 = '14';
 CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
 BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
+ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
+CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
+BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
 insert into t1 (f2) values ('insert 3.5.1.7');
 select * from t1;
 f1	f2	f3
@@ -207,12 +210,14 @@ update t1 set f2='update 3.5.1.7';
 select * from t1;
 f1	f2	f3
 NULL	update 3.5.1.7	42
-select trigger_name from information_schema.triggers;
+select trigger_name from information_schema.triggers order by trigger_name;
 trigger_name
 trg5_1
 trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
 drop trigger trg5_1;
 drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
+ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
+drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
 drop table t1;
 
 Testcase 3.5.1.8:
@@ -314,7 +319,7 @@ insert into trig_db3.t1 (f1,f2) values ('insert to db3 t1 from db1',4);
 select @test_var1, @test_var2, @test_var3;
 @test_var1	@test_var2	@test_var3
 trig1	trig2	trig3
-select * from t1;
+select * from t1 order by f2;
 f1	f2
 trig1	1
 trig1	2
@@ -324,7 +329,7 @@ trig2	3
 select * from trig_db3.t1;
 f1	f2
 trig3	4
-select * from t1;
+select * from t1 order by f2;
 f1	f2
 trig1	1
 trig1	2
@@ -349,10 +354,10 @@ for each row set @test_var2='trig1_a';
 create trigger trig_db2.trig2 before insert on trig_db2.t1 
 for each row set @test_var3='trig2';
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers;
+from information_schema.triggers order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-trig_db1	trig1_b	t1
 trig_db1	trig1_a	t1
+trig_db1	trig1_b	t1
 trig_db2	trig2	t1
 set @test_var1= '', @test_var2= '', @test_var3= '';
 insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_03.result b/mysql-test/suite/funcs_1/r/innodb_trig_03.result
index 18300c6fc6b..c72a792a3a5 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_03.result
@@ -82,16 +82,16 @@ Testcase 3.5.3.2/6:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
 grant ALL  on *.* to test_noprivs@localhost;
-revoke SUPER  on *.* from test_noprivs@localhost;
+revoke TRIGGER on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -104,10 +104,10 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+Got one of the listed errors
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 select current_user;
@@ -122,15 +122,12 @@ root@localhost
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
 ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for column 'f1' in table 't1'
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
-
-note: once 15166 is fixed a similar case for SELECT needs to be added
----------------------------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -139,10 +136,10 @@ Testcase 3.5.3.6:
 -----------------
 use priv_db;
 drop trigger trg1_2;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+Got one of the listed errors
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -151,12 +148,12 @@ use priv_db;
 drop trigger trg1_2;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-no');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
 drop trigger trg1_2;
 
 Testcase 3.5.3.7a:
@@ -166,12 +163,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke UPDATE  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER, UPDATE on *.* to test_yesprivs@localhost;
+grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -180,24 +177,24 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-select f1 from t1;
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1a');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 drop trigger trg4a_1;
 use priv_db;
 select current_user;
@@ -205,236 +202,220 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg4a_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2a';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 drop trigger trg4a_2;
 
 Testcase 3.5.3.7b:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs;
+grant TRIGGER on *.* to test_noprivs;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke UPDATE  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
 GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
 insert 3.5.3.7-1b
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
 update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4b_2 before UPDATE  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2b';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on priv_db.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-2b
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
-insert 3.5.3.7-2b
 update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
+update 3.5.3.7-1b
 drop trigger trg4b_2;
 
 Testcase 3.5.3.7c
 -----------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke UPDATE  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1c');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-1c
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
+update 3.5.3.7-1b
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4c_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2c';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2c');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-1c
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
 trig 3.5.3.7-2c
+update 3.5.3.7-1b
 drop trigger trg4c_2;
 
 Testcase 3.5.3.7d:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant SELECT (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1d');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-1c
+insert 3.5.3.7-1d
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
 trig 3.5.3.7-2c
-insert 3.5.3.7-1d
+update 3.5.3.7-1b
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4d_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2d';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2d');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-1c
+insert 3.5.3.7-1d
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
 trig 3.5.3.7-2c
-insert 3.5.3.7-1d
 trig 3.5.3.7-2d
+update 3.5.3.7-1b
 drop trigger trg4d_2;
 
 Testcase 3.5.3.8a:
@@ -444,12 +425,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke SELECT  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER, SELECT on *.* to test_yesprivs@localhost;
+grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -458,7 +439,7 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 
 Trigger create disabled - should fail - Bug 8887
 ------------------------------------------------
@@ -477,17 +458,13 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg5a_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-2a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-2a
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2a');
 select @test_var;
 @test_var
@@ -497,26 +474,26 @@ drop trigger trg5a_2;
 Testcase: 3.5.3.8b
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke SELECT  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -533,7 +510,7 @@ before trig 3.5.3.8-1b
 drop trigger trg5b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5b_2 before UPDATE  on t1 for each row
@@ -543,10 +520,6 @@ insert into t1 (f1) values ('insert 3.5.3.8-2b');
 select @test_var;
 @test_var
 before trig 3.5.3.8-2b
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on priv_db.* to test_yesprivs@localhost;
 update t1 set  f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b';
 select @test_var;
 @test_var
@@ -556,26 +529,26 @@ drop trigger trg5b_2;
 Testcase 3.5.3.8c:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke SELECT  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -588,16 +561,12 @@ before trig 3.5.3.8-1c
 drop trigger trg5c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5c_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2c';
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2c');
 select @test_var;
 @test_var
@@ -607,24 +576,24 @@ drop trigger trg5c_2;
 Testcase: 3.5.3.8d:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant UPDATE (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
@@ -638,16 +607,12 @@ before trig 3.5.3.8-1d
 drop trigger trg5d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5d_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2d';
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2d');
 select @test_var;
 @test_var
@@ -662,12 +627,12 @@ drop table if exists t2;
 create table t1 (f1 int) engine= innodb;
 create table t2 (f2 int) engine= innodb;
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t2` TO 'test_yesprivs'@'localhost'
 GRANT SELECT, UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -683,10 +648,10 @@ ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (4);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 4
-select f2 from t2;
+select f2 from t2 order by f2;
 f2
 4
 use priv_db;
@@ -699,11 +664,11 @@ ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table
 revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (2);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
 2
-select f2 from t2;
+4
+select f2 from t2 order by f2;
 f2
 1
 use priv_db;
@@ -716,12 +681,12 @@ ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table
 revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
-2
 1
-select f2 from t2;
+2
+4
+select f2 from t2 order by f2;
 f2
 1
 select @aaa;
@@ -737,13 +702,13 @@ ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
-2
 1
 1
-select f2 from t2;
+2
+4
+select f2 from t2 order by f2;
 f2
 drop database if exists priv_db;
 drop user test_yesprivs@localhost;
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
index ce7c51ec630..8a7ee3dc55d 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
@@ -93,18 +93,18 @@ Create trigger trg1 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.1';
 Use db_drop;
 Insert into t1 values ('Insert error 3.5.4.1');
-Select * from t1;
+Select * from t1 order by f1;
 f1
 Trigger 3.5.4.1
 drop trigger trg1;
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers;
+from information_schema.triggers order by trigger_name;
 trigger_schema	trigger_name	event_object_table
 Insert into t1 values ('Insert no trigger 3.5.4.1');
-Select * from t1;
+Select * from t1 order by f1;
 f1
-Trigger 3.5.4.1
 Insert no trigger 3.5.4.1
+Trigger 3.5.4.1
 drop trigger trg1;
 drop database if exists db_drop;
 revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost';
@@ -258,7 +258,7 @@ use dbtest_one;
 Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4');
 Warnings:
 Warning	1265	Data truncated for column 'f1' at row 1
-Select * from dbtest_two.t2;
+Select * from dbtest_two.t2 order by f1;
 f1
 1st Insert 3.5.
 2nd Insert 3.5.
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_08.result b/mysql-test/suite/funcs_1/r/innodb_trig_08.result
index 0f2d54f01ba..44d53923241 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_08.result
@@ -139,10 +139,10 @@ values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
 f120	f122	f136	f144	f163
 1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i;
+select * from db_test.t1_i order by i120;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u;
+select * from db_test.t1_u order by u120;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
 b	00222	0000023456	1.050000000000000000000000000000
@@ -150,7 +150,7 @@ c	00333	0000099999	999.990000000000000000000000000000
 d	00222	0000023456	1.050000000000000000000000000000
 e	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-select * from db_test.t1_d;
+select * from db_test.t1_d order by d120;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -162,14 +162,22 @@ select @test_var;
 3.5.8.4 - single SQL - insert
 -----------------------------
 Create trigger trg2 BEFORE UPDATE on tb3 for each row
+BEGIN
 insert into db_test.t1_i 
 values (new.f120, new.f136, new.f144, new.f163);
+END//
+Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
+f120	f122	f136	f144	f163
+1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
+select * from db_test.t1_i order by i120;
+i120	i136	i144	i163
+1	00222	0000023456	1.050000000000000000000000000000
 update tb3 set f120='I', f122='Test 3.5.8.4-Single Insert'
 		 where f122='Test 3.5.8.4';
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 I	Test 3.5.8.4-Single Insert	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i;
+select * from db_test.t1_i order by i120;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
 I	00222	0000023456	1.050000000000000000000000000000
@@ -186,14 +194,14 @@ update tb3 set f120='U', f122='Test 3.5.8.4-Single Update'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 U	Test 3.5.8.4-Single Update	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u;
+select * from db_test.t1_u order by u120;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
+f	00333	0000099999	999.990000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
 U	00222	0000023456	1.050000000000000000000000000000
 U	00222	0000023456	1.050000000000000000000000000000
-f	00333	0000099999	999.990000000000000000000000000000
 
 3.5.8.3/4 - single SQL - delete
 -------------------------------
@@ -206,7 +214,7 @@ f122='Test 3.5.8.4-Single Delete'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 D	Test 3.5.8.4-Single Delete	00444	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_d;
+select * from db_test.t1_d order by d120;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -253,29 +261,29 @@ END//
 set @test_var='Empty', @test_var2=0;
 Insert into tb3 (f120, f122, f136) values ('1', 'Test 3.5.8.5-if', 101);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	one	2nd else
 Insert into tb3 (f120, f122, f136) values ('2', 'Test 3.5.8.5-if', 102);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	two	2nd else
 D	Test 3.5.8.5-if	00102	two	2nd else
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 10);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
+d	Test 3.5.8.5-if	00010	three	2nd if
 D	Test 3.5.8.5-if	00101	three	2nd if
 D	Test 3.5.8.5-if	00102	three	2nd if
-d	Test 3.5.8.5-if	00010	three	2nd if
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 103);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
+d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00101	three	2nd else
 D	Test 3.5.8.5-if	00102	three	2nd else
-d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00103	three	2nd else
 create trigger trg3 before update on tb3 for each row
 BEGIN
@@ -335,20 +343,20 @@ set @test_var='Empty';
 Insert into tb3 (f120, f122, f136, f144) 
 values ('a', 'Test 3.5.8.5-case', 5, 7);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	A*seven
 Insert into tb3 (f120, f122, f136, f144) 
 values ('b', 'Test 3.5.8.5-case', 71,16);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	B*0000000016
 B	Test 3.5.8.5-case	00191	0000000016	B*0000000016
 Insert into tb3 (f120, f122, f136, f144) 
 values ('c', 'Test 3.5.8.5-case', 80,1);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	C=one
 B	Test 3.5.8.5-case	00191	0000000016	C=one
@@ -358,34 +366,34 @@ values ('d', 'Test 3.5.8.5-case', 152);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 A	Test 3.5.8.5-case	00125	0000000007	1*0000099999
 B	Test 3.5.8.5-case	00191	0000000016	1*0000099999
 C	Test 3.5.8.5-case	00200	0000000001	1*0000099999
-1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 Insert into tb3 (f120, f122, f136, f144) 
 values ('e', 'Test 3.5.8.5-case', 200, 8);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 Insert into tb3 (f120, f122, f136, f144) 
 values ('f', 'Test 3.5.8.5-case', 100, 8);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 create trigger trg3a before update on tb3 for each row
 BEGIN
 CASE
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_09.result b/mysql-test/suite/funcs_1/r/innodb_trig_09.result
index 54b191e401e..6ea93683847 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_09.result
@@ -120,7 +120,7 @@ set @tr_var_af_118=old.f118, @tr_var_af_121=old.f121,
 Insert into tb3 (f122, f136, f163) 
 values ('Test 3.5.9.3', 7, 123.17);
 Update tb3 Set f136=8 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
 a	NULL	Test 3.5.9.3	00008	123.170000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -136,7 +136,7 @@ a	NULL	Test 3.5.9.3	7	123.170000000000000000000000000000
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 0	0	0	0	0
 delete from tb3 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 @tr_var_b4_136, @tr_var_b4_163;
@@ -176,7 +176,7 @@ set @tr_var_af_118=new.f118, @tr_var_af_121=new.f121,
 Insert into tb3 (f122, f136, f151, f163) 
 values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4%';
+where f122 like 'Test 3.5.9.4%' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4	00007	999	995.240000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -194,9 +194,9 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 Warnings:
-Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
+Warning	1048	Column 'f136' cannot be null
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4-trig';
+where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4-trig	00000	999	NULL
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result b/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
index 182747e3153..6c9c1fb98c0 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
@@ -87,7 +87,7 @@ Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 1);
 Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2);
 Insert into vw11 (f122, f151) values ('Not in View', 3);
 select f121, f122, f151, f163
-from tb3 where f122 like 'Test 3.5.10.1/2/3%';
+from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 NULL	Test 3.5.10.1/2/3	1	111.110000000000000000000000000000
 NULL	Test 3.5.10.1/2/3	2	111.110000000000000000000000000000
@@ -101,7 +101,7 @@ f121	f122	f151	f163
 NULL	Not in View	3	111.110000000000000000000000000000
 Update vw11 set f163=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	1	1.000000000000000000000000000000
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
@@ -115,7 +115,7 @@ before delete
 0
 delete from vw11 where f151=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
 select f121, f122, f151, f163 from vw11;
@@ -146,7 +146,7 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
 select @counter as 'Rows Loaded After';
 Rows Loaded After
 10
-Select * from tb_load limit 10;
+Select * from tb_load order by f1 limit 10;
 f1	f2	f3
 -5000	a`	1000
 -4999	aaa	999
@@ -241,7 +241,7 @@ insert into t3 (f1) values (new.f1+1000);
 create trigger tr2_4 after insert on t2_4 for each row
 insert into t3 (f1) values (new.f1+10000);
 insert into t1 values (1);
-select * from t3;
+select * from t3 order by f1;
 f1
 12
 102
@@ -276,14 +276,14 @@ create trigger tr4 after insert on t4
 for each row insert into t1 (f1) values (new.f4+1);
 insert into t1 values (1);
 ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
-select * from t1;
+select * from t1 order by f1;
 f1
 0
-select * from t2;
+select * from t2 order by f2;
 f2
-select * from t3;
+select * from t3 order by f3;
 f3
-select * from t4;
+select * from t4 order by f4;
 f4
 drop trigger tr1;
 drop trigger tr2;
@@ -369,7 +369,7 @@ create table t4 (f4 tinyint) engine = innodb;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL
+  `f1` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 insert into t1 values (1);
 create trigger tr1 after insert on t1
@@ -381,14 +381,14 @@ for each row insert into t4 (f4) values (new.f3+1000);
 set autocommit=0;
 start transaction;
 insert into t1 values (1);
-ERROR 22003: Out of range value adjusted for column 'f4' at row 1
+ERROR 22003: Out of range value for column 'f4' at row 1
 commit;
-select * from t1;
+select * from t1 order by f1;
 f1
 1
-select * from t2;
+select * from t2 order by f2;
 f2
-select * from t3;
+select * from t3 order by f3;
 f3
 drop trigger tr1;
 drop trigger tr2;
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result b/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
index 56dd5d6740e..b8d2b768cb1 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
@@ -116,7 +116,7 @@ insert into t1 values (3,'Department C');
 insert into t2 values (1,2,'Emp 1');
 insert into t2 values (2,3,'Emp 2');
 insert into t2 values (3,4,'Emp 3');
-ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test/t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f_id`) REFERENCES `t1` (`id`) ON UPDATE CASCADE)
+ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f_id`) REFERENCES `t1` (`id`) ON UPDATE CASCADE)
 create trigger tr_t2 before insert on t2 for each row
 insert into t1 values(new.f_id, concat('New Department ', new.f_id));
 lock tables t1 write, t2 write;
diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result
index 63d1c8a3131..be0f36f49be 100644
--- a/mysql-test/suite/funcs_1/r/innodb_views.result
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result
@@ -1926,7 +1926,7 @@ f1	f2
 2	two
 4	four
 INSERT INTO v1 VALUES(2,'two');
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
 INSERT INTO v1 VALUES(3,'three');
 affected rows: 1
 INSERT INTO v1 VALUES(6,'six');
@@ -1945,7 +1945,7 @@ f1	f2
 3	three
 4	four
 UPDATE v1 SET f1 = 2 WHERE f1 = 3;
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
 UPDATE v1 SET f2 = 'number' WHERE f1 = 3;
 affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
@@ -1992,12 +1992,12 @@ DROP VIEW  IF EXISTS test.v1;
 CREATE TABLE t1 (f1 ENUM('A', 'B', 'C') NOT NULL, f2 INTEGER)
 ENGINE = innodb;
 INSERT INTO t1 VALUES ('A', 1);
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 A	1
 CREATE VIEW  v1 AS SELECT * FROM t1 WHERE f2 BETWEEN 1 AND 2
 WITH CASCADED CHECK OPTION ;
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	1
 UPDATE v1 SET f2 = 2 WHERE f2 = 1;
@@ -2005,7 +2005,7 @@ affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
 INSERT INTO v1 VALUES('B',2);
 affected rows: 1
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	2
 B	2
@@ -2013,7 +2013,7 @@ UPDATE v1 SET f2 = 4;
 ERROR HY000: CHECK OPTION failed 'test.v1'
 INSERT INTO v1 VALUES('B',3);
 ERROR HY000: CHECK OPTION failed 'test.v1'
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	2
 B	2
@@ -10580,7 +10580,7 @@ f1	f2	f3	f4
 DELETE FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 1
+ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10649,7 +10649,7 @@ DROP VIEW v1;
 CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 1
+ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10984,11 +10984,11 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(5)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11008,12 +11008,12 @@ f4x	char(5)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4x	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 CHANGE COLUMN f4x f4 CHAR(5);
 ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(10);
@@ -11031,14 +11031,14 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(10)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
 2	NULL	<-- 10 -->	t1 2
 2	NULL	<-- 10 -->	v1 2
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11067,7 +11067,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(8)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11076,7 +11076,7 @@ f1	f2	f4	report
 2	NULL	<-- 10 -	v1 2
 3	NULL	<-- 10 -	t1 3
 3	NULL	<-- 10 -	v1 3
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11100,7 +11100,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11111,7 +11111,7 @@ f1	f2	f4	report
 3	NULL	<-- 10 -	v1 3
 4	NULL	<------ 20 -------->	t1 4
 4	NULL	<------ 20 -------->	v1 4
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11139,7 +11139,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11152,7 +11152,7 @@ f1	f2	f4	report
 4	NULL	<------ 20 -------->	v1 4
 <------------- 30 ----------->	NULL	<------ 20 -------->	t1 5
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11176,7 +11176,7 @@ f4	varchar(20)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report
 -1	ABC	t1 0
 -1	ABC	v1 0
@@ -11190,7 +11190,7 @@ f1	f4	report
 <------------- 30 ----------->	<------ 20 -------->	t1 5
 <------------- 30 ----------->	<------ 20 -------->	v1 5
 ABC	<------ 20 -------->	t1 6
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 ADD COLUMN f2 DATE DEFAULT NULL;
 INSERT INTO t1 SET f1 = 'ABC', f2 = '1500-12-04',
@@ -11209,7 +11209,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11225,7 +11225,7 @@ f1	f4	report	f2
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	1500-12-04
 ABC	<------ 20 -------->	v1 7	1500-12-04
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11259,7 +11259,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11274,10 +11274,10 @@ f1	f4	report	f2
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	NULL
-ABC	<------ 20 -------->	v1 7	NULL
 ABC	<------ 20 -------->	t1 8	-0.00033
+ABC	<------ 20 -------->	v1 7	NULL
 ABC	<------ 20 -------->	v1 8	-0.00033
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11292,8 +11292,8 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	t1 8
+ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	v1 8
 ALTER TABLE t1 ADD COLUMN f3 NUMERIC(7,2);
 INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
@@ -11316,7 +11316,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2	f3
 -1	ABC	t1 0	NULL	NULL
 -1	ABC	v1 0	NULL	NULL
@@ -11331,12 +11331,12 @@ f1	f4	report	f2	f3
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL	NULL
 ABC	<------ 20 -------->	t1 6	NULL	NULL
 ABC	<------ 20 -------->	t1 7	NULL	NULL
-ABC	<------ 20 -------->	v1 7	NULL	NULL
 ABC	<------ 20 -------->	t1 8	-0.00033	NULL
-ABC	<------ 20 -------->	v1 8	-0.00033	NULL
 ABC	<------ 20 -------->	t1 9	-0.00033	-2.20
+ABC	<------ 20 -------->	v1 7	NULL	NULL
+ABC	<------ 20 -------->	v1 8	-0.00033	NULL
 ABC	<------ 20 -------->	v1 9a	-0.00033	NULL
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11351,10 +11351,10 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	t1 8
-ABC	-0.00033	<------ 20 -------->	v1 8
 ABC	-0.00033	<------ 20 -------->	t1 9
+ABC	NULL	<------ 20 -------->	v1 7
+ABC	-0.00033	<------ 20 -------->	v1 8
 ABC	-0.00033	<------ 20 -------->	v1 9a
 DROP TABLE t1;
 DROP VIEW  v1;
@@ -11369,10 +11369,10 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 ABC	3
-SELECT * FROM v1;
+SELECT * FROM v1 order by 2;
 f1	my_sqrt
 ABC	1.7320508075689
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
@@ -11385,21 +11385,21 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 ABC	3
 ABC	DEF
-SELECT * FROM v1;
+SELECT * FROM v1 order by 2;
 f1	my_sqrt
-ABC	1.7320508075689
 ABC	0
+ABC	1.7320508075689
 SELECT SQRT('DEF');
 SQRT('DEF')
 0
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 CREATE VIEW v2 AS SELECT SQRT('DEF');
-SELECT * FROM v2;
+SELECT * FROM v2 order by 1;
 SQRT('DEF')
 0
 Warnings:
@@ -11409,27 +11409,27 @@ DESCRIBE v2;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM v2;
+SELECT * FROM v2 order by 2;
 f1	my_sqrt
-ABC	1.7320508075689
 ABC	0
+ABC	1.7320508075689
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/r/memory__datadict.result b/mysql-test/suite/funcs_1/r/memory__datadict.result
index 1dea8a5f4a9..0ef00f0e553 100644
--- a/mysql-test/suite/funcs_1/r/memory__datadict.result
+++ b/mysql-test/suite/funcs_1/r/memory__datadict.result
@@ -433,10 +433,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -459,7 +470,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -480,7 +491,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -501,7 +512,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	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -522,7 +533,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -543,7 +554,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -561,10 +572,199 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	ENGINES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	EVENTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	FILES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PARTITIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PLUGINS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PROCESSLIST
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	REFERENTIAL_CONSTRAINTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -585,7 +785,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -606,7 +806,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -627,7 +827,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -645,10 +845,52 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -669,7 +911,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -690,7 +932,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -711,7 +953,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -732,7 +974,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -753,7 +995,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -774,7 +1016,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -899,6 +1141,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	event
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Events
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -920,6 +1183,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	general_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	General log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1025,6 +1309,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	ndb_binlog_index
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	latin1_swedish_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	plugin
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_bin
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL plugins
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1067,6 +1393,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	servers
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL Foreign Servers table
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	slow_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Slow log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1532,6 +1900,8 @@ t.table_type, t.engine
 from schemata s inner join tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	CSV
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
@@ -1564,6 +1934,13 @@ NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
@@ -1576,6 +1953,14 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1583,6 +1968,8 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	CSV
 NULL	information_schema	utf8	BASE TABLE	MEMORY
 NULL	information_schema	utf8	BASE TABLE	MEMORY
 NULL	information_schema	utf8	BASE TABLE	MEMORY
@@ -1615,6 +2002,15 @@ NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
@@ -1631,9 +2027,17 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	CSV
 NULL	mysql	latin1	BASE TABLE	MEMORY
 NULL	mysql	latin1	BASE TABLE	MEMORY
 NULL	mysql	latin1	BASE TABLE	MEMORY
@@ -1666,6 +2070,14 @@ NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
@@ -1678,6 +2090,13 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -1685,6 +2104,8 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	CSV
 NULL	test	latin1	BASE TABLE	MEMORY
 NULL	test	latin1	BASE TABLE	MEMORY
 NULL	test	latin1	BASE TABLE	MEMORY
@@ -1717,6 +2138,13 @@ NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
@@ -1729,6 +2157,14 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -1736,6 +2172,8 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	CSV
 NULL	test1	latin1	BASE TABLE	MEMORY
 NULL	test1	latin1	BASE TABLE	MEMORY
 NULL	test1	latin1	BASE TABLE	MEMORY
@@ -1768,6 +2206,13 @@ NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
@@ -1780,6 +2225,14 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -1787,6 +2240,8 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	CSV
 NULL	test4	latin1	BASE TABLE	MEMORY
 NULL	test4	latin1	BASE TABLE	MEMORY
 NULL	test4	latin1	BASE TABLE	MEMORY
@@ -1819,6 +2274,12 @@ NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
@@ -1831,6 +2292,15 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -1856,14 +2326,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -1878,6 +2348,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			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	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			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	SQL_MODE	12		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	ENDS	14	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	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	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	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			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	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_SCHEMA	6	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	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	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DELETED_ROWS	12	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	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			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	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATION_TIME	20	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	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	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	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	TABLE_ROWS	27	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	DATA_LENGTH	29	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	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1890,6 +2429,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	SUBPARTITION_NAME	5	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_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_LENGTH	15	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	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			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_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_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_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			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	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1920,6 +2513,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 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	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1940,20 +2537,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -2004,20 +2601,20 @@ NULL	db_datadict	v1	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_genera
 NULL	db_datadict	v1	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select,insert,update,references	
-NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select,insert,update,references	
 NULL	db_datadict	vu	u	1		NO	varchar	81	243	NULL	NULL	utf8	utf8_general_ci	varchar(81)			select,insert,update,references	
@@ -2051,10 +2648,36 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	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	
 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	Event_priv	21	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	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		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	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			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	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	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	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			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	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	ends	12	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	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
+NULL	mysql	event	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	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			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	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			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	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			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	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+NULL	mysql	general_log	argument	6	NULL	YES	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	
@@ -2088,6 +2711,16 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	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	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	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			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	inserts	4	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	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	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			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	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			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	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		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	
@@ -2112,13 +2745,33 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 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	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			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	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			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	Username	4		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	Socket	7		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	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	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	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			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	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			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	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
+NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	server_id	10	NULL	YES	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	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		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	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	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	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		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	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	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	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			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	
@@ -2163,14 +2816,16 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			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	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			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	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_connections	36	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	Event_priv	30	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	ssl_type	32		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	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	
+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_connections	38	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	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -2522,7 +3177,7 @@ cp932	cp932_japanese_ci	SJIS for Windows Japanese	2
 eucjpms	eucjpms_japanese_ci	UJIS for Windows Japanese	3
 select sum(id) from collations;
 sum(id)
-10741
+10840
 select collation_name, character_set_name into @x,@y
 from collation_character_set_applicability limit 1;
 select @x, @y;
@@ -2547,6 +3202,8 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -2558,6 +3215,8 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
+NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
+NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	1	NULL	NULL		BTREE	
@@ -2567,6 +3226,7 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -2597,6 +3257,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -2612,6 +3273,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -2622,6 +3284,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -2637,6 +3300,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -2647,6 +3311,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -2662,6 +3327,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select * from schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -2679,6 +3345,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -2693,6 +3361,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 select * from table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 select * from column_privileges;
@@ -2701,6 +3371,7 @@ select * from table_constraints;
 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	PRIMARY	mysql	help_category	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
@@ -2710,8 +3381,11 @@ NULL	mysql	PRIMARY	mysql	help_relation	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_topic	PRIMARY KEY
 NULL	mysql	name	mysql	help_topic	UNIQUE
 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
@@ -2729,6 +3403,8 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_category	name	1	NULL	NULL	NULL	NULL
@@ -2740,6 +3416,8 @@ NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_topic	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -2748,6 +3426,7 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -2763,7 +3442,7 @@ NULL	mysql	PRIMARY	NULL	mysql	user	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	user	User	2	NULL	NULL	NULL	NULL
 select count(*) as max_recs from key_column_usage;
 max_recs
-40
+45
 select max(cardinality) from statistics;
 max(cardinality)
 393
@@ -2784,10 +3463,21 @@ Table or view 'COLLATIONS' is associated with the database 'information_schema'.
 Table or view 'COLLATION_CHARACTER_SET_APPLICABILITY' is associated with the database 'information_schema'.
 Table or view 'COLUMNS' is associated with the database 'information_schema'.
 Table or view 'COLUMN_PRIVILEGES' is associated with the database 'information_schema'.
+Table or view 'ENGINES' is associated with the database 'information_schema'.
+Table or view 'EVENTS' is associated with the database 'information_schema'.
+Table or view 'FILES' is associated with the database 'information_schema'.
+Table or view 'GLOBAL_STATUS' is associated with the database 'information_schema'.
+Table or view 'GLOBAL_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'KEY_COLUMN_USAGE' is associated with the database 'information_schema'.
+Table or view 'PARTITIONS' is associated with the database 'information_schema'.
+Table or view 'PLUGINS' is associated with the database 'information_schema'.
+Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
+Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
 Table or view 'SCHEMA_PRIVILEGES' is associated with the database 'information_schema'.
+Table or view 'SESSION_STATUS' is associated with the database 'information_schema'.
+Table or view 'SESSION_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'STATISTICS' is associated with the database 'information_schema'.
 Table or view 'TABLES' is associated with the database 'information_schema'.
 Table or view 'TABLE_CONSTRAINTS' is associated with the database 'information_schema'.
@@ -2800,14 +3490,20 @@ Table or view 'vu' is associated with the database 'db_datadict'.
 Table or view 'vu1' is associated with the database 'db_datadict'.
 Table or view 'columns_priv' is associated with the database 'mysql'.
 Table or view 'db' is associated with the database 'mysql'.
+Table or view 'event' is associated with the database 'mysql'.
 Table or view 'func' is associated with the database 'mysql'.
+Table or view 'general_log' is associated with the database 'mysql'.
 Table or view 'help_category' is associated with the database 'mysql'.
 Table or view 'help_keyword' is associated with the database 'mysql'.
 Table or view 'help_relation' is associated with the database 'mysql'.
 Table or view 'help_topic' is associated with the database 'mysql'.
 Table or view 'host' is associated with the database 'mysql'.
+Table or view 'ndb_binlog_index' is associated with the database 'mysql'.
+Table or view 'plugin' is associated with the database 'mysql'.
 Table or view 'proc' is associated with the database 'mysql'.
 Table or view 'procs_priv' is associated with the database 'mysql'.
+Table or view 'servers' is associated with the database 'mysql'.
+Table or view 'slow_log' is associated with the database 'mysql'.
 Table or view 'tables_priv' is associated with the database 'mysql'.
 Table or view 'time_zone' is associated with the database 'mysql'.
 Table or view 'time_zone_leap_second' is associated with the database 'mysql'.
@@ -2854,12 +3550,12 @@ select * from table_constraints limit 0,5;
 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	PRIMARY	mysql	help_category	PRIMARY KEY
-NULL	mysql	name	mysql	help_category	UNIQUE
 select count(*) as max_recs from key_column_usage limit 0,5;
 max_recs
-40
+45
 select information_schema.tables.table_name as "table name",
 count(distinct(column_name)) as "no of columns in the table"
   from information_schema.tables left outer join information_schema.columns on
@@ -2872,19 +3568,36 @@ COLLATION_CHARACTER_SET_APPLICABILITY	2
 COLUMNS	19
 columns_priv	7
 COLUMN_PRIVILEGES	7
-db	20
+db	22
+ENGINES	6
+event	18
+EVENTS	21
+FILES	38
 func	4
+general_log	6
+GLOBAL_STATUS	2
+GLOBAL_VARIABLES	2
 help_category	4
 help_keyword	2
 help_relation	2
 help_topic	6
-host	19
+host	20
 KEY_COLUMN_USAGE	12
+ndb_binlog_index	7
+PARTITIONS	25
+plugin	2
+PLUGINS	10
 proc	16
+PROCESSLIST	8
 procs_priv	8
+REFERENTIAL_CONSTRAINTS	11
 ROUTINES	20
 SCHEMATA	5
 SCHEMA_PRIVILEGES	5
+servers	9
+SESSION_STATUS	2
+SESSION_VARIABLES	2
+slow_log	11
 STATISTICS	15
 t1	6
 t10	6
@@ -2910,7 +3623,7 @@ time_zone_name	2
 time_zone_transition	3
 time_zone_transition_type	5
 TRIGGERS	19
-user	37
+user	39
 USER_PRIVILEGES	4
 v1	21
 VIEWS	8
@@ -2924,7 +3637,7 @@ CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_P
 NULL	information_schema	utf8	utf8_general_ci	NULL
 SELECT * FROM tables                                LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
 SELECT * FROM columns                               LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 NULL	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -2969,7 +3682,7 @@ TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATA
 SELECT * FROM parameters LIMIT 1;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT * FROM referential_constraints LIMIT 1;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	UNIQUE_CONSTRAINT_CATALOG	UNIQUE_CONSTRAINT_SCHEMA	UNIQUE_CONSTRAINT_NAME	MATCH_OPTION	UPDATE_RULE	DELETE_RULE	TABLE_NAME	REFERENCED_TABLE_NAME
 use db_datadict;
 select * from schemata;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
@@ -3059,7 +3772,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3080,7 +3793,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3101,7 +3814,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	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3122,7 +3835,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3143,7 +3856,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3161,10 +3874,199 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	ENGINES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	EVENTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	FILES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PARTITIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PLUGINS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PROCESSLIST
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	REFERENTIAL_CONSTRAINTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3185,7 +4087,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3206,7 +4108,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3227,7 +4129,28 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3245,10 +4168,31 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3269,7 +4213,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3290,7 +4234,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3311,7 +4255,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3332,7 +4276,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3353,7 +4297,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3374,7 +4318,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3499,6 +4443,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	event
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Events
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3520,6 +4485,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	general_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	General log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3625,6 +4611,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	ndb_binlog_index
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	latin1_swedish_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	plugin
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_bin
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL plugins
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3667,6 +4695,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	servers
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL Foreign Servers table
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	slow_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Slow log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4132,6 +5202,8 @@ t.table_type, t.engine
 from information_schema.schemata s inner join information_schema.tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	CSV
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
 NULL	db_datadict	latin1	BASE TABLE	MEMORY
@@ -4164,6 +5236,11 @@ NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
@@ -4176,6 +5253,16 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -4183,6 +5270,8 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	CSV
 NULL	information_schema	utf8	BASE TABLE	MEMORY
 NULL	information_schema	utf8	BASE TABLE	MEMORY
 NULL	information_schema	utf8	BASE TABLE	MEMORY
@@ -4215,6 +5304,11 @@ NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
@@ -4227,6 +5321,16 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -4234,6 +5338,8 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	CSV
 NULL	mysql	latin1	BASE TABLE	MEMORY
 NULL	mysql	latin1	BASE TABLE	MEMORY
 NULL	mysql	latin1	BASE TABLE	MEMORY
@@ -4266,6 +5372,10 @@ NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
@@ -4278,6 +5388,17 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -4285,6 +5406,8 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	CSV
 NULL	test	latin1	BASE TABLE	MEMORY
 NULL	test	latin1	BASE TABLE	MEMORY
 NULL	test	latin1	BASE TABLE	MEMORY
@@ -4317,6 +5440,13 @@ NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
@@ -4329,6 +5459,14 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -4336,6 +5474,8 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	CSV
 NULL	test1	latin1	BASE TABLE	MEMORY
 NULL	test1	latin1	BASE TABLE	MEMORY
 NULL	test1	latin1	BASE TABLE	MEMORY
@@ -4368,6 +5508,15 @@ NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
@@ -4384,9 +5533,17 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	CSV
 NULL	test4	latin1	BASE TABLE	MEMORY
 NULL	test4	latin1	BASE TABLE	MEMORY
 NULL	test4	latin1	BASE TABLE	MEMORY
@@ -4419,6 +5576,15 @@ NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
@@ -4435,6 +5601,12 @@ NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	VIEW	NULL
 NULL	test4	latin1	VIEW	NULL
 NULL	test4	latin1	VIEW	NULL
@@ -4505,9 +5677,9 @@ select * from information_schema.table_constraints limit 0, 5;
 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	PRIMARY	mysql	help_category	PRIMARY KEY
-NULL	mysql	name	mysql	help_category	UNIQUE
 select * from information_schema.key_column_usage limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Host	1	NULL	NULL	NULL	NULL
@@ -4517,7 +5689,7 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Table_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 select count(*) as max_recs from information_schema.key_column_usage limit 0, 5;
 max_recs
-40
+45
 
 root: check with db name
 ------------------------
@@ -4526,34 +5698,34 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-51
+68
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-642
+827
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
 SELECT COUNT(*) FROM information_schema. collations                            ;
 COUNT(*)
-126
+127
 SELECT COUNT(*) FROM information_schema. collation_character_set_applicability ;
 COUNT(*)
-126
+128
 SELECT COUNT(*) FROM information_schema. routines                              ;
 COUNT(*)
 1
 SELECT COUNT(*) FROM information_schema. statistics                            ;
 COUNT(*)
-43
+48
 SELECT COUNT(*) FROM information_schema. views                                 ;
 COUNT(*)
 3
 SELECT COUNT(*) FROM information_schema. user_privileges                       ;
 COUNT(*)
-75
+81
 SELECT COUNT(*) FROM information_schema. schema_privileges                     ;
 COUNT(*)
-28
+32
 SELECT COUNT(*) FROM information_schema. table_privileges                      ;
 COUNT(*)
 0
@@ -4562,17 +5734,18 @@ COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. table_constraints                     ;
 COUNT(*)
-20
+24
 SELECT COUNT(*) FROM information_schema. key_column_usage                      ;
 COUNT(*)
-40
+45
 SELECT COUNT(*) FROM information_schema. triggers                              ;
 COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. parameters ;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT COUNT(*) FROM information_schema. referential_constraints ;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+COUNT(*)
+0
 USE db_datadict;
 DROP VIEW v1, vu1, vu;
 DROP PROCEDURE db_datadict.sp_1;
@@ -4590,10 +5763,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-48
+65
 select count(*) as the_cols from columns;
 the_cols
-617
+802
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -4631,10 +5804,21 @@ information_schema, COLLATIONS
 information_schema, COLLATION_CHARACTER_SET_APPLICABILITY
 information_schema, COLUMNS
 information_schema, COLUMN_PRIVILEGES
+information_schema, ENGINES
+information_schema, EVENTS
+information_schema, FILES
+information_schema, GLOBAL_STATUS
+information_schema, GLOBAL_VARIABLES
 information_schema, KEY_COLUMN_USAGE
+information_schema, PARTITIONS
+information_schema, PLUGINS
+information_schema, PROCESSLIST
+information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
 information_schema, SCHEMA_PRIVILEGES
+information_schema, SESSION_STATUS
+information_schema, SESSION_VARIABLES
 information_schema, STATISTICS
 information_schema, TABLES
 information_schema, TABLE_CONSTRAINTS
@@ -4644,14 +5828,20 @@ information_schema, USER_PRIVILEGES
 information_schema, VIEWS
 mysql, columns_priv
 mysql, db
+mysql, event
 mysql, func
+mysql, general_log
 mysql, help_category
 mysql, help_keyword
 mysql, help_relation
 mysql, help_topic
 mysql, host
+mysql, ndb_binlog_index
+mysql, plugin
 mysql, proc
 mysql, procs_priv
+mysql, servers
+mysql, slow_log
 mysql, tables_priv
 mysql, time_zone
 mysql, time_zone_leap_second
@@ -4697,7 +5887,7 @@ NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
 select sum(ordinal_position) from key_column_usage;
 sum(ordinal_position)
-77
+83
 select * from schemata limit 0,5;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
 NULL	information_schema	utf8	utf8_general_ci	NULL
@@ -4744,6 +5934,8 @@ grantee
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
+'root'@'127.0.0.1'
+'root'@'127.0.0.1'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
@@ -4769,6 +5961,10 @@ grantee
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
+'root'@'<SERVER_NAME>'
+'root'@'<SERVER_NAME>'
+'root'@'localhost'
+'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
@@ -6277,6 +7473,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6292,6 +7489,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6302,6 +7500,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6317,6 +7516,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6327,6 +7527,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6342,6 +7543,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6422,6 +7624,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6437,6 +7640,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6447,6 +7651,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6462,6 +7667,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6472,6 +7678,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6487,6 +7694,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401013'@'localhost'	NULL	USAGE	NO
 select *
@@ -6553,6 +7761,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6568,6 +7777,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6578,6 +7788,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6593,6 +7804,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6603,6 +7815,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6618,6 +7831,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6696,6 +7910,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6711,6 +7926,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6721,6 +7937,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6736,6 +7953,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6746,6 +7964,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6761,6 +7980,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6835,6 +8055,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6850,6 +8071,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6860,6 +8082,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6875,6 +8098,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6885,6 +8109,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6900,6 +8125,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6987,6 +8213,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7002,6 +8229,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7012,6 +8240,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7027,6 +8256,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7037,6 +8267,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7052,6 +8283,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401015'@'localhost'	NULL	USAGE	NO
 select *
@@ -7117,6 +8349,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7132,6 +8365,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7142,6 +8376,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7157,6 +8392,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7167,6 +8403,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7182,6 +8419,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7223,10 +8461,21 @@ information_schema	COLLATIONS	MEMORY
 information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	MEMORY
 information_schema	COLUMNS	MyISAM
 information_schema	COLUMN_PRIVILEGES	MEMORY
+information_schema	ENGINES	MEMORY
+information_schema	EVENTS	MyISAM
+information_schema	FILES	MEMORY
+information_schema	GLOBAL_STATUS	MEMORY
+information_schema	GLOBAL_VARIABLES	MyISAM
 information_schema	KEY_COLUMN_USAGE	MEMORY
+information_schema	PARTITIONS	MyISAM
+information_schema	PLUGINS	MyISAM
+information_schema	PROCESSLIST	MyISAM
+information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
 information_schema	SCHEMA_PRIVILEGES	MEMORY
+information_schema	SESSION_STATUS	MEMORY
+information_schema	SESSION_VARIABLES	MyISAM
 information_schema	STATISTICS	MEMORY
 information_schema	TABLES	MEMORY
 information_schema	TABLE_CONSTRAINTS	MEMORY
@@ -7255,10 +8504,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7285,10 +8545,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7352,6 +8623,7 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
+filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -7366,6 +8638,7 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
+cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -7456,10 +8729,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7498,14 +8782,14 @@ COLUMNS	TABLE_CATALOG	varchar(4096)
 COLUMNS	TABLE_SCHEMA	varchar(64)
 COLUMNS	TABLE_NAME	varchar(64)
 COLUMNS	COLUMN_NAME	varchar(64)
-COLUMNS	ORDINAL_POSITION	bigint(21)
+COLUMNS	ORDINAL_POSITION	bigint(21) unsigned
 COLUMNS	COLUMN_DEFAULT	longtext
 COLUMNS	IS_NULLABLE	varchar(3)
 COLUMNS	DATA_TYPE	varchar(64)
-COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21)
-COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21)
-COLUMNS	NUMERIC_PRECISION	bigint(21)
-COLUMNS	NUMERIC_SCALE	bigint(21)
+COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned
+COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21) unsigned
+COLUMNS	NUMERIC_PRECISION	bigint(21) unsigned
+COLUMNS	NUMERIC_SCALE	bigint(21) unsigned
 COLUMNS	CHARACTER_SET_NAME	varchar(64)
 COLUMNS	COLLATION_NAME	varchar(64)
 COLUMNS	COLUMN_TYPE	longtext
@@ -7520,6 +8804,75 @@ COLUMN_PRIVILEGES	TABLE_NAME	varchar(64)
 COLUMN_PRIVILEGES	COLUMN_NAME	varchar(64)
 COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 COLUMN_PRIVILEGES	IS_GRANTABLE	varchar(3)
+ENGINES	ENGINE	varchar(64)
+ENGINES	SUPPORT	varchar(8)
+ENGINES	COMMENT	varchar(80)
+ENGINES	TRANSACTIONS	varchar(3)
+ENGINES	XA	varchar(3)
+ENGINES	SAVEPOINTS	varchar(3)
+EVENTS	EVENT_CATALOG	varchar(64)
+EVENTS	EVENT_SCHEMA	varchar(64)
+EVENTS	EVENT_NAME	varchar(64)
+EVENTS	DEFINER	varchar(77)
+EVENTS	TIME_ZONE	varchar(64)
+EVENTS	EVENT_BODY	varchar(8)
+EVENTS	EVENT_DEFINITION	longtext
+EVENTS	EVENT_TYPE	varchar(9)
+EVENTS	EXECUTE_AT	datetime
+EVENTS	INTERVAL_VALUE	varchar(256)
+EVENTS	INTERVAL_FIELD	varchar(18)
+EVENTS	SQL_MODE	longtext
+EVENTS	STARTS	datetime
+EVENTS	ENDS	datetime
+EVENTS	STATUS	varchar(18)
+EVENTS	ON_COMPLETION	varchar(12)
+EVENTS	CREATED	datetime
+EVENTS	LAST_ALTERED	datetime
+EVENTS	LAST_EXECUTED	datetime
+EVENTS	EVENT_COMMENT	varchar(64)
+EVENTS	ORIGINATOR	bigint(10)
+FILES	FILE_ID	bigint(4)
+FILES	FILE_NAME	varchar(64)
+FILES	FILE_TYPE	varchar(20)
+FILES	TABLESPACE_NAME	varchar(64)
+FILES	TABLE_CATALOG	varchar(64)
+FILES	TABLE_SCHEMA	varchar(64)
+FILES	TABLE_NAME	varchar(64)
+FILES	LOGFILE_GROUP_NAME	varchar(64)
+FILES	LOGFILE_GROUP_NUMBER	bigint(4)
+FILES	ENGINE	varchar(64)
+FILES	FULLTEXT_KEYS	varchar(64)
+FILES	DELETED_ROWS	bigint(4)
+FILES	UPDATE_COUNT	bigint(4)
+FILES	FREE_EXTENTS	bigint(4)
+FILES	TOTAL_EXTENTS	bigint(4)
+FILES	EXTENT_SIZE	bigint(4)
+FILES	INITIAL_SIZE	bigint(21) unsigned
+FILES	MAXIMUM_SIZE	bigint(21) unsigned
+FILES	AUTOEXTEND_SIZE	bigint(21) unsigned
+FILES	CREATION_TIME	datetime
+FILES	LAST_UPDATE_TIME	datetime
+FILES	LAST_ACCESS_TIME	datetime
+FILES	RECOVER_TIME	bigint(4)
+FILES	TRANSACTION_COUNTER	bigint(4)
+FILES	VERSION	bigint(21) unsigned
+FILES	ROW_FORMAT	varchar(10)
+FILES	TABLE_ROWS	bigint(21) unsigned
+FILES	AVG_ROW_LENGTH	bigint(21) unsigned
+FILES	DATA_LENGTH	bigint(21) unsigned
+FILES	MAX_DATA_LENGTH	bigint(21) unsigned
+FILES	INDEX_LENGTH	bigint(21) unsigned
+FILES	DATA_FREE	bigint(21) unsigned
+FILES	CREATE_TIME	datetime
+FILES	UPDATE_TIME	datetime
+FILES	CHECK_TIME	datetime
+FILES	CHECKSUM	bigint(21) unsigned
+FILES	STATUS	varchar(20)
+FILES	EXTRA	varchar(255)
+GLOBAL_STATUS	VARIABLE_NAME	varchar(64)
+GLOBAL_STATUS	VARIABLE_VALUE	decimal(22,7)
+GLOBAL_VARIABLES	VARIABLE_NAME	varchar(64)
+GLOBAL_VARIABLES	VARIABLE_VALUE	longtext
 KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar(4096)
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar(64)
@@ -7532,6 +8885,60 @@ KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint(10)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar(64)
+PARTITIONS	TABLE_CATALOG	varchar(4096)
+PARTITIONS	TABLE_SCHEMA	varchar(64)
+PARTITIONS	TABLE_NAME	varchar(64)
+PARTITIONS	PARTITION_NAME	varchar(64)
+PARTITIONS	SUBPARTITION_NAME	varchar(64)
+PARTITIONS	PARTITION_ORDINAL_POSITION	bigint(21) unsigned
+PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint(21) unsigned
+PARTITIONS	PARTITION_METHOD	varchar(12)
+PARTITIONS	SUBPARTITION_METHOD	varchar(12)
+PARTITIONS	PARTITION_EXPRESSION	longtext
+PARTITIONS	SUBPARTITION_EXPRESSION	longtext
+PARTITIONS	PARTITION_DESCRIPTION	longtext
+PARTITIONS	TABLE_ROWS	bigint(21) unsigned
+PARTITIONS	AVG_ROW_LENGTH	bigint(21) unsigned
+PARTITIONS	DATA_LENGTH	bigint(21) unsigned
+PARTITIONS	MAX_DATA_LENGTH	bigint(21) unsigned
+PARTITIONS	INDEX_LENGTH	bigint(21) unsigned
+PARTITIONS	DATA_FREE	bigint(21) unsigned
+PARTITIONS	CREATE_TIME	datetime
+PARTITIONS	UPDATE_TIME	datetime
+PARTITIONS	CHECK_TIME	datetime
+PARTITIONS	CHECKSUM	bigint(21) unsigned
+PARTITIONS	PARTITION_COMMENT	varchar(80)
+PARTITIONS	NODEGROUP	varchar(12)
+PARTITIONS	TABLESPACE_NAME	varchar(64)
+PLUGINS	PLUGIN_NAME	varchar(64)
+PLUGINS	PLUGIN_VERSION	varchar(20)
+PLUGINS	PLUGIN_STATUS	varchar(10)
+PLUGINS	PLUGIN_TYPE	varchar(80)
+PLUGINS	PLUGIN_TYPE_VERSION	varchar(20)
+PLUGINS	PLUGIN_LIBRARY	varchar(64)
+PLUGINS	PLUGIN_LIBRARY_VERSION	varchar(20)
+PLUGINS	PLUGIN_AUTHOR	varchar(64)
+PLUGINS	PLUGIN_DESCRIPTION	longtext
+PLUGINS	PLUGIN_LICENSE	varchar(80)
+PROCESSLIST	ID	bigint(4)
+PROCESSLIST	USER	varchar(16)
+PROCESSLIST	HOST	varchar(64)
+PROCESSLIST	DB	varchar(64)
+PROCESSLIST	COMMAND	varchar(16)
+PROCESSLIST	TIME	bigint(7)
+PROCESSLIST	STATE	varchar(64)
+PROCESSLIST	INFO	longtext
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar(4096)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar(64)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar(64)
+REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar(64)
+REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar(64)
+REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar(64)
 ROUTINES	SPECIFIC_NAME	varchar(64)
 ROUTINES	ROUTINE_CATALOG	varchar(4096)
 ROUTINES	ROUTINE_SCHEMA	varchar(64)
@@ -7562,6 +8969,10 @@ SCHEMA_PRIVILEGES	TABLE_CATALOG	varchar(4096)
 SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar(64)
 SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar(3)
+SESSION_STATUS	VARIABLE_NAME	varchar(64)
+SESSION_STATUS	VARIABLE_VALUE	decimal(22,7)
+SESSION_VARIABLES	VARIABLE_NAME	varchar(64)
+SESSION_VARIABLES	VARIABLE_VALUE	longtext
 STATISTICS	TABLE_CATALOG	varchar(4096)
 STATISTICS	TABLE_SCHEMA	varchar(64)
 STATISTICS	TABLE_NAME	varchar(64)
@@ -7582,20 +8993,20 @@ TABLES	TABLE_SCHEMA	varchar(64)
 TABLES	TABLE_NAME	varchar(64)
 TABLES	TABLE_TYPE	varchar(64)
 TABLES	ENGINE	varchar(64)
-TABLES	VERSION	bigint(21)
+TABLES	VERSION	bigint(21) unsigned
 TABLES	ROW_FORMAT	varchar(10)
-TABLES	TABLE_ROWS	bigint(21)
-TABLES	AVG_ROW_LENGTH	bigint(21)
-TABLES	DATA_LENGTH	bigint(21)
-TABLES	MAX_DATA_LENGTH	bigint(21)
-TABLES	INDEX_LENGTH	bigint(21)
-TABLES	DATA_FREE	bigint(21)
-TABLES	AUTO_INCREMENT	bigint(21)
+TABLES	TABLE_ROWS	bigint(21) unsigned
+TABLES	AVG_ROW_LENGTH	bigint(21) unsigned
+TABLES	DATA_LENGTH	bigint(21) unsigned
+TABLES	MAX_DATA_LENGTH	bigint(21) unsigned
+TABLES	INDEX_LENGTH	bigint(21) unsigned
+TABLES	DATA_FREE	bigint(21) unsigned
+TABLES	AUTO_INCREMENT	bigint(21) unsigned
 TABLES	CREATE_TIME	datetime
 TABLES	UPDATE_TIME	datetime
 TABLES	CHECK_TIME	datetime
 TABLES	TABLE_COLLATION	varchar(64)
-TABLES	CHECKSUM	bigint(21)
+TABLES	CHECKSUM	bigint(21) unsigned
 TABLES	CREATE_OPTIONS	varchar(255)
 TABLES	TABLE_COMMENT	varchar(80)
 TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
@@ -7982,6 +9393,7 @@ cp1250_general_ci
 cp1250_czech_cs
 cp1250_croatian_ci
 cp1250_bin
+cp1250_polish_ci
 gbk_chinese_ci
 gbk_bin
 latin5_turkish_ci
@@ -8189,10 +9601,10 @@ MAXLEN	bigint(3)	NO		0
 SHOW CREATE TABLE 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8270,12 +9682,12 @@ SORTLEN	bigint(3)	NO		0
 SHOW CREATE TABLE 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8346,6 +9758,7 @@ cp1250_general_ci	cp1250	26	Yes	Yes	1
 cp1250_czech_cs	cp1250	34		Yes	2
 cp1250_croatian_ci	cp1250	44		Yes	1
 cp1250_bin	cp1250	66		Yes	1
+cp1250_polish_ci	cp1250	99		Yes	1
 gbk_chinese_ci	gbk	28	Yes	Yes	1
 gbk_bin	gbk	87		Yes	1
 latin5_turkish_ci	latin5	30	Yes		0
@@ -8439,8 +9852,8 @@ CHARACTER_SET_NAME	varchar(64)	NO
 SHOW CREATE TABLE 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8493,6 +9906,7 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
+filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -8507,6 +9921,7 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
+cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -8605,13 +10020,13 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE column_privileges;
 Table	Create Table
 COLUMN_PRIVILEGES	CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8717,6 +10132,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_3'@'localhost'	NULL	db_datadict	SHOW VIEW	NO
 'user_3'@'localhost'	NULL	db_datadict	CREATE ROUTINE	NO
 'user_3'@'localhost'	NULL	db_datadict	ALTER ROUTINE	NO
+'user_3'@'localhost'	NULL	db_datadict	EVENT	NO
+'user_3'@'localhost'	NULL	db_datadict	TRIGGER	NO
 SELECT * FROM information_schema.column_privileges
 WHERE grantee LIKE "'user%"
  ORDER BY grantee, table_name, column_name, privilege_type;
@@ -8757,14 +10174,14 @@ TABLE_CATALOG	varchar(4096)	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			
@@ -8775,25 +10192,25 @@ COLUMN_COMMENT	varchar(255)	NO
 SHOW CREATE TABLE columns;
 Table	Create Table
 COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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(20) NOT NULL DEFAULT '',
+  `PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
+  `COLUMN_COMMENT` varchar(255) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8810,14 +10227,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -8865,14 +10282,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -8887,6 +10304,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			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	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			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	SQL_MODE	12		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	ENDS	14	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	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	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	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			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	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_SCHEMA	6	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	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	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DELETED_ROWS	12	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	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			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	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATION_TIME	20	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	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	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	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	TABLE_ROWS	27	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	DATA_LENGTH	29	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	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -8899,6 +10385,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	SUBPARTITION_NAME	5	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_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_LENGTH	15	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	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			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_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_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_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			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	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -8929,6 +10469,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 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	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -8949,20 +10493,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -9035,10 +10579,36 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	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	
 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	Event_priv	21	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	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		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	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			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	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	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	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			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	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	ends	12	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	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
+NULL	mysql	event	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	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			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	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			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	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			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	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+NULL	mysql	general_log	argument	6	NULL	YES	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	
@@ -9072,6 +10642,16 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	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	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	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			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	inserts	4	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	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	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			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	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			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	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		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	
@@ -9096,13 +10676,33 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 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	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			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	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			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	Username	4		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	Socket	7		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	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	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	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			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	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			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	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
+NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	server_id	10	NULL	YES	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	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		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	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	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	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		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	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	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	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			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	
@@ -9147,14 +10747,16 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			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	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			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	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_connections	36	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	Event_priv	30	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	ssl_type	32		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	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	
+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_connections	38	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	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -9488,14 +11090,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -9510,6 +11112,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			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	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			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	SQL_MODE	12		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	ENDS	14	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	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	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	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			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	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_SCHEMA	6	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	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	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DELETED_ROWS	12	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	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			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	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATION_TIME	20	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	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	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	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	TABLE_ROWS	27	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	DATA_LENGTH	29	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	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9522,6 +11193,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	SUBPARTITION_NAME	5	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_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_LENGTH	15	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	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			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_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_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_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			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	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9552,6 +11277,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 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	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9572,20 +11301,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -9907,14 +11636,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -9929,6 +11658,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			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	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			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	SQL_MODE	12		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	ENDS	14	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	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	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	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			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	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_SCHEMA	6	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	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	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DELETED_ROWS	12	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	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			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	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATION_TIME	20	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	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	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	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	TABLE_ROWS	27	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	DATA_LENGTH	29	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	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9941,6 +11739,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	SUBPARTITION_NAME	5	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_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_LENGTH	15	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	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			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_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_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_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			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	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9971,6 +11823,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 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	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9991,20 +11847,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -10327,7 +12183,9 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 1.0000	enum	latin1	latin1_swedish_ci
 1.0000	set	latin1	latin1_swedish_ci
 1.0000	text	latin1	latin1_swedish_ci
+1.0000	varchar	latin1	latin1_swedish_ci
 1.0000	longtext	utf8	utf8_general_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,
@@ -10412,14 +12270,14 @@ 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
@@ -10434,6 +12292,75 @@ 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)
+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)
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
+3.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 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)
@@ -10446,6 +12373,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	4096	12288	utf8	utf8_general_ci	varchar(4096)
+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	4096	12288	utf8	utf8_general_ci	varchar(4096)
+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	4096	12288	utf8	utf8_general_ci	varchar(4096)
+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	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	ROUTINES	ROUTINE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -10476,6 +12457,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)
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
+3.0000	information_schema	SESSION_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	STATISTICS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 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)
@@ -10496,20 +12481,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	4096	12288	utf8	utf8_general_ci	varchar(4096)
@@ -10582,10 +12567,36 @@ 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	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	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	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
@@ -10619,6 +12630,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')
@@ -10643,13 +12664,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	4096	12288	utf8	utf8_general_ci	varchar(4096)
+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')
@@ -10694,6 +12735,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
@@ -11039,18 +13082,18 @@ REFERENCED_COLUMN_NAME	varchar(64)	YES		NULL
 SHOW CREATE TABLE key_column_usage;
 Table	Create Table
 KEY_COLUMN_USAGE	CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
-  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11111,6 +13154,8 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_keyword	help_keyword_id	1	NULL	NULL	NULL	NULL
@@ -11119,6 +13164,8 @@ NULL	mysql	PRIMARY	NULL	mysql	help_relation	help_topic_id	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -11127,6 +13174,7 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -11188,26 +13236,26 @@ DEFINER	varchar(77)	NO
 SHOW CREATE TABLE routines;
 Table	Create Table
 ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
-  `SPECIFIC_NAME` varchar(64) NOT NULL default '',
-  `ROUTINE_CATALOG` varchar(4096) 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(4096) 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 ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11532,11 +13580,11 @@ SQL_PATH	varchar(4096)	YES		NULL
 SHOW CREATE TABLE schemata;
 Table	Create Table
 SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
-  `CATALOG_NAME` varchar(4096) 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(4096) default NULL
+  `CATALOG_NAME` varchar(4096) 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(4096) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11615,12 +13663,12 @@ CONSTRAINT_TYPE	varchar(64)	NO
 SHOW CREATE TABLE table_constraints;
 Table	Create Table
 TABLE_CONSTRAINTS	CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` (
-  `CONSTRAINT_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11695,12 +13743,12 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE table_privileges;
 Table	Create Table
 TABLE_PRIVILEGES	CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11754,6 +13802,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
+'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = USER();
@@ -11763,7 +13812,7 @@ SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = "'user_2'@'localhost'";
 USER()	COUNT(*)
-user_2@localhost	11
+user_2@localhost	12
 connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -11783,6 +13832,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
+'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 'user_1'@'localhost'	NULL	db_datadict	tb1	SELECT	NO
 'user_3'@'localhost'	NULL	db_datadict	tb3	SELECT	NO
 	
@@ -11805,46 +13855,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 tables;
 Table	Create Table
 TABLES	CREATE TEMPORARY TABLE `TABLES` (
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11862,20 +13912,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 
@@ -11903,22 +13953,33 @@ GRANT SELECT ON db_datadict.v3 to 'user_3'@'localhost';
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -11943,22 +14004,33 @@ connect(localhost,user_2,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -11981,22 +14053,33 @@ connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12020,22 +14103,33 @@ root@localhost	db_datadict
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12045,14 +14139,20 @@ NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	N
 NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	NULL	VIEW
 NULL	mysql	columns_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Column privileges
 NULL	mysql	db	BASE TABLE	MyISAM	10	Fixed	3	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Database privileges
+NULL	mysql	event	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Events
 NULL	mysql	func	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		User defined functions
+NULL	mysql	general_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		General log
 NULL	mysql	help_category	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help categories
 NULL	mysql	help_keyword	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help keywords
 NULL	mysql	help_relation	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		keyword-topic relation
 NULL	mysql	help_topic	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help topics
 NULL	mysql	host	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Host privileges;  Merged with database privileges
+NULL	mysql	ndb_binlog_index	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
+NULL	mysql	plugin	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		MySQL plugins
 NULL	mysql	proc	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Stored Procedures
 NULL	mysql	procs_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Procedure privileges
+NULL	mysql	servers	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		MySQL Foreign Servers table
+NULL	mysql	slow_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Slow log
 NULL	mysql	tables_priv	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Table privileges
 NULL	mysql	time_zone	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	6	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zones
 NULL	mysql	time_zone_leap_second	BASE TABLE	MyISAM	10	Fixed	22	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Leap seconds information for time zones
@@ -12100,14 +14200,14 @@ SECURITY_TYPE	varchar(7)	NO
 SHOW CREATE TABLE views;
 Table	Create Table
 VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) 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 ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12195,21 +14295,21 @@ COMMENT	varchar(16)	YES		NULL
 SHOW CREATE TABLE statistics;
 Table	Create Table
 STATISTICS	CREATE TEMPORARY TABLE `STATISTICS` (
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12287,6 +14387,8 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -12298,6 +14400,8 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
+NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
+NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	0	NULL	NULL		BTREE	
@@ -12307,6 +14411,7 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -12356,11 +14461,11 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE schema_privileges;
 Table	Create Table
 SCHEMA_PRIVILEGES	CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12407,6 +14512,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -12421,6 +14528,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401502,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -12468,6 +14577,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -12482,6 +14593,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401503_1,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -12518,10 +14631,10 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE user_privileges;
 Table	Create Table
 USER_PRIVILEGES	CREATE TEMPORARY TABLE `USER_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) DEFAULT NULL,
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12563,10 +14676,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12586,10 +14699,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12601,10 +14714,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -12628,10 +14741,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12648,10 +14761,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12665,10 +14778,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12680,10 +14793,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	SELECT	YES
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 user_1@localhost
 GRANT SELECT ON *.* TO 'user_1'@'localhost' WITH GRANT OPTION
@@ -12727,10 +14840,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12780,10 +14893,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12795,10 +14908,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -12815,10 +14928,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -12841,10 +14954,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12901,23 +15014,23 @@ DEFINER	longtext	NO
 SHOW CREATE TABLE triggers;
 Table	Create Table
 TRIGGERS	CREATE TEMPORARY TABLE `TRIGGERS` (
-  `TRIGGER_CATALOG` varchar(4096) 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(4096) 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(4096) 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(4096) 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
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -12965,11 +15078,70 @@ ERROR 42S02: Unknown table 'parameters' in information_schema
 
 Testcase 3.2.20.1:
 --------------------------------------------------------------------------------
-
-checking a table that will be implemented later
------------------------------------------------
 DESC referential_constraints;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+Field	Type	Null	Key	Default	Extra
+CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO			
+CONSTRAINT_NAME	varchar(64)	NO			
+UNIQUE_CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
+UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
+UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
+MATCH_OPTION	varchar(64)	NO			
+UPDATE_RULE	varchar(64)	NO			
+DELETE_RULE	varchar(64)	NO			
+TABLE_NAME	varchar(64)	NO			
+REFERENCED_TABLE_NAME	varchar(64)	NO			
+USE information_schema;
+DESC referential_constraints;
+Field	Type	Null	Key	Default	Extra
+CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO			
+CONSTRAINT_NAME	varchar(64)	NO			
+UNIQUE_CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
+UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
+UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
+MATCH_OPTION	varchar(64)	NO			
+UPDATE_RULE	varchar(64)	NO			
+DELETE_RULE	varchar(64)	NO			
+TABLE_NAME	varchar(64)	NO			
+REFERENCED_TABLE_NAME	varchar(64)	NO			
+SHOW CREATE TABLE referential_constraints;
+Table	Create Table
+REFERENTIAL_CONSTRAINTS	CREATE TEMPORARY TABLE `REFERENTIAL_CONSTRAINTS` (
+  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `UNIQUE_CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `UNIQUE_CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `UNIQUE_CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `MATCH_OPTION` varchar(64) NOT NULL DEFAULT '',
+  `UPDATE_RULE` varchar(64) NOT NULL DEFAULT '',
+  `DELETE_RULE` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `REFERENCED_TABLE_NAME` varchar(64) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
+SELECT COUNT(*) FROM information_schema.columns
+WHERE table_schema = 'information_schema'
+  AND table_name   = 'referential_constraints'
+ORDER BY ordinal_position;
+COUNT(*)
+11
+SELECT * FROM information_schema.columns
+WHERE table_schema = 'information_schema'
+  AND table_name   = 'referential_constraints'
+ORDER BY ordinal_position;
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	
 
 *** End of Data Dictionary Tests ***
 --------------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/r/memory_func_view.result b/mysql-test/suite/funcs_1/r/memory_func_view.result
index 50caa20e8c7..ab4508fb302 100644
--- a/mysql-test/suite/funcs_1/r/memory_func_view.result
+++ b/mysql-test/suite/funcs_1/r/memory_func_view.result
@@ -9,7 +9,7 @@ CREATE TABLE t1_values
 id BIGINT AUTO_INCREMENT,
 select_id BIGINT,
 PRIMARY KEY(id)
-) ENGINE = 'MEMORY' ;
+) ENGINE = <engine_to_be_tested>;
 ALTER TABLE t1_values ADD my_char_30        CHAR(30);
 ALTER TABLE t1_values ADD my_varchar_1000   VARCHAR(1000);
 ALTER TABLE t1_values ADD my_binary_30      BINARY(30);
@@ -123,10 +123,8 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '1 17:58';
 INSERT INTO t1_values SET select_id = @select_id,
 my_bigint = 1758;
-
-some statements disabled because of
-Bug#12440: CAST(data type DOUBLE AS TIME) strange results
---------------------------------------------------------------------------------
+INSERT INTO t1_values SET select_id = @select_id,
+my_double = +1.758E+3;
 INSERT INTO t1_values SET select_id = @select_id,
 my_char_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
@@ -135,29 +133,20 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_binary_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '-3333.3333';
-
-some statements disabled because of
-Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian
---------------------------------------------------------------------------------
+INSERT INTO t1_values SET select_id = @select_id,
+my_double = -0.33333333E+4;
 
 "Attention: CAST --> SIGNED INTEGER
-            The file with expected results suffers from
-            Bug#5083 Big integer values are inserted as negative into 
-                     decimal/string columns
             Bug#5913 Traditional mode: BIGINT range not correctly delimited
-            Both have the status: To be fixed later"
---------------------------------------------------------------------------------
-
-some statements disabled because of
-Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result
+            Status: To be fixed later"
 --------------------------------------------------------------------------------
 
 "Attention: CAST --> UNSIGNED INTEGER
-            The file with expected results suffers from Bug 5083 5913 9809"
+            The file with expected results suffers from Bug 5913"
 --------------------------------------------------------------------------------
 
 some statements disabled because of
-Bugs#8663: cant use bgint unsigned as input to cast
+Bug#5913 Traditional mode: BIGINT range not correctly delimited
 --------------------------------------------------------------------------------
 SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values';
@@ -175,11 +164,6 @@ SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values';
-
-"Attention: IF(my_year IS NULL, ...
-            The file with expected results suffers from 
-            Bug#11689. successful CREATE VIEW but SELECT on view fails."
---------------------------------------------------------------------------------
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_varchar_1000),
@@ -202,7 +186,7 @@ SET @my_select =
 'SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values';
 
 "Attention: LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', <numeric column>)
-            The file with expected results suffers from Bug 10963 11728"
+            The file with expected results suffers from Bug 10963"
             and the testcases with length = BIGINT or DOUBLE column are deactivated,
 because there are 32/64 Bit differences
 --------------------------------------------------------------------------------
@@ -216,8 +200,9 @@ SET @my_select = 'SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
+SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 SET @my_select = 
-'SELECT LOAD_FILE(''../log/current_test''), id FROM t1_values';
+'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -299,19 +284,19 @@ SET sql_mode = '';
 --------------------------------------------------------------------------------
 CREATE VIEW v1 AS SELECT my_char_30, id FROM t1_values;
 SELECT my_char_30, id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL;
+WHERE select_id = 190 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL);
+WHERE select_id = 190 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values;
 SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL;
+WHERE select_id = 189 OR select_id IS NULL order by id;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -323,7 +308,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select concat(_latin1'A',`t1_values`.`my_char_30`) AS `CONCAT('A',my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL);
+WHERE select_id = 189 OR select_id IS NULL) order by id;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -337,13 +322,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL;
+WHERE select_id = 188 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varbinary_1000`) AS `LTRIM(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL);
+WHERE select_id = 188 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -351,13 +336,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL;
+WHERE select_id = 187 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_binary_30`) AS `LTRIM(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL);
+WHERE select_id = 187 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -365,13 +350,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL;
+WHERE select_id = 186 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varchar_1000`) AS `LTRIM(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL);
+WHERE select_id = 186 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -379,13 +364,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL;
+WHERE select_id = 185 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_char_30`) AS `LTRIM(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL);
+WHERE select_id = 185 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -393,13 +378,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL;
+WHERE select_id = 184 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varbinary_1000`) AS `LOWER(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL);
+WHERE select_id = 184 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -407,13 +392,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL;
+WHERE select_id = 183 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_binary_30`) AS `LOWER(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL);
+WHERE select_id = 183 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -421,13 +406,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL;
+WHERE select_id = 182 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LOWER(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL);
+WHERE select_id = 182 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -435,13 +420,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL;
+WHERE select_id = 181 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_char_30`) AS `LOWER(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL);
+WHERE select_id = 181 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -449,13 +434,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL;
+WHERE select_id = 180 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_decimal`) AS `LOCATE('-', ' - -ABC', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL);
+WHERE select_id = 180 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -463,13 +448,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL;
+WHERE select_id = 179 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_double`) AS `LOCATE('-', ' - -ABC', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL);
+WHERE select_id = 179 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -477,13 +462,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL;
+WHERE select_id = 178 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_bigint`) AS `LOCATE('-', ' - -ABC', my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL);
+WHERE select_id = 178 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -491,13 +476,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL;
+WHERE select_id = 177 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varbinary_1000`,3) AS `LOCATE('-', my_varbinary_1000, 3)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL);
+WHERE select_id = 177 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -505,13 +490,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL;
+WHERE select_id = 176 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_binary_30`,3) AS `LOCATE('-', my_binary_30, 3)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL);
+WHERE select_id = 176 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -519,13 +504,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL;
+WHERE select_id = 175 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varchar_1000`,3) AS `LOCATE('-', my_varchar_1000, 3)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL);
+WHERE select_id = 175 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -533,13 +518,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL;
+WHERE select_id = 174 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_char_30`,3) AS `LOCATE('-', my_char_30, 3)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL);
+WHERE select_id = 174 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -547,13 +532,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL;
+WHERE select_id = 173 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varbinary_1000, my_binary_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL);
+WHERE select_id = 173 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -561,13 +546,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL;
+WHERE select_id = 172 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varbinary_1000, my_varchar_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL);
+WHERE select_id = 172 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -575,13 +560,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL;
+WHERE select_id = 171 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varbinary_1000, my_char_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL);
+WHERE select_id = 171 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -589,13 +574,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL;
+WHERE select_id = 170 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varbinary_1000, my_varbinary_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL);
+WHERE select_id = 170 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -603,13 +588,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL;
+WHERE select_id = 169 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_binary_30, my_varbinary_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL);
+WHERE select_id = 169 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -617,13 +602,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL;
+WHERE select_id = 168 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_binary_30, my_varchar_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL);
+WHERE select_id = 168 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -631,13 +616,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL;
+WHERE select_id = 167 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_binary_30, my_char_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL);
+WHERE select_id = 167 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -645,13 +630,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL;
+WHERE select_id = 166 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_binary_30, my_binary_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL);
+WHERE select_id = 166 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -659,13 +644,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL;
+WHERE select_id = 165 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varchar_1000, my_varbinary_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL);
+WHERE select_id = 165 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -673,13 +658,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL;
+WHERE select_id = 164 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varchar_1000, my_binary_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL);
+WHERE select_id = 164 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -687,13 +672,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL;
+WHERE select_id = 163 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varchar_1000, my_char_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL);
+WHERE select_id = 163 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -701,13 +686,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL;
+WHERE select_id = 162 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varchar_1000, my_varchar_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL);
+WHERE select_id = 162 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -715,13 +700,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL;
+WHERE select_id = 161 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_char_30, my_varbinary_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL);
+WHERE select_id = 161 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -729,13 +714,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL;
+WHERE select_id = 160 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_char_30, my_binary_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL);
+WHERE select_id = 160 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -743,13 +728,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL;
+WHERE select_id = 159 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_char_30, my_varchar_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL);
+WHERE select_id = 159 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -757,13 +742,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values;
 SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL;
+WHERE select_id = 158 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_char_30, my_char_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL);
+WHERE select_id = 158 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -771,13 +756,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL;
+WHERE select_id = 157 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varbinary_1000`) AS `LOCATE('char', my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL);
+WHERE select_id = 157 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -785,13 +770,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL;
+WHERE select_id = 156 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_binary_30`) AS `LOCATE('char', my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL);
+WHERE select_id = 156 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -799,13 +784,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL;
+WHERE select_id = 155 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varchar_1000`) AS `LOCATE('char', my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL);
+WHERE select_id = 155 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -813,46 +798,46 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL;
+WHERE select_id = 154 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `LOCATE('char', my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL);
+WHERE select_id = 154 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../log/current_test'), id FROM t1_values;
-SELECT LOAD_FILE('../log/current_test'), id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL;
-LOAD_FILE('../log/current_test')	id
-CURRENT_TEST: memory_func_view
+CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
+SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+WHERE select_id = 153 OR select_id IS NULL order by id;
+LOAD_FILE('../tmp/func_view.dat')	id
+äÄ@
 	1
-CURRENT_TEST: memory_func_view
+äÄ@
 	2
-CURRENT_TEST: memory_func_view
+äÄ@
 	3
-CURRENT_TEST: memory_func_view
+äÄ@
 	4
-CURRENT_TEST: memory_func_view
+äÄ@
 	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../log/current_test') AS `LOAD_FILE('../log/current_test')`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL);
-LOAD_FILE('../log/current_test')	id
-CURRENT_TEST: memory_func_view
+WHERE select_id = 153 OR select_id IS NULL) order by id;
+LOAD_FILE('../tmp/func_view.dat')	id
+äÄ@
 	1
-CURRENT_TEST: memory_func_view
+äÄ@
 	2
-CURRENT_TEST: memory_func_view
+äÄ@
 	3
-CURRENT_TEST: memory_func_view
+äÄ@
 	4
-CURRENT_TEST: memory_func_view
+äÄ@
 	5
 DROP VIEW v1;
 
@@ -861,13 +846,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL;
+WHERE select_id = 152 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varbinary_1000`) AS `LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL);
+WHERE select_id = 152 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -875,13 +860,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL;
+WHERE select_id = 151 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_binary_30`) AS `LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL);
+WHERE select_id = 151 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -889,13 +874,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL;
+WHERE select_id = 150 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varchar_1000`) AS `LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL);
+WHERE select_id = 150 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -903,19 +888,19 @@ CREATE VIEW v1 AS SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL;
+WHERE select_id = 149 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_char_30`) AS `LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL);
+WHERE select_id = 149 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values;
 SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL;
+WHERE select_id = 148 OR select_id IS NULL order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -930,7 +915,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(_latin1'AaBbCcDdEeFfGgHhIiJj������',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL);
+WHERE select_id = 148 OR select_id IS NULL) order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -945,7 +930,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values;
 SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL;
+WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -957,7 +942,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varbinary_1000`,2) AS `LEFT(my_varbinary_1000, 2)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL);
+WHERE select_id = 147 OR select_id IS NULL) order by id;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -969,7 +954,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values;
 SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL;
+WHERE select_id = 146 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 
@@ -981,7 +966,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL);
+WHERE select_id = 146 OR select_id IS NULL) order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 
@@ -993,7 +978,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values;
 SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL;
+WHERE select_id = 145 OR select_id IS NULL order by id;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1005,7 +990,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varchar_1000`,2) AS `LEFT(my_varchar_1000, 2)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL);
+WHERE select_id = 145 OR select_id IS NULL) order by id;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1017,7 +1002,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values;
 SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL;
+WHERE select_id = 144 OR select_id IS NULL order by id;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1029,7 +1014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_char_30`,2) AS `LEFT(my_char_30, 2)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL);
+WHERE select_id = 144 OR select_id IS NULL) order by id;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1043,13 +1028,13 @@ CREATE VIEW v1 AS SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL;
+WHERE select_id = 143 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LCASE(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL);
+WHERE select_id = 143 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1057,13 +1042,13 @@ CREATE VIEW v1 AS SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values;
 SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL;
+WHERE select_id = 142 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `INSTR(my_char_30, 'char')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL);
+WHERE select_id = 142 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1071,7 +1056,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL;
+WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1083,7 +1068,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varbinary_1000`) AS `BIT_LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL);
+WHERE select_id = 141 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1097,7 +1082,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL;
+WHERE select_id = 140 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240	
@@ -1109,7 +1094,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL);
+WHERE select_id = 140 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240	
@@ -1123,7 +1108,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL;
+WHERE select_id = 139 OR select_id IS NULL order by id;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1135,7 +1120,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varchar_1000`) AS `BIT_LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL);
+WHERE select_id = 139 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1149,7 +1134,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL;
+WHERE select_id = 138 OR select_id IS NULL order by id;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1161,7 +1146,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_char_30`) AS `BIT_LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL);
+WHERE select_id = 138 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1175,7 +1160,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values;
 SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL;
+WHERE select_id = 137 OR select_id IS NULL order by id;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1187,7 +1172,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_year`,_latin1'IS_NULL') AS `IFNULL(my_year,'IS_NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL);
+WHERE select_id = 137 OR select_id IS NULL) order by id;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1201,7 +1186,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values;
 SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL;
+WHERE select_id = 136 OR select_id IS NULL order by id;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1213,7 +1198,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_time`,_latin1'IS_NULL') AS `IFNULL(my_time,'IS_NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL);
+WHERE select_id = 136 OR select_id IS NULL) order by id;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1227,7 +1212,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values;
 SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL;
+WHERE select_id = 135 OR select_id IS NULL order by id;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1239,7 +1224,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_timestamp`,_latin1'IS_NULL') AS `IFNULL(my_timestamp,'IS_NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL);
+WHERE select_id = 135 OR select_id IS NULL) order by id;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1253,7 +1238,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values;
 SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL;
+WHERE select_id = 134 OR select_id IS NULL order by id;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1265,7 +1250,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_date`,_latin1'IS_NULL') AS `IFNULL(my_date,'IS_NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL);
+WHERE select_id = 134 OR select_id IS NULL) order by id;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1279,7 +1264,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values;
 SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL;
+WHERE select_id = 133 OR select_id IS NULL order by id;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1291,7 +1276,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_datetime`,_latin1'IS_NULL') AS `IFNULL(my_datetime,'IS_NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL);
+WHERE select_id = 133 OR select_id IS NULL) order by id;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1305,7 +1290,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values;
 SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL;
+WHERE select_id = 132 OR select_id IS NULL order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1317,7 +1302,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_double`,_latin1'IS_NULL') AS `IFNULL(my_double,'IS_NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL);
+WHERE select_id = 132 OR select_id IS NULL) order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1331,7 +1316,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values;
 SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL;
+WHERE select_id = 131 OR select_id IS NULL order by id;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1343,7 +1328,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_decimal`,_latin1'IS_NULL') AS `IFNULL(my_decimal,'IS_NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL);
+WHERE select_id = 131 OR select_id IS NULL) order by id;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1357,7 +1342,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values;
 SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL;
+WHERE select_id = 130 OR select_id IS NULL order by id;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1369,7 +1354,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_bigint`,_latin1'IS_NULL') AS `IFNULL(my_bigint,'IS_NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL);
+WHERE select_id = 130 OR select_id IS NULL) order by id;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1383,7 +1368,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL;
+WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1395,7 +1380,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varbinary_1000`,_latin1'IS_NULL') AS `IFNULL(my_varbinary_1000,'IS_NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL);
+WHERE select_id = 129 OR select_id IS NULL) order by id;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1409,7 +1394,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values;
 SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL;
+WHERE select_id = 128 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 
@@ -1421,7 +1406,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,_latin1'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL);
+WHERE select_id = 128 OR select_id IS NULL) order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 
@@ -1435,7 +1420,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values;
 SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL;
+WHERE select_id = 127 OR select_id IS NULL order by id;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1447,7 +1432,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varchar_1000`,_latin1'IS_NULL') AS `IFNULL(my_varchar_1000,'IS_NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL);
+WHERE select_id = 127 OR select_id IS NULL) order by id;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1461,7 +1446,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values;
 SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL;
+WHERE select_id = 126 OR select_id IS NULL order by id;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1473,7 +1458,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_char_30`,_latin1'IS_NULL') AS `IFNULL(my_char_30,'IS_NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL);
+WHERE select_id = 126 OR select_id IS NULL) order by id;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1487,7 +1472,7 @@ CREATE VIEW v1 AS SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values;
 SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL;
+WHERE select_id = 125 OR select_id IS NULL order by id;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1501,7 +1486,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL);
+WHERE select_id = 125 OR select_id IS NULL) order by id;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1516,7 +1501,7 @@ CREATE VIEW v1 AS SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values;
 SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL;
+WHERE select_id = 124 OR select_id IS NULL order by id;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1530,7 +1515,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL);
+WHERE select_id = 124 OR select_id IS NULL) order by id;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1545,7 +1530,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL;
+WHERE select_id = 123 OR select_id IS NULL order by id;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1559,7 +1544,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL);
+WHERE select_id = 123 OR select_id IS NULL) order by id;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1574,7 +1559,7 @@ CREATE VIEW v1 AS SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values;
 SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL;
+WHERE select_id = 122 OR select_id IS NULL order by id;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1588,7 +1573,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL);
+WHERE select_id = 122 OR select_id IS NULL) order by id;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1603,7 +1588,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values;
 SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL;
+WHERE select_id = 121 OR select_id IS NULL order by id;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1617,7 +1602,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL);
+WHERE select_id = 121 OR select_id IS NULL) order by id;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1632,7 +1617,7 @@ CREATE VIEW v1 AS SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values;
 SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL;
+WHERE select_id = 120 OR select_id IS NULL order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1646,7 +1631,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL);
+WHERE select_id = 120 OR select_id IS NULL) order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1661,7 +1646,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values;
 SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL;
+WHERE select_id = 119 OR select_id IS NULL order by id;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1675,7 +1660,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL);
+WHERE select_id = 119 OR select_id IS NULL) order by id;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1690,7 +1675,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values;
 SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL;
+WHERE select_id = 118 OR select_id IS NULL order by id;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1704,7 +1689,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL);
+WHERE select_id = 118 OR select_id IS NULL) order by id;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1719,7 +1704,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL;
+WHERE select_id = 117 OR select_id IS NULL order by id;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1733,7 +1718,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL);
+WHERE select_id = 117 OR select_id IS NULL) order by id;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1748,7 +1733,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL;
+WHERE select_id = 116 OR select_id IS NULL order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1762,7 +1747,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL);
+WHERE select_id = 116 OR select_id IS NULL) order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1777,7 +1762,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL;
+WHERE select_id = 115 OR select_id IS NULL order by id;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1791,7 +1776,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL);
+WHERE select_id = 115 OR select_id IS NULL) order by id;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1806,7 +1791,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values;
 SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL;
+WHERE select_id = 114 OR select_id IS NULL order by id;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1820,7 +1805,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL);
+WHERE select_id = 114 OR select_id IS NULL) order by id;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1835,7 +1820,7 @@ CREATE VIEW v1 AS SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values;
 SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL;
+WHERE select_id = 113 OR select_id IS NULL order by id;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1847,7 +1832,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_year`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_year, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL);
+WHERE select_id = 113 OR select_id IS NULL) order by id;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1861,7 +1846,7 @@ CREATE VIEW v1 AS SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values;
 SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL;
+WHERE select_id = 112 OR select_id IS NULL order by id;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1873,7 +1858,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_time`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_time, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL);
+WHERE select_id = 112 OR select_id IS NULL) order by id;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1887,7 +1872,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL;
+WHERE select_id = 111 OR select_id IS NULL order by id;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1899,7 +1884,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_timestamp`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL);
+WHERE select_id = 111 OR select_id IS NULL) order by id;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1913,7 +1898,7 @@ CREATE VIEW v1 AS SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values;
 SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL;
+WHERE select_id = 110 OR select_id IS NULL order by id;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1925,7 +1910,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_date`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_date, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL);
+WHERE select_id = 110 OR select_id IS NULL) order by id;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1939,7 +1924,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values;
 SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL;
+WHERE select_id = 109 OR select_id IS NULL order by id;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1951,7 +1936,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_datetime`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL);
+WHERE select_id = 109 OR select_id IS NULL) order by id;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1965,7 +1950,7 @@ CREATE VIEW v1 AS SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values;
 SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL;
+WHERE select_id = 108 OR select_id IS NULL order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1977,7 +1962,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_double`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_double, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL);
+WHERE select_id = 108 OR select_id IS NULL) order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1991,7 +1976,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values;
 SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL;
+WHERE select_id = 107 OR select_id IS NULL order by id;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2003,7 +1988,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_decimal`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL);
+WHERE select_id = 107 OR select_id IS NULL) order by id;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2017,7 +2002,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values;
 SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL;
+WHERE select_id = 106 OR select_id IS NULL order by id;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2029,7 +2014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_bigint`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL);
+WHERE select_id = 106 OR select_id IS NULL) order by id;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2043,7 +2028,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL;
+WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2055,7 +2040,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varbinary_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL);
+WHERE select_id = 105 OR select_id IS NULL) order by id;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2069,7 +2054,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL;
+WHERE select_id = 104 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE	
@@ -2086,7 +2071,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_binary_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL);
+WHERE select_id = 104 OR select_id IS NULL) order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE	
@@ -2105,7 +2090,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL;
+WHERE select_id = 103 OR select_id IS NULL order by id;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2117,7 +2102,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varchar_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL);
+WHERE select_id = 103 OR select_id IS NULL) order by id;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2131,7 +2116,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values;
 SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL;
+WHERE select_id = 102 OR select_id IS NULL order by id;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2146,7 +2131,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_char_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL);
+WHERE select_id = 102 OR select_id IS NULL) order by id;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2163,7 +2148,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL;
+WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2175,7 +2160,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using koi8r) AS `CONVERT(my_varbinary_1000 USING koi8r)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL);
+WHERE select_id = 101 OR select_id IS NULL) order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2189,7 +2174,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING koi8r), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL;
+WHERE select_id = 100 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 
@@ -2201,7 +2186,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL);
+WHERE select_id = 100 OR select_id IS NULL) order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 
@@ -2215,7 +2200,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING koi8r), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL;
+WHERE select_id = 99 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2227,7 +2212,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using koi8r) AS `CONVERT(my_varchar_1000 USING koi8r)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL);
+WHERE select_id = 99 OR select_id IS NULL) order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2241,7 +2226,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING koi8r), 
 my_char_30, id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL;
+WHERE select_id = 98 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2253,7 +2238,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using koi8r) AS `CONVERT(my_char_30 USING koi8r)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL);
+WHERE select_id = 98 OR select_id IS NULL) order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2267,7 +2252,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING utf8), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL;
+WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2279,7 +2264,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using utf8) AS `CONVERT(my_varbinary_1000 USING utf8)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL);
+WHERE select_id = 97 OR select_id IS NULL) order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2293,7 +2278,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING utf8), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL;
+WHERE select_id = 96 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 
@@ -2305,7 +2290,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL);
+WHERE select_id = 96 OR select_id IS NULL) order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 
@@ -2319,7 +2304,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING utf8), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL;
+WHERE select_id = 95 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2331,7 +2316,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using utf8) AS `CONVERT(my_varchar_1000 USING utf8)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL);
+WHERE select_id = 95 OR select_id IS NULL) order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2345,7 +2330,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL;
+WHERE select_id = 94 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2357,7 +2342,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using utf8) AS `CONVERT(my_char_30 USING utf8)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL);
+WHERE select_id = 94 OR select_id IS NULL) order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2371,7 +2356,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL;
+WHERE select_id = 93 OR select_id IS NULL order by id;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2383,7 +2368,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as unsigned) AS `CAST(my_year AS UNSIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL);
+WHERE select_id = 93 OR select_id IS NULL) order by id;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2397,7 +2382,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL;
+WHERE select_id = 92 OR select_id IS NULL order by id;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2415,7 +2400,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL);
+WHERE select_id = 92 OR select_id IS NULL) order by id;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2435,7 +2420,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL;
+WHERE select_id = 91 OR select_id IS NULL order by id;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2453,7 +2438,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as unsigned) AS `CAST(my_timestamp AS UNSIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL);
+WHERE select_id = 91 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2473,7 +2458,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL;
+WHERE select_id = 90 OR select_id IS NULL order by id;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2490,7 +2475,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as unsigned) AS `CAST(my_date AS UNSIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL);
+WHERE select_id = 90 OR select_id IS NULL) order by id;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2509,7 +2494,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL;
+WHERE select_id = 89 OR select_id IS NULL order by id;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2526,7 +2511,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as unsigned) AS `CAST(my_datetime AS UNSIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL);
+WHERE select_id = 89 OR select_id IS NULL) order by id;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2545,7 +2530,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL;
+WHERE select_id = 88 OR select_id IS NULL order by id;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2561,7 +2546,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL);
+WHERE select_id = 88 OR select_id IS NULL) order by id;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2579,7 +2564,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL;
+WHERE select_id = 87 OR select_id IS NULL order by id;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2591,7 +2576,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as unsigned) AS `CAST(my_bigint AS UNSIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL);
+WHERE select_id = 87 OR select_id IS NULL) order by id;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2605,7 +2590,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL;
+WHERE select_id = 86 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2622,7 +2607,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as unsigned) AS `CAST(my_varbinary_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL);
+WHERE select_id = 86 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2641,7 +2626,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL;
+WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0	
@@ -2659,7 +2644,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as unsigned) AS `CAST(my_binary_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL);
+WHERE select_id = 85 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0	
@@ -2679,7 +2664,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL;
+WHERE select_id = 84 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2696,7 +2681,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as unsigned) AS `CAST(my_varchar_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL);
+WHERE select_id = 84 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2715,7 +2700,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL;
+WHERE select_id = 83 OR select_id IS NULL order by id;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2732,7 +2717,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as unsigned) AS `CAST(my_char_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL);
+WHERE select_id = 83 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2751,7 +2736,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL;
+WHERE select_id = 82 OR select_id IS NULL order by id;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2763,7 +2748,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as signed) AS `CAST(my_year AS SIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL);
+WHERE select_id = 82 OR select_id IS NULL) order by id;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2777,7 +2762,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL;
+WHERE select_id = 81 OR select_id IS NULL order by id;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2794,7 +2779,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL);
+WHERE select_id = 81 OR select_id IS NULL) order by id;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2813,7 +2798,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL;
+WHERE select_id = 80 OR select_id IS NULL order by id;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2831,7 +2816,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL);
+WHERE select_id = 80 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2851,7 +2836,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL;
+WHERE select_id = 79 OR select_id IS NULL order by id;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2868,7 +2853,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL);
+WHERE select_id = 79 OR select_id IS NULL) order by id;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2887,7 +2872,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL;
+WHERE select_id = 78 OR select_id IS NULL order by id;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2904,7 +2889,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL);
+WHERE select_id = 78 OR select_id IS NULL) order by id;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2919,11 +2904,43 @@ Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS SIGNED INTEGER),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS SIGNED INTEGER),
+my_double, id FROM t1_values
+WHERE select_id = 77 OR select_id IS NULL order by id;
+CAST(my_double AS SIGNED INTEGER)	my_double	id
+NULL	NULL	1
+-9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 77 OR select_id IS NULL) order by id;
+CAST(my_double AS SIGNED INTEGER)	my_double	id
+NULL	NULL	1
+-9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL;
+WHERE select_id = 76 OR select_id IS NULL order by id;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2938,7 +2955,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL);
+WHERE select_id = 76 OR select_id IS NULL) order by id;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2955,7 +2972,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL;
+WHERE select_id = 75 OR select_id IS NULL order by id;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2967,7 +2984,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as signed) AS `CAST(my_bigint AS SIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL);
+WHERE select_id = 75 OR select_id IS NULL) order by id;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2981,7 +2998,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL;
+WHERE select_id = 74 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2997,7 +3014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as signed) AS `CAST(my_varbinary_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL);
+WHERE select_id = 74 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -3015,7 +3032,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL;
+WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0	
@@ -3032,7 +3049,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as signed) AS `CAST(my_binary_30 AS SIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL);
+WHERE select_id = 73 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0	
@@ -3051,7 +3068,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL;
+WHERE select_id = 72 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3067,7 +3084,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as signed) AS `CAST(my_varchar_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL);
+WHERE select_id = 72 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3085,7 +3102,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL;
+WHERE select_id = 71 OR select_id IS NULL order by id;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3101,7 +3118,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as signed) AS `CAST(my_char_30 AS SIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL);
+WHERE select_id = 71 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3119,25 +3136,25 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL;
+WHERE select_id = 70 OR select_id IS NULL order by id;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901.00	1901	2
-2155.00	2155	3
-2000.00	2000	4
-2005.00	2005	5
+1901	1901	2
+2155	2155	3
+2000	2000	4
+2005	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL);
+WHERE select_id = 70 OR select_id IS NULL) order by id;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901.00	1901	2
-2155.00	2155	3
-2000.00	2000	4
-2005.00	2005	5
+1901	1901	2
+2155	2155	3
+2000	2000	4
+2005	2005	5
 DROP VIEW v1;
 
 
@@ -3145,25 +3162,25 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL;
+WHERE select_id = 69 OR select_id IS NULL order by id;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959.00	-838:59:59	2
-8385959.00	838:59:59	3
-130000.00	13:00:00	4
-100000.00	10:00:00	5
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL);
+WHERE select_id = 69 OR select_id IS NULL) order by id;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959.00	-838:59:59	2
-8385959.00	838:59:59	3
-130000.00	13:00:00	4
-100000.00	10:00:00	5
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;
 
 
@@ -3171,25 +3188,35 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL;
+WHERE select_id = 68 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0.00	0000-00-00 00:00:00	1
-19700101030001.00	1970-01-01 03:00:01	2
-20380101025959.00	2038-01-01 02:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+0	0000-00-00 00:00:00	1
+9999999999	1970-01-01 03:00:01	2
+9999999999	2038-01-01 02:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL);
+WHERE select_id = 68 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0.00	0000-00-00 00:00:00	1
-19700101030001.00	1970-01-01 03:00:01	2
-20380101025959.00	2038-01-01 02:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+0	0000-00-00 00:00:00	1
+9999999999	1970-01-01 03:00:01	2
+9999999999	2038-01-01 02:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3197,25 +3224,25 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL;
+WHERE select_id = 67 OR select_id IS NULL order by id;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101.00	0001-01-01	2
-99991231.00	9999-12-31	3
-20040229.00	2004-02-29	4
-20050628.00	2005-06-28	5
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL);
+WHERE select_id = 67 OR select_id IS NULL) order by id;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101.00	0001-01-01	2
-99991231.00	9999-12-31	3
-20040229.00	2004-02-29	4
-20050628.00	2005-06-28	5
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -3223,25 +3250,73 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL;
+WHERE select_id = 66 OR select_id IS NULL order by id;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-10101000000.00	0001-01-01 00:00:00	2
-99991231235959.00	9999-12-31 23:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+9999999999	0001-01-01 00:00:00	2
+9999999999	9999-12-31 23:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL);
+WHERE select_id = 66 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-10101000000.00	0001-01-01 00:00:00	2
-99991231235959.00	9999-12-31 23:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+9999999999	0001-01-01 00:00:00	2
+9999999999	9999-12-31 23:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+DROP VIEW v1;
+
+
+CREATE VIEW v1 AS SELECT CAST(my_double AS DECIMAL),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS DECIMAL),
+my_double, id FROM t1_values
+WHERE select_id = 65 OR select_id IS NULL order by id;
+CAST(my_double AS DECIMAL)	my_double	id
+NULL	NULL	1
+-9999999999	-1.7976931348623e+308	2
+9999999999	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+-3333	-3333.3333	30
+Warnings:
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as decimal) AS `CAST(my_double AS DECIMAL)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 65 OR select_id IS NULL) order by id;
+CAST(my_double AS DECIMAL)	my_double	id
+NULL	NULL	1
+-9999999999	-1.7976931348623e+308	2
+9999999999	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+-3333	-3333.3333	30
+Warnings:
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3249,25 +3324,31 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL;
+WHERE select_id = 64 OR select_id IS NULL order by id;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
-0.00	0.000000000000000000000000000000	4
--1.00	-1.000000000000000000000000000000	5
+-9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
+0	0.000000000000000000000000000000	4
+-1	-1.000000000000000000000000000000	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL);
+WHERE select_id = 64 OR select_id IS NULL) order by id;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
-0.00	0.000000000000000000000000000000	4
--1.00	-1.000000000000000000000000000000	5
+-9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
+0	0.000000000000000000000000000000	4
+-1	-1.000000000000000000000000000000	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3275,25 +3356,31 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL;
+WHERE select_id = 63 OR select_id IS NULL order by id;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9223372036854775808.00	-9223372036854775808	2
-9223372036854775807.00	9223372036854775807	3
-0.00	0	4
--1.00	-1	5
+-9999999999	-9223372036854775808	2
+9999999999	9223372036854775807	3
+0	0	4
+-1	-1	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL);
+WHERE select_id = 63 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9223372036854775808.00	-9223372036854775808	2
-9223372036854775807.00	9223372036854775807	3
-0.00	0	4
--1.00	-1	5
+-9999999999	-9223372036854775808	2
+9999999999	9223372036854775807	3
+0	0	4
+-1	-1	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3301,14 +3388,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL;
+WHERE select_id = 62 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	28
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	29
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3318,14 +3405,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL);
+WHERE select_id = 62 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	28
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	29
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3337,14 +3424,14 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL;
+WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0.00	
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 
--1.00	-1
--3333.33	-3333.3333
+0	
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$-- 
+-1	-1
+-3333	-3333.3333
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3359,14 +3446,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL);
+WHERE select_id = 61 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0.00	
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 
--1.00	-1
--3333.33	-3333.3333
+0	
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$-- 
+-1	-1
+-3333	-3333.3333
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3383,14 +3470,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL;
+WHERE select_id = 60 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	26
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3400,14 +3487,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL);
+WHERE select_id = 60 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	26
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3419,14 +3506,14 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL;
+WHERE select_id = 59 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$--	4
--1.00	-1	5
--3333.33	-3333.3333	25
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$--	4
+-1	-1	5
+-3333	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3439,14 +3526,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL);
+WHERE select_id = 59 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$--	4
--1.00	-1	5
--3333.33	-3333.3333	25
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$--	4
+-1	-1	5
+-3333	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3461,7 +3548,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL;
+WHERE select_id = 58 OR select_id IS NULL order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3473,7 +3560,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as time) AS `CAST(my_year AS TIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL);
+WHERE select_id = 58 OR select_id IS NULL) order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3487,7 +3574,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL;
+WHERE select_id = 57 OR select_id IS NULL order by id;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3499,7 +3586,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as time) AS `CAST(my_time AS TIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL);
+WHERE select_id = 57 OR select_id IS NULL) order by id;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3513,7 +3600,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL;
+WHERE select_id = 56 OR select_id IS NULL order by id;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3525,7 +3612,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as time) AS `CAST(my_timestamp AS TIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL);
+WHERE select_id = 56 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3539,7 +3626,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL;
+WHERE select_id = 55 OR select_id IS NULL order by id;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3551,7 +3638,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as time) AS `CAST(my_date AS TIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL);
+WHERE select_id = 55 OR select_id IS NULL) order by id;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3565,7 +3652,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL;
+WHERE select_id = 54 OR select_id IS NULL order by id;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3577,7 +3664,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as time) AS `CAST(my_datetime AS TIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL);
+WHERE select_id = 54 OR select_id IS NULL) order by id;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3587,11 +3674,45 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS TIME),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS TIME),
+my_double, id FROM t1_values
+WHERE select_id = 53 OR select_id IS NULL order by id;
+CAST(my_double AS TIME)	my_double	id
+NULL	NULL	1
+NULL	-1.7976931348623e+308	2
+NULL	1.7976931348623e+308	3
+00:00:00	0	4
+-00:00:01	-1	5
+00:17:58	1758	25
+Warnings:
+Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 53 OR select_id IS NULL) order by id;
+CAST(my_double AS TIME)	my_double	id
+NULL	NULL	1
+NULL	-1.7976931348623e+308	2
+NULL	1.7976931348623e+308	3
+00:00:00	0	4
+-00:00:01	-1	5
+00:17:58	1758	25
+Warnings:
+Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL;
+WHERE select_id = 52 OR select_id IS NULL order by id;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3607,7 +3728,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL);
+WHERE select_id = 52 OR select_id IS NULL) order by id;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3625,7 +3746,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL;
+WHERE select_id = 51 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3642,7 +3763,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as time) AS `CAST(my_varbinary_1000 AS TIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL);
+WHERE select_id = 51 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3661,7 +3782,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL;
+WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00	
@@ -3680,7 +3801,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as time) AS `CAST(my_binary_30 AS TIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL);
+WHERE select_id = 50 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00	
@@ -3701,7 +3822,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL;
+WHERE select_id = 49 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3718,7 +3839,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as time) AS `CAST(my_varchar_1000 AS TIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL);
+WHERE select_id = 49 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3737,7 +3858,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL;
+WHERE select_id = 48 OR select_id IS NULL order by id;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3754,7 +3875,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as time) AS `CAST(my_char_30 AS TIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL);
+WHERE select_id = 48 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3773,7 +3894,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL;
+WHERE select_id = 47 OR select_id IS NULL order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3781,16 +3902,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as datetime) AS `CAST(my_year AS DATETIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL);
+WHERE select_id = 47 OR select_id IS NULL) order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3798,10 +3919,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -3809,35 +3930,31 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL;
+WHERE select_id = 46 OR select_id IS NULL order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 00:00:00	13:00:00	4
-0000-00-00 00:00:00	10:00:00	5
+0000-00-00 13:00:00	13:00:00	4
+0000-00-00 10:00:00	10:00:00	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL);
+WHERE select_id = 46 OR select_id IS NULL) order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 00:00:00	13:00:00	4
-0000-00-00 00:00:00	10:00:00	5
+0000-00-00 13:00:00	13:00:00	4
+0000-00-00 10:00:00	10:00:00	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
 DROP VIEW v1;
 
 
@@ -3845,7 +3962,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL;
+WHERE select_id = 45 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3857,7 +3974,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as datetime) AS `CAST(my_timestamp AS DATETIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL);
+WHERE select_id = 45 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3871,7 +3988,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL;
+WHERE select_id = 44 OR select_id IS NULL order by id;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -3883,7 +4000,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as datetime) AS `CAST(my_date AS DATETIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL);
+WHERE select_id = 44 OR select_id IS NULL) order by id;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -3897,7 +4014,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL;
+WHERE select_id = 43 OR select_id IS NULL order by id;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -3909,7 +4026,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as datetime) AS `CAST(my_datetime AS DATETIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL);
+WHERE select_id = 43 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -3923,7 +4040,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL;
+WHERE select_id = 42 OR select_id IS NULL order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -3932,17 +4049,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL);
+WHERE select_id = 42 OR select_id IS NULL) order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -3951,11 +4068,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -3963,7 +4080,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL;
+WHERE select_id = 41 OR select_id IS NULL order by id;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3972,17 +4089,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL);
+WHERE select_id = 41 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3991,11 +4108,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -4003,7 +4120,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL;
+WHERE select_id = 40 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4012,16 +4129,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as datetime) AS `CAST(my_varbinary_1000 AS DATETIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL);
+WHERE select_id = 40 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4030,10 +4147,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4041,7 +4158,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL;
+WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL	
@@ -4050,17 +4167,17 @@ NULL	 ---äÖüß@µ*$-- 
 NULL	-1
 2005-06-27 17:58:00	2005-06-27 17:58
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as datetime) AS `CAST(my_binary_30 AS DATETIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL);
+WHERE select_id = 39 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL	
@@ -4069,10 +4186,10 @@ NULL	 ---äÖüß@µ*$-- 
 NULL	-1
 2005-06-27 17:58:00	2005-06-27 17:58
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 DROP VIEW v1;
 
@@ -4081,7 +4198,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL;
+WHERE select_id = 38 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4090,16 +4207,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as datetime) AS `CAST(my_varchar_1000 AS DATETIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL);
+WHERE select_id = 38 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4108,10 +4225,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4119,7 +4236,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL;
+WHERE select_id = 37 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4128,16 +4245,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$--'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as datetime) AS `CAST(my_char_30 AS DATETIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL);
+WHERE select_id = 37 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4146,10 +4263,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$--'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4157,7 +4274,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL;
+WHERE select_id = 36 OR select_id IS NULL order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4165,16 +4282,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as date) AS `CAST(my_year AS DATE)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL);
+WHERE select_id = 36 OR select_id IS NULL) order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4182,10 +4299,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -4193,7 +4310,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL;
+WHERE select_id = 35 OR select_id IS NULL order by id;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4205,7 +4322,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL);
+WHERE select_id = 35 OR select_id IS NULL) order by id;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4219,7 +4336,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL;
+WHERE select_id = 34 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4231,7 +4348,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as date) AS `CAST(my_timestamp AS DATE)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL);
+WHERE select_id = 34 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4245,7 +4362,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL;
+WHERE select_id = 33 OR select_id IS NULL order by id;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4257,7 +4374,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as date) AS `CAST(my_date AS DATE)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL);
+WHERE select_id = 33 OR select_id IS NULL) order by id;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4271,7 +4388,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL;
+WHERE select_id = 32 OR select_id IS NULL order by id;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4283,7 +4400,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as date) AS `CAST(my_datetime AS DATE)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL);
+WHERE select_id = 32 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4297,7 +4414,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL;
+WHERE select_id = 31 OR select_id IS NULL order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4306,16 +4423,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL);
+WHERE select_id = 31 OR select_id IS NULL) order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4324,10 +4441,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4335,7 +4452,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL;
+WHERE select_id = 30 OR select_id IS NULL order by id;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4344,16 +4461,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL);
+WHERE select_id = 30 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4362,10 +4479,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4373,7 +4490,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL;
+WHERE select_id = 29 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4382,16 +4499,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as date) AS `CAST(my_varbinary_1000 AS DATE)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL);
+WHERE select_id = 29 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4400,10 +4517,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4411,7 +4528,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL;
+WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL	
@@ -4420,17 +4537,17 @@ NULL	 ---äÖüß@µ*$-- 
 NULL	-1
 2005-06-27	2005-06-27
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as date) AS `CAST(my_binary_30 AS DATE)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL);
+WHERE select_id = 28 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL	
@@ -4439,10 +4556,10 @@ NULL	 ---äÖüß@µ*$-- 
 NULL	-1
 2005-06-27	2005-06-27
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 DROP VIEW v1;
 
@@ -4451,7 +4568,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL;
+WHERE select_id = 27 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4460,16 +4577,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as date) AS `CAST(my_varchar_1000 AS DATE)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL);
+WHERE select_id = 27 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4478,10 +4595,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4489,7 +4606,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL;
+WHERE select_id = 26 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4498,16 +4615,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$--'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as date) AS `CAST(my_char_30 AS DATE)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL);
+WHERE select_id = 26 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4516,10 +4633,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$--'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4527,7 +4644,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL;
+WHERE select_id = 25 OR select_id IS NULL order by id;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4539,7 +4656,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset latin1) AS `CAST(my_year AS CHAR)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL);
+WHERE select_id = 25 OR select_id IS NULL) order by id;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4553,7 +4670,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL;
+WHERE select_id = 24 OR select_id IS NULL order by id;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4565,7 +4682,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset latin1) AS `CAST(my_time AS CHAR)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL);
+WHERE select_id = 24 OR select_id IS NULL) order by id;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4579,7 +4696,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL;
+WHERE select_id = 23 OR select_id IS NULL order by id;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4591,7 +4708,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset latin1) AS `CAST(my_timestamp AS CHAR)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL);
+WHERE select_id = 23 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4605,7 +4722,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL;
+WHERE select_id = 22 OR select_id IS NULL order by id;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4617,7 +4734,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset latin1) AS `CAST(my_date AS CHAR)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL);
+WHERE select_id = 22 OR select_id IS NULL) order by id;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4631,7 +4748,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL;
+WHERE select_id = 21 OR select_id IS NULL order by id;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4643,7 +4760,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset latin1) AS `CAST(my_datetime AS CHAR)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL);
+WHERE select_id = 21 OR select_id IS NULL) order by id;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4657,7 +4774,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL;
+WHERE select_id = 20 OR select_id IS NULL order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4669,7 +4786,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset latin1) AS `CAST(my_double AS CHAR)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL);
+WHERE select_id = 20 OR select_id IS NULL) order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4683,7 +4800,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL;
+WHERE select_id = 19 OR select_id IS NULL order by id;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4695,7 +4812,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset latin1) AS `CAST(my_decimal AS CHAR)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL);
+WHERE select_id = 19 OR select_id IS NULL) order by id;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4709,7 +4826,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL;
+WHERE select_id = 18 OR select_id IS NULL order by id;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4721,7 +4838,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset latin1) AS `CAST(my_bigint AS CHAR)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL);
+WHERE select_id = 18 OR select_id IS NULL) order by id;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4735,7 +4852,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL;
+WHERE select_id = 17 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4747,7 +4864,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset latin1) AS `CAST(my_varbinary_1000 AS CHAR)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL);
+WHERE select_id = 17 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4761,7 +4878,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL;
+WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 
@@ -4773,7 +4890,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL);
+WHERE select_id = 16 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 
@@ -4787,7 +4904,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL;
+WHERE select_id = 15 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4799,7 +4916,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset latin1) AS `CAST(my_varchar_1000 AS CHAR)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL);
+WHERE select_id = 15 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4813,7 +4930,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL;
+WHERE select_id = 14 OR select_id IS NULL order by id;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4825,7 +4942,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset latin1) AS `CAST(my_char_30 AS CHAR)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL);
+WHERE select_id = 14 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4839,7 +4956,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL;
+WHERE select_id = 13 OR select_id IS NULL order by id;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4851,7 +4968,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset binary) AS `CAST(my_year AS BINARY)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL);
+WHERE select_id = 13 OR select_id IS NULL) order by id;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4865,7 +4982,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL;
+WHERE select_id = 12 OR select_id IS NULL order by id;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4877,7 +4994,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset binary) AS `CAST(my_time AS BINARY)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL);
+WHERE select_id = 12 OR select_id IS NULL) order by id;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4891,7 +5008,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL;
+WHERE select_id = 11 OR select_id IS NULL order by id;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4903,7 +5020,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset binary) AS `CAST(my_timestamp AS BINARY)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL);
+WHERE select_id = 11 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4917,7 +5034,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL;
+WHERE select_id = 10 OR select_id IS NULL order by id;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4929,7 +5046,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset binary) AS `CAST(my_date AS BINARY)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL);
+WHERE select_id = 10 OR select_id IS NULL) order by id;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4943,7 +5060,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL;
+WHERE select_id = 9 OR select_id IS NULL order by id;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4955,7 +5072,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset binary) AS `CAST(my_datetime AS BINARY)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL);
+WHERE select_id = 9 OR select_id IS NULL) order by id;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4969,7 +5086,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL;
+WHERE select_id = 8 OR select_id IS NULL order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4981,7 +5098,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset binary) AS `CAST(my_double AS BINARY)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL);
+WHERE select_id = 8 OR select_id IS NULL) order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4995,7 +5112,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL;
+WHERE select_id = 7 OR select_id IS NULL order by id;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5007,7 +5124,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset binary) AS `CAST(my_decimal AS BINARY)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL);
+WHERE select_id = 7 OR select_id IS NULL) order by id;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5021,7 +5138,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL;
+WHERE select_id = 6 OR select_id IS NULL order by id;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5033,7 +5150,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset binary) AS `CAST(my_bigint AS BINARY)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL);
+WHERE select_id = 6 OR select_id IS NULL) order by id;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5047,7 +5164,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL;
+WHERE select_id = 5 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5059,7 +5176,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset binary) AS `CAST(my_varbinary_1000 AS BINARY)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL);
+WHERE select_id = 5 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5073,7 +5190,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL;
+WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 
@@ -5085,7 +5202,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL);
+WHERE select_id = 4 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 
@@ -5099,7 +5216,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL;
+WHERE select_id = 3 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5111,7 +5228,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset binary) AS `CAST(my_varchar_1000 AS BINARY)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL);
+WHERE select_id = 3 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5125,7 +5242,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL;
+WHERE select_id = 2 OR select_id IS NULL order by id;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5137,7 +5254,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset binary) AS `CAST(my_char_30 AS BINARY)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL);
+WHERE select_id = 2 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5149,7 +5266,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT sqrt(my_bigint), my_bigint, id FROM t1_values;
 SELECT sqrt(my_bigint), my_bigint, id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL;
+WHERE select_id = 1 OR select_id IS NULL order by id;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -5163,7 +5280,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sqrt(`t1_values`.`my_bigint`) AS `sqrt(my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL);
+WHERE select_id = 1 OR select_id IS NULL) order by id;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc.result b/mysql-test/suite/funcs_1/r/memory_storedproc.result
index 94d776c9879..402b527241f 100644
--- a/mysql-test/suite/funcs_1/r/memory_storedproc.result
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc.result
@@ -3,19 +3,16 @@
 .                         IMPORTANT NOTICE:
 .                         -----------------
 .
-.  FIXME: The <engine>_storedproc.result files are still NOT CHECKED
-.         for correctness!
+.  FIXME: The .result files are still NOT CHECKED for correctness!
 .
 .  FIXME: Several tests are affected by known problems around DECIMAL
-.  FIXME: and NUMERIC that needs to be checked again after WL#2984
+.  FIXME: and NUMERIC that will be checked again after WL#2984 once
 .  FIXME: has been completed. Some of them are marked in the result.
 .
-.  This .result file has been checked OK with Linux 5.0.23-bk,
-.  ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
-.
-. This file has been saved although it might contain failures / wrong
-. results to be able to detect _new_ differences in the behaviour.
-. Hopefully the remaining checks can be made soon.
+. Currently (Dec 06, 2005) this .result file is checked OK for Linux
+. with 5.0.17-bk (ChangeSet@1.1975.1.2, 2005-12-05 18:33:48+01:00).
+. Using the available Windows version 5.0.16 there are differences
+. that can be ignored (e.g. WL#2984).
 .
 --------------------------------------------------------------------------------
 	FIXME: There are subtests that are switched off due to known bugs:
@@ -99,20 +96,21 @@ USE db_storedproc;
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
-ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934('aaaa');
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
+f1	f2	f3	f4	f5	f6
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( f1 tinytext ) language sql deterministic sql security definer comment 'this is simple'
   BEGIN
 set @v1 = f1;
 SELECT @v1, @v1;
 END//
-ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( 'abc' );
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
+@v1	@v1
+abc	abc
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 binary ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -121,12 +119,12 @@ SELECT @v1;
 END//
 CALL sp1( 34 );
 @v1
-3
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+34
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 blob ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -139,6 +137,8 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 int )  language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
@@ -151,6 +151,8 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: SP definition accepted with m>60 in DECIMAL(m,n)
@@ -159,19 +161,13 @@ BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
-ERROR 42000: Too big precision 256 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(66, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
-ERROR 42000: Too big precision 66 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(60, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
@@ -179,56 +175,51 @@ SELECT @v1;
 END//
 CALL sp1( 17976931340000 );
 @v1
-17976931340000.000000000000000000000000000000
+17976931340000
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 set("value1", "value1") ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
 CALL sp1( "value1, value1" );
 f1
-value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
-Warning	1265	Data truncated for column 'f1' at row 1
+value1, value1
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) language sql SELECT f1;
 CALL sp1( 'abc' );
@@ -278,9 +269,7 @@ SHOW PROCEDURE status like 'sp1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
 DROP PROCEDURE sp1;
 
 Testcase 4.1.2:
@@ -344,13 +333,11 @@ CREATE FUNCTION fn1( f1 enum("value1", "value1") ) returns decimal(63, 30)  lang
   BEGIN
 return f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SELECT fn1( "value1" );
 fn1( "value1" )
-1.000000000000000000000000000000
+0.000000000000000000000000000000
 Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
+Warning	1292	Truncated incorrect DECIMAL value: 'value1'
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -359,14 +346,11 @@ CREATE FUNCTION fn1( f1 set("value1", "value1") ) returns decimal(63, 30) langua
   BEGIN
 return f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
 SELECT fn1( "value1, value1" );
 fn1( "value1, value1" )
-1.000000000000000000000000000000
+0.000000000000000000000000000000
 Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
-Warning	1265	Data truncated for column 'f1' at row 1
+Warning	1292	Truncated incorrect DECIMAL value: 'value1, value1'
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -457,7 +441,7 @@ CREATE PROCEDURE sp1 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(f1 char(20) )
+sp1		CREATE PROCEDURE `sp1`(f1 char(20) )
 SELECT * from t1 where f2 = f1
 DROP PROCEDURE sp1;
 
@@ -470,7 +454,7 @@ CREATE FUNCTION fn1 (s char(20)) returns char(50)
 return concat('hello, ', s, '!');
 show CREATE FUNCTION fn1;
 Function	sql_mode	Create Function
-fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(s char(20)) RETURNS char(50)
+fn1		CREATE FUNCTION `fn1`(s char(20)) RETURNS char(50)
 return concat('hello, ', s, '!')
 DROP FUNCTION fn1;
 
@@ -514,7 +498,7 @@ CREATE PROCEDURE sp7b (a char (20), out b char(20))
 SELECT f1 into b from t1 where t1.f2= a;
 CALL sp7b('xyz', @out_param);
 Warnings:
-Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data to FETCH
 SELECT @out_param;
 @out_param
 NULL
@@ -527,8 +511,8 @@ END//
 set @c=1;
 CALL sp7c('xyz', @out_param, @c);
 Warnings:
-Warning	1329	No data - zero rows fetched, selected, or processed
-Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data to FETCH
+Warning	1329	No data to FETCH
 SELECT @out_param;
 @out_param
 NULL
@@ -2581,12 +2565,12 @@ alter procedure sp1 sql security definer;
 alter function sp1 sql security definer;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
+sp1		CREATE PROCEDURE `sp1`()
     COMMENT 'this is a procedure'
 set @x= 3
 show CREATE FUNCTION sp1;
 Function	sql_mode	Create Function
-sp1		CREATE DEFINER=`root`@`localhost` FUNCTION `sp1`() RETURNS int(11)
+sp1		CREATE FUNCTION `sp1`() RETURNS int(11)
     COMMENT 'this is a function'
 return 4
 USE db_storedproc;
@@ -4603,9 +4587,6 @@ END begin_label//
 CALL sp1();
 @v1	@v2
 1	2
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
-Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.7:
@@ -4640,9 +4621,6 @@ declare y char;
 SELECT f1, f2 into x, y from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
-Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.9:
@@ -4725,9 +4703,9 @@ fetch cur1 into e;
 SELECT x, y, z, a, b, c, d, e;
 close cur1;
 END//
-ERROR 42000: Too big scale 255 specified for column ''. Maximum is 30.
 CALL sp6();
-ERROR 42000: PROCEDURE db_storedproc.sp6 does not exist
+x	y	z	a	b	c	d	e
+a	1	1.1	value1	1200000000000	mediumtext	2005-02-02 12:12:12	a`
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( )
 BEGIN
@@ -4759,7 +4737,7 @@ BEGIN
 declare x char, integer default '0';
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0';
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -4768,7 +4746,7 @@ BEGIN
 declare x1, x2 char, integer default '0', 1;
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0', 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0', 1;
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -6010,11 +5988,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-000	000	000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6023,7 +5997,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-001	001	001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6050,11 +6024,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000	00000	00000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6063,7 +6033,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00001	00001	00001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6090,11 +6060,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000	00000000	00000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6103,7 +6069,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001	00000001	00000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6130,11 +6096,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6143,7 +6105,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000001	0000000001	0000000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6161,7 +6123,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-18446744073709551615	18446744073709551615	18446744073709551615
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6170,11 +6132,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000000000000000	00000000000000000000	00000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6183,7 +6141,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000000000000001	00000000000000000001	00000000000000000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6192,11 +6150,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--9999999999	-9999999999	-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6207,11 +6161,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6220,11 +6170,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6235,11 +6181,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6250,11 +6192,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6265,11 +6203,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6280,11 +6214,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6295,11 +6225,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6326,7 +6252,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6335,7 +6261,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6344,7 +6270,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.17549e-38	1.17549e-38	1.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6353,7 +6279,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.17549e-38	1.17549e-38	1.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6362,7 +6288,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-01.17549e-38	01.17549e-38	01.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6371,7 +6297,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-01.17549e-38	01.17549e-38	01.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6407,7 +6333,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-2005-02-02 12:20:12	2005-02-02 12:20:12	2005-02-02 12:20:12
+20050202122012	20050202122012	20050202122012
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -12458,13 +12384,10 @@ set @v2 = y;
 END//
 CALL sp1();
 x	y	@x
-NULL	a	3
-Warnings:
-Warning	1265	Data truncated for column 'y' at row 3
-Warning	1265	Data truncated for column 'y' at row 1
+NULL	abaa	3
 SELECT @v1, @v2;
 @v1	@v2
-4	a
+4	a`
 DROP PROCEDURE sp1;
 
 Testcase 4.2.28:
@@ -12531,7 +12454,7 @@ CALL sp1();
 @xx
 0
 Warnings:
-Warning	1264	Out of range value adjusted for column 'xx' at row 1
+Warning	1292	Truncated incorrect INTEGER value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12558,11 +12481,9 @@ set xx = 'temp';
 set @xx = xx;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'xx' at row 1
 SELECT @xx;
 @xx
-t
+temp
 DROP PROCEDURE sp1;
 
 Testcase 4.2.31 - b:
@@ -12580,7 +12501,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1265	Data truncated for column 'xx' at row 1
+Warning	1292	Truncated incorrect DOUBLE value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12606,9 +12527,7 @@ SELECT xx;
 END//
 CALL sp1();
 xx
-0000-00-00 00:00:00
-Warnings:
-Warning	1264	Out of range value adjusted for column 'xx' at row 1
+asd
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12652,7 +12571,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
+Warning	1292	Truncated incorrect INTEGER value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12683,8 +12602,6 @@ declare x char ascii;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12748,8 +12665,6 @@ declare x binary;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12757,8 +12672,6 @@ declare x tinyint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12766,8 +12679,6 @@ declare x tinyint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12775,8 +12686,6 @@ declare x tinyint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12784,8 +12693,6 @@ declare x tinyint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12793,8 +12700,6 @@ declare x smallint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12802,8 +12707,6 @@ declare x smallint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12811,8 +12714,6 @@ declare x smallint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12820,8 +12721,6 @@ declare x smallint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12829,8 +12728,6 @@ declare x mediumint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12838,8 +12735,6 @@ declare x mediumint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12847,8 +12742,6 @@ declare x mediumint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12856,8 +12749,6 @@ declare x mediumint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12865,8 +12756,6 @@ declare x int;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12874,8 +12763,6 @@ declare x int unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12883,8 +12770,6 @@ declare x int zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12892,8 +12777,6 @@ declare x int unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12901,8 +12784,6 @@ declare x bigint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12910,8 +12791,6 @@ declare x bigint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12919,8 +12798,6 @@ declare x bigint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12928,8 +12805,6 @@ declare x bigint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12938,7 +12813,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12947,7 +12822,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12956,7 +12831,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12965,7 +12840,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12974,7 +12849,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12983,7 +12858,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12992,7 +12867,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13001,7 +12876,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13009,8 +12884,6 @@ declare x real;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13018,8 +12891,6 @@ declare x real unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13027,8 +12898,6 @@ declare x real zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13036,8 +12905,6 @@ declare x real unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13045,8 +12912,6 @@ declare x float;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13054,8 +12919,6 @@ declare x float unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13063,8 +12926,6 @@ declare x float zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13072,8 +12933,6 @@ declare x float unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13081,8 +12940,6 @@ declare x date;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13090,8 +12947,6 @@ declare x time;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13099,8 +12954,6 @@ declare x datetime;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13108,8 +12961,6 @@ declare x timestamp;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13117,8 +12968,6 @@ declare x year;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13126,8 +12975,6 @@ declare x year(3);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13135,8 +12982,6 @@ declare x year(4);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13144,8 +12989,6 @@ declare x enum("1enum", "2enum");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13153,8 +12996,6 @@ declare x set("1set", "2set");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.38:
@@ -13802,7 +13643,7 @@ fetch cur1 into newf1, newf2, newf4, newf3;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data - zero rows fetched, selected, or processed
+ERROR 02000: No data to FETCH
 DROP PROCEDURE sp1;
 
 Testcase 4.2.65:
@@ -13828,7 +13669,7 @@ commit;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data - zero rows fetched, selected, or processed
+ERROR 02000: No data to FETCH
 DROP PROCEDURE sp1;
 
 Testcase 4.2.66:
@@ -15085,7 +14926,7 @@ return f1;
 END//
 SELECT fn2(1.84e+19);
 fn2(1.84e+19)
--46744073709551616
+0
 DROP FUNCTION IF EXISTS fn3;
 CREATE FUNCTION fn3( f1 bigint unsigned zerofill) returns bigint unsigned zerofill
 BEGIN
@@ -15104,8 +14945,6 @@ END//
 SELECT fn4(-9.22e+15);
 fn4(-9.22e+15)
 0
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn5;
 CREATE FUNCTION fn5( f1 decimal) returns decimal
 BEGIN
@@ -15133,10 +14972,6 @@ END//
 SELECT fn7(99999999999);
 fn7(99999999999)
 9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn8;
 CREATE FUNCTION fn8( f1 decimal (0) unsigned zerofill) returns decimal (0) unsigned zerofill
 BEGIN
@@ -15145,9 +14980,7 @@ return f1;
 END//
 SELECT fn8(999999999);
 fn8(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn9;
 CREATE FUNCTION fn9( f1 decimal (0) zerofill) returns decimal (0) zerofill
 BEGIN
@@ -15156,10 +14989,7 @@ return f1;
 END//
 SELECT fn9(-1.00e+09);
 fn9(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn10;
 CREATE FUNCTION fn10( f1 decimal (0, 0)) returns decimal (0, 0)
 BEGIN
@@ -15178,10 +15008,6 @@ END//
 SELECT fn11(99999999999);
 fn11(99999999999)
 9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn12;
 CREATE FUNCTION fn12( f1 decimal (0, 0) unsigned zerofill) returns decimal (0, 0) unsigned zerofill
 BEGIN
@@ -15190,9 +15016,7 @@ return f1;
 END//
 SELECT fn12(999999999);
 fn12(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn13;
 CREATE FUNCTION fn13( f1 decimal (0, 0) zerofill) returns decimal (0, 0) zerofill
 BEGIN
@@ -15201,10 +15025,7 @@ return f1;
 END//
 SELECT fn13(-1.00e+09);
 fn13(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn14;
 CREATE FUNCTION fn14( f1 decimal (63, 30)) returns decimal (63, 30)
 BEGIN
@@ -15240,10 +15061,7 @@ return f1;
 END//
 SELECT fn17(-1.00e+21);
 fn17(-1.00e+21)
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+000000000000000000000000000000000.000000000000000000000000000000
 DROP FUNCTION IF EXISTS fn18_d;
 CREATE FUNCTION fn18_d( f1 decimal (64)) returns decimal (64)
 BEGIN
@@ -15279,10 +15097,7 @@ return f1;
 END//
 SELECT fn21_d_z(1.00e+00);
 fn21_d_z(1.00e+00)
-0000000000000000000000000000000000000000000000000000000000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000000000000000000000000000000000000000000000000000000001
 DROP FUNCTION IF EXISTS fn22;
 CREATE FUNCTION fn22( f1 decimal unsigned) returns decimal unsigned
 BEGIN
@@ -15291,10 +15106,7 @@ return f1;
 END//
 SELECT fn22(1.00e+00);
 fn22(1.00e+00)
-10
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn23;
 CREATE FUNCTION fn23( f1 decimal unsigned zerofill) returns decimal unsigned zerofill
 BEGIN
@@ -15303,10 +15115,7 @@ return f1;
 END//
 SELECT fn23(1.00e+00);
 fn23(1.00e+00)
-0000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000001
 DROP FUNCTION IF EXISTS fn24;
 CREATE FUNCTION fn24( f1 decimal zerofill) returns decimal zerofill
 BEGIN
@@ -15315,10 +15124,7 @@ return f1;
 END//
 SELECT fn24(-1.00e+09);
 fn24(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn25;
 CREATE FUNCTION fn25( f1 double) returns double
 BEGIN
@@ -15336,9 +15142,7 @@ return f1;
 END//
 SELECT fn26(1.00e+00);
 fn26(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn27;
 CREATE FUNCTION fn27( f1 double unsigned zerofill) returns double unsigned zerofill
 BEGIN
@@ -15347,9 +15151,7 @@ return f1;
 END//
 SELECT fn27(1.00e+00);
 fn27(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn28;
 CREATE FUNCTION fn28( f1 double zerofill) returns double zerofill
 BEGIN
@@ -15358,9 +15160,7 @@ return f1;
 END//
 SELECT fn28(1.00e+00);
 fn28(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn29;
 CREATE FUNCTION fn29( f1 float) returns float
 BEGIN
@@ -15378,9 +15178,7 @@ return f1;
 END//
 SELECT fn30(1.00e+00);
 fn30(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn31;
 CREATE FUNCTION fn31( f1 float unsigned zerofill) returns float unsigned zerofill
 BEGIN
@@ -15389,9 +15187,7 @@ return f1;
 END//
 SELECT fn31(1.00e+00);
 fn31(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn32;
 CREATE FUNCTION fn32( f1 float zerofill) returns float zerofill
 BEGIN
@@ -15400,9 +15196,7 @@ return f1;
 END//
 SELECT fn32(1.00e+00);
 fn32(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn33;
 CREATE FUNCTION fn33( f1 float(0)) returns float(0)
 BEGIN
@@ -15420,9 +15214,7 @@ return f1;
 END//
 SELECT fn34(1.00e+00);
 fn34(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn35;
 CREATE FUNCTION fn35( f1 float(0) unsigned zerofill) returns float(0) unsigned zerofill
 BEGIN
@@ -15431,9 +15223,7 @@ return f1;
 END//
 SELECT fn35(1.00e+00);
 fn35(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn36;
 CREATE FUNCTION fn36( f1 float(0) zerofill) returns float(0) zerofill
 BEGIN
@@ -15442,9 +15232,7 @@ return f1;
 END//
 SELECT fn36(1.00e+00);
 fn36(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn37;
 CREATE FUNCTION fn37( f1 float(23)) returns float(23)
 BEGIN
@@ -15462,9 +15250,7 @@ return f1;
 END//
 SELECT fn38(1.00e+00);
 fn38(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn39;
 CREATE FUNCTION fn39( f1 float(23) unsigned zerofill) returns float(23) unsigned zerofill
 BEGIN
@@ -15473,9 +15259,7 @@ return f1;
 END//
 SELECT fn39(1.00e+00);
 fn39(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn40;
 CREATE FUNCTION fn40( f1 float(23) zerofill) returns float(23) zerofill
 BEGIN
@@ -15484,9 +15268,7 @@ return f1;
 END//
 SELECT fn40(1.00e+00);
 fn40(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn41;
 CREATE FUNCTION fn41( f1 float(24)) returns float(24)
 BEGIN
@@ -15504,9 +15286,7 @@ return f1;
 END//
 SELECT fn42(1.00e+00);
 fn42(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn43;
 CREATE FUNCTION fn43( f1 float(24) unsigned zerofill) returns float(24) unsigned zerofill
 BEGIN
@@ -15515,9 +15295,7 @@ return f1;
 END//
 SELECT fn43(1.00e+00);
 fn43(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn44;
 CREATE FUNCTION fn44( f1 float(24) zerofill) returns float(24) zerofill
 BEGIN
@@ -15526,9 +15304,7 @@ return f1;
 END//
 SELECT fn44(1.00e+00);
 fn44(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn45;
 CREATE FUNCTION fn45( f1 float(53)) returns float(53)
 BEGIN
@@ -15546,9 +15322,7 @@ return f1;
 END//
 SELECT fn46(1.00e+00);
 fn46(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn47;
 CREATE FUNCTION fn47( f1 float(53) unsigned zerofill) returns float(53) unsigned zerofill
 BEGIN
@@ -15557,9 +15331,7 @@ return f1;
 END//
 SELECT fn47(1.00e+00);
 fn47(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn48;
 CREATE FUNCTION fn48( f1 float(53) zerofill) returns float(53) zerofill
 BEGIN
@@ -15568,9 +15340,7 @@ return f1;
 END//
 SELECT fn48(1.00e+00);
 fn48(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn49;
 CREATE FUNCTION fn49( f1 int) returns int
 BEGIN
@@ -15579,10 +15349,7 @@ return f1;
 END//
 SELECT fn49(-2.15e+09);
 fn49(-2.15e+09)
--2147483638
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-2147483648
 DROP FUNCTION IF EXISTS fn50;
 CREATE FUNCTION fn50( f1 int unsigned) returns int unsigned
 BEGIN
@@ -15618,9 +15385,7 @@ return f1;
 END//
 SELECT fn53(-8388600);
 fn53(-8388600)
--8388598
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388600
 DROP FUNCTION IF EXISTS fn54;
 CREATE FUNCTION fn54( f1 mediumint unsigned) returns mediumint unsigned
 BEGIN
@@ -15647,11 +15412,7 @@ return f1;
 END//
 SELECT fn56(-8388601);
 fn56(-8388601)
-16777215
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn57;
 CREATE FUNCTION fn57( f1 numeric) returns numeric
 BEGIN
@@ -15660,9 +15421,7 @@ return f1;
 END//
 SELECT fn57(-999999999);
 fn57(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn58;
 CREATE FUNCTION fn58( f1 numeric (0)) returns numeric (0)
 BEGIN
@@ -15671,9 +15430,7 @@ return f1;
 END//
 SELECT fn58(-999999999);
 fn58(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn59;
 CREATE FUNCTION fn59( f1 numeric (0) unsigned) returns numeric (0) unsigned
 BEGIN
@@ -15683,9 +15440,6 @@ END//
 SELECT fn59(9999999999);
 fn59(9999999999)
 9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn60;
 CREATE FUNCTION fn60( f1 numeric (0) unsigned zerofill) returns numeric (0) unsigned zerofill
 BEGIN
@@ -15694,9 +15448,7 @@ return f1;
 END//
 SELECT fn60(99999999);
 fn60(99999999)
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0099999999
 DROP FUNCTION IF EXISTS fn61;
 CREATE FUNCTION fn61( f1 numeric (0) zerofill) returns numeric (0) zerofill
 BEGIN
@@ -15705,10 +15457,7 @@ return f1;
 END//
 SELECT fn61(-99999999);
 fn61(-99999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn62;
 CREATE FUNCTION fn62( f1 numeric (0, 0)) returns numeric (0, 0)
 BEGIN
@@ -15717,9 +15466,7 @@ return f1;
 END//
 SELECT fn62(-999999999);
 fn62(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn63;
 CREATE FUNCTION fn63( f1 numeric (0, 0) unsigned) returns numeric (0, 0) unsigned
 BEGIN
@@ -15729,9 +15476,6 @@ END//
 SELECT fn63(9999999999);
 fn63(9999999999)
 9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn64;
 CREATE FUNCTION fn64( f1 numeric (0, 0) unsigned zerofill) returns numeric (0, 0) unsigned zerofill
 BEGIN
@@ -15740,9 +15484,7 @@ return f1;
 END//
 SELECT fn64(99999999);
 fn64(99999999)
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0099999999
 DROP FUNCTION IF EXISTS fn65;
 CREATE FUNCTION fn65( f1 numeric (0, 0) zerofill) returns numeric (0, 0) zerofill
 BEGIN
@@ -15751,10 +15493,7 @@ return f1;
 END//
 SELECT fn65(-99999999);
 fn65(-99999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn66;
 CREATE FUNCTION fn66( f1 numeric (63, 30)) returns numeric (63, 30)
 BEGIN
@@ -15763,12 +15502,7 @@ return f1;
 END//
 SELECT fn66(-1e+36);
 fn66(-1e+36)
--999999999999999999999999999999989.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-999999999999999999999999999999999.999999999999999999999999999999
 DROP FUNCTION IF EXISTS fn67;
 CREATE FUNCTION fn67( f1 numeric (63, 30) unsigned) returns numeric (63, 30) unsigned
 BEGIN
@@ -15778,10 +15512,6 @@ END//
 SELECT fn67(1e+36);
 fn67(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn68;
 CREATE FUNCTION fn68( f1 numeric (63, 30) unsigned zerofill) returns numeric (63, 30) unsigned zerofill
 BEGIN
@@ -15791,10 +15521,6 @@ END//
 SELECT fn68(1e+36);
 fn68(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn69;
 CREATE FUNCTION fn69( f1 numeric (63, 30) zerofill) returns numeric (63, 30) zerofill
 BEGIN
@@ -15803,10 +15529,7 @@ return f1;
 END//
 SELECT fn69(-1e+36);
 fn69(-1e+36)
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+000000000000000000000000000000000.000000000000000000000000000000
 DROP FUNCTION IF EXISTS fn70_n;
 CREATE FUNCTION fn70_n( f1 numeric (64)) returns numeric (64)
 BEGIN
@@ -15854,9 +15577,7 @@ return f1;
 END//
 SELECT fn74(999999999);
 fn74(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999
 DROP FUNCTION IF EXISTS fn75;
 CREATE FUNCTION fn75( f1 numeric unsigned zerofill) returns numeric unsigned zerofill
 BEGIN
@@ -15865,9 +15586,7 @@ return f1;
 END//
 SELECT fn75(999999999);
 fn75(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn76;
 CREATE FUNCTION fn76( f1 numeric zerofill) returns numeric zerofill
 BEGIN
@@ -15876,10 +15595,7 @@ return f1;
 END//
 SELECT fn76(-999999999);
 fn76(-999999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn77;
 CREATE FUNCTION fn77( f1 real) returns real
 BEGIN
@@ -15897,9 +15613,7 @@ return f1;
 END//
 SELECT fn78(1.1);
 fn78(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn79;
 CREATE FUNCTION fn79( f1 real unsigned zerofill) returns real unsigned zerofill
 BEGIN
@@ -15908,9 +15622,7 @@ return f1;
 END//
 SELECT fn79(1.1);
 fn79(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn80;
 CREATE FUNCTION fn80( f1 real zerofill) returns real zerofill
 BEGIN
@@ -15919,9 +15631,7 @@ return f1;
 END//
 SELECT fn80(1.1);
 fn80(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn81;
 CREATE FUNCTION fn81( f1 smallint) returns smallint
 BEGIN
@@ -15957,11 +15667,7 @@ return f1;
 END//
 SELECT fn84(-32601);
 fn84(-32601)
-65535
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn85;
 CREATE FUNCTION fn85( f1 tinyint) returns tinyint
 BEGIN
@@ -15997,11 +15703,7 @@ return f1;
 END//
 SELECT fn88(-101);
 fn88(-101)
-255
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn89;
 CREATE FUNCTION fn89( f1 enum('1enum', '2enum')) returns enum('1enum', '2enum')
 BEGIN
@@ -16057,7 +15759,7 @@ return f1;
 END//
 SELECT fn92( '23:59:59.999999');
 fn92( '23:59:59.999999')
-25:59:59
+26:00:00
 DROP FUNCTION IF EXISTS fn93;
 CREATE FUNCTION fn93( f1 datetime) returns datetime
 BEGIN
@@ -16066,7 +15768,7 @@ return f1;
 END//
 SELECT fn93('1997-12-31 23:59:59.999999');
 fn93('1997-12-31 23:59:59.999999')
-1998-01-02 01:01:00
+1998-01-02 01:01:01
 DROP FUNCTION IF EXISTS fn94;
 CREATE FUNCTION fn94( f1 char) returns char
 BEGIN
@@ -16076,8 +15778,6 @@ END//
 SELECT fn94( 'h');
 fn94( 'h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn95;
 CREATE FUNCTION fn95( f1 char ascii) returns char ascii
 BEGIN
@@ -16087,8 +15787,6 @@ END//
 SELECT fn95('h');
 fn95('h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn96;
 CREATE FUNCTION fn96( f1 char binary) returns char binary
 BEGIN
@@ -16098,8 +15796,6 @@ END//
 SELECT fn96( 'h');
 fn96( 'h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn97;
 CREATE FUNCTION fn97( f1 longtext) returns longtext
 BEGIN
@@ -16221,7 +15917,7 @@ SELECT f1;
 END//
 CALL sp2(1.84e+19);
 f1
-18400000000000000000
+-9223372036854775808
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( f1 bigint unsigned zerofill)
 BEGIN
@@ -16230,7 +15926,7 @@ SELECT f1;
 END//
 CALL sp3(1.84e+17);
 f1
-00184000000000000000
+184000000000000000
 DROP PROCEDURE IF EXISTS sp4;
 CREATE PROCEDURE sp4( f1 bigint zerofill)
 BEGIN
@@ -16239,9 +15935,7 @@ SELECT f1;
 END//
 CALL sp4(-9.22e+15);
 f1
-00000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-9220000000000000
 DROP PROCEDURE IF EXISTS sp5;
 CREATE PROCEDURE sp5( f1 decimal)
 BEGIN
@@ -16253,7 +15947,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: default (10) for DECIMAL not checked, decimal digits shown although not defined
 CALL sp5(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( f1 decimal (0))
 BEGIN
@@ -16265,7 +15959,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp6(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp7;
 CREATE PROCEDURE sp7( f1 decimal (0) unsigned)
 BEGIN
@@ -16274,11 +15968,7 @@ SELECT f1;
 END//
 CALL sp7(99999999999);
 f1
-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+99999999999.000000000
 DROP PROCEDURE IF EXISTS sp8;
 CREATE PROCEDURE sp8( f1 decimal (0) unsigned zerofill)
 BEGIN
@@ -16287,9 +15977,7 @@ SELECT f1;
 END//
 CALL sp8(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp9;
 CREATE PROCEDURE sp9( f1 decimal (0) zerofill)
 BEGIN
@@ -16301,10 +15989,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp9(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp10;
 CREATE PROCEDURE sp10( f1 decimal (0, 0))
 BEGIN
@@ -16316,7 +16001,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp10(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp11;
 CREATE PROCEDURE sp11( f1 decimal (0, 0) unsigned)
 BEGIN
@@ -16328,11 +16013,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp11(99999999999);
 f1
-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+99999999999.000000000
 DROP PROCEDURE IF EXISTS sp12;
 CREATE PROCEDURE sp12( f1 decimal (0, 0) unsigned zerofill)
 BEGIN
@@ -16344,9 +16025,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp12(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp13;
 CREATE PROCEDURE sp13( f1 decimal (0, 0) zerofill)
 BEGIN
@@ -16358,10 +16037,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp13(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp14;
 CREATE PROCEDURE sp14( f1 decimal (63, 30))
 BEGIN
@@ -16373,7 +16049,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp14(-1.00e+21);
 f1
--1000000000000000000000.000000000000000000000000000000
+-1000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp15;
 CREATE PROCEDURE sp15( f1 decimal (63, 30) unsigned)
 BEGIN
@@ -16385,7 +16061,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp15(1.00e+16);
 f1
-10000000000000000.000000000000000000000000000000
+10000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp16;
 CREATE PROCEDURE sp16( f1 decimal (63, 30) unsigned zerofill)
 BEGIN
@@ -16397,7 +16073,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp16(1.00e+16);
 f1
-000000000000000010000000000000000.000000000000000000000000000000
+10000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp17;
 CREATE PROCEDURE sp17( f1 decimal (63, 30) zerofill)
 BEGIN
@@ -16409,10 +16085,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp17(-1.00e+21);
 f1
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp18_d;
 CREATE PROCEDURE sp18_d( f1 decimal (64))
 BEGIN
@@ -16421,7 +16094,7 @@ SELECT f1;
 END//
 CALL sp18_d( -1000000000000000000000000000000 );
 f1
--1000000000000000000000000000000
+-1000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp19_du;
 CREATE PROCEDURE sp19_du( f1 decimal (64) unsigned)
 BEGIN
@@ -16430,10 +16103,10 @@ SELECT f1;
 END//
 CALL sp19_du( 100000000000000000000 );
 f1
-100000000000000000000
+100000000000000000000.000000000
 CALL sp19_du( 1000000000000000000000000 );
 f1
-1000000000000000000000000
+1000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp20_duz;
 CREATE PROCEDURE sp20_duz( f1 decimal (64) unsigned zerofill)
 BEGIN
@@ -16445,10 +16118,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp20_duz( 100000000000000000000 );
 f1
-0000000000000000000000000000000000000000000100000000000000000000
+100000000000000000000.000000000
 CALL sp20_duz( 1000000000000000000000000 );
 f1
-0000000000000000000000000000000000000001000000000000000000000000
+1000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp21;
 CREATE PROCEDURE sp21( f1 decimal (64) zerofill)
 BEGIN
@@ -16460,10 +16133,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp21(1.00e+00);
 f1
-0000000000000000000000000000000000000000000000000000000000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp22;
 CREATE PROCEDURE sp22( f1 decimal unsigned)
 BEGIN
@@ -16475,10 +16145,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp22(1.00e+00);
 f1
-10
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp23;
 CREATE PROCEDURE sp23( f1 decimal unsigned zerofill)
 BEGIN
@@ -16490,10 +16157,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp23(1.00e+00);
 f1
-0000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp24;
 CREATE PROCEDURE sp24( f1 decimal zerofill)
 BEGIN
@@ -16505,10 +16169,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp24(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp25;
 CREATE PROCEDURE sp25( f1 double)
 BEGIN
@@ -16526,9 +16187,7 @@ SELECT f1;
 END//
 CALL sp26(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp27;
 CREATE PROCEDURE sp27( f1 double unsigned zerofill)
 BEGIN
@@ -16537,9 +16196,7 @@ SELECT f1;
 END//
 CALL sp27(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp28;
 CREATE PROCEDURE sp28( f1 double zerofill)
 BEGIN
@@ -16548,9 +16205,7 @@ SELECT f1;
 END//
 CALL sp28(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp29;
 CREATE PROCEDURE sp29( f1 float)
 BEGIN
@@ -16568,9 +16223,7 @@ SELECT f1;
 END//
 CALL sp30(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp31;
 CREATE PROCEDURE sp31( f1 float unsigned zerofill)
 BEGIN
@@ -16579,9 +16232,7 @@ SELECT f1;
 END//
 CALL sp31(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp32;
 CREATE PROCEDURE sp32( f1 float zerofill)
 BEGIN
@@ -16590,9 +16241,7 @@ SELECT f1;
 END//
 CALL sp32(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp33;
 CREATE PROCEDURE sp33( f1 float(0))
 BEGIN
@@ -16610,9 +16259,7 @@ SELECT f1;
 END//
 CALL sp34(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp35;
 CREATE PROCEDURE sp35( f1 float(0) unsigned zerofill)
 BEGIN
@@ -16621,9 +16268,7 @@ SELECT f1;
 END//
 CALL sp35(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp36;
 CREATE PROCEDURE sp36( f1 float(0) zerofill)
 BEGIN
@@ -16632,9 +16277,7 @@ SELECT f1;
 END//
 CALL sp36(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp37;
 CREATE PROCEDURE sp37( f1 float(23))
 BEGIN
@@ -16652,9 +16295,7 @@ SELECT f1;
 END//
 CALL sp38(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp39;
 CREATE PROCEDURE sp39( f1 float(23) unsigned zerofill)
 BEGIN
@@ -16663,9 +16304,7 @@ SELECT f1;
 END//
 CALL sp39(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp40;
 CREATE PROCEDURE sp40( f1 float(23) zerofill)
 BEGIN
@@ -16674,9 +16313,7 @@ SELECT f1;
 END//
 CALL sp40(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp41;
 CREATE PROCEDURE sp41( f1 float(24))
 BEGIN
@@ -16694,9 +16331,7 @@ SELECT f1;
 END//
 CALL sp42(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp43;
 CREATE PROCEDURE sp43( f1 float(24) unsigned zerofill)
 BEGIN
@@ -16705,9 +16340,7 @@ SELECT f1;
 END//
 CALL sp43(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp44;
 CREATE PROCEDURE sp44( f1 float(24) zerofill)
 BEGIN
@@ -16716,9 +16349,7 @@ SELECT f1;
 END//
 CALL sp44(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp45;
 CREATE PROCEDURE sp45( f1 float(53))
 BEGIN
@@ -16736,9 +16367,7 @@ SELECT f1;
 END//
 CALL sp46(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp47;
 CREATE PROCEDURE sp47( f1 float(53) unsigned zerofill)
 BEGIN
@@ -16747,9 +16376,7 @@ SELECT f1;
 END//
 CALL sp47(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp48;
 CREATE PROCEDURE sp48( f1 float(53) zerofill)
 BEGIN
@@ -16758,9 +16385,7 @@ SELECT f1;
 END//
 CALL sp48(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp49;
 CREATE PROCEDURE sp49( f1 int)
 BEGIN
@@ -16769,10 +16394,7 @@ SELECT f1;
 END//
 CALL sp49(-2.15e+09);
 f1
--2147483638
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-2150000000
 DROP PROCEDURE IF EXISTS sp50;
 CREATE PROCEDURE sp50( f1 int unsigned)
 BEGIN
@@ -16799,7 +16421,7 @@ SELECT f1;
 END//
 CALL sp52(2.15e+08);
 f1
-0215000000
+215000000
 DROP PROCEDURE IF EXISTS sp53;
 CREATE PROCEDURE sp53( f1 mediumint)
 BEGIN
@@ -16808,9 +16430,7 @@ SELECT f1;
 END//
 CALL sp53(-8388600);
 f1
--8388598
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388600
 DROP PROCEDURE IF EXISTS sp54;
 CREATE PROCEDURE sp54( f1 mediumint unsigned)
 BEGIN
@@ -16837,11 +16457,7 @@ SELECT f1;
 END//
 CALL sp56(-8388601);
 f1
-16777215
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388602
 DROP PROCEDURE IF EXISTS sp57;
 CREATE PROCEDURE sp57( f1 numeric)
 BEGIN
@@ -16850,9 +16466,7 @@ SELECT f1;
 END//
 CALL sp57(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp58;
 CREATE PROCEDURE sp58( f1 numeric (0))
 BEGIN
@@ -16861,9 +16475,7 @@ SELECT f1;
 END//
 CALL sp58(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp59;
 CREATE PROCEDURE sp59( f1 numeric (0) unsigned)
 BEGIN
@@ -16872,10 +16484,7 @@ SELECT f1;
 END//
 CALL sp59(9999999999);
 f1
-9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+9999999999.000000000
 DROP PROCEDURE IF EXISTS sp60;
 CREATE PROCEDURE sp60( f1 numeric (0) unsigned zerofill)
 BEGIN
@@ -16884,9 +16493,7 @@ SELECT f1;
 END//
 CALL sp60(99999999);
 f1
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+99999999.000000000
 DROP PROCEDURE IF EXISTS sp61;
 CREATE PROCEDURE sp61( f1 numeric (0) zerofill)
 BEGIN
@@ -16895,10 +16502,7 @@ SELECT f1;
 END//
 CALL sp61(-99999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-99999999.000000000
 DROP PROCEDURE IF EXISTS sp62;
 CREATE PROCEDURE sp62( f1 numeric (0, 0))
 BEGIN
@@ -16907,9 +16511,7 @@ SELECT f1;
 END//
 CALL sp62(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp63;
 CREATE PROCEDURE sp63( f1 numeric (0, 0) unsigned)
 BEGIN
@@ -16918,10 +16520,7 @@ SELECT f1;
 END//
 CALL sp63(9999999999);
 f1
-9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+9999999999.000000000
 DROP PROCEDURE IF EXISTS sp64;
 CREATE PROCEDURE sp64( f1 numeric (0, 0) unsigned zerofill)
 BEGIN
@@ -16930,9 +16529,7 @@ SELECT f1;
 END//
 CALL sp64(99999999);
 f1
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+99999999.000000000
 DROP PROCEDURE IF EXISTS sp65;
 CREATE PROCEDURE sp65( f1 numeric (0, 0) zerofill)
 BEGIN
@@ -16941,10 +16538,7 @@ SELECT f1;
 END//
 CALL sp65(-99999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-99999999.000000000
 DROP PROCEDURE IF EXISTS sp66_n;
 CREATE PROCEDURE sp66_n( f1 numeric (63, 30))
 BEGIN
@@ -16953,12 +16547,7 @@ SELECT f1;
 END//
 CALL sp66_n( -1000000000000000000000000000000000000 );
 f1
--999999999999999999999999999999989.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp67_nu;
 CREATE PROCEDURE sp67_nu( f1 numeric (63, 30) unsigned)
 BEGIN
@@ -16967,11 +16556,7 @@ SELECT f1;
 END//
 CALL sp67_nu( 1000000000000000000000000000000000000 );
 f1
-999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp68_nuz;
 CREATE PROCEDURE sp68_nuz( f1 numeric (63, 30) unsigned zerofill)
 BEGIN
@@ -16980,11 +16565,7 @@ SELECT f1;
 END//
 CALL sp68_nuz( 1000000000000000000000000000000000000 );
 f1
-999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp69_n_z;
 CREATE PROCEDURE sp69_n_z( f1 numeric (63, 30) zerofill)
 BEGIN
@@ -16993,10 +16574,7 @@ SELECT f1;
 END//
 CALL sp69_n_z( -1000000000000000000000000000000000000 );
 f1
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp70_n;
 CREATE PROCEDURE sp70_n( f1 numeric (64))
 BEGIN
@@ -17005,7 +16583,7 @@ SELECT f1;
 END//
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
--10000000000000000000000000000000000000000
+-10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp71_nu;
 CREATE PROCEDURE sp71_nu( f1 numeric (64) unsigned)
 BEGIN
@@ -17014,7 +16592,7 @@ SELECT f1;
 END//
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp72_nuz;
 CREATE PROCEDURE sp72_nuz( f1 numeric (64) unsigned zerofill)
 BEGIN
@@ -17023,7 +16601,7 @@ SELECT f1;
 END//
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
-0000000000000000000000010000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp73_n_z;
 CREATE PROCEDURE sp73_n_z( f1 numeric (64) zerofill)
 BEGIN
@@ -17032,7 +16610,7 @@ SELECT f1;
 END//
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
-0000000000000000000000010000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp74;
 CREATE PROCEDURE sp74( f1 numeric unsigned)
 BEGIN
@@ -17041,9 +16619,7 @@ SELECT f1;
 END//
 CALL sp74(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp75;
 CREATE PROCEDURE sp75( f1 numeric unsigned zerofill)
 BEGIN
@@ -17052,9 +16628,7 @@ SELECT f1;
 END//
 CALL sp75(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp76;
 CREATE PROCEDURE sp76( f1 numeric zerofill)
 BEGIN
@@ -17063,10 +16637,7 @@ SELECT f1;
 END//
 CALL sp76(-999999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp77;
 CREATE PROCEDURE sp77( f1 real)
 BEGIN
@@ -17075,7 +16646,7 @@ SELECT f1;
 END//
 CALL sp77(1.1);
 f1
-1.1
+1.10000
 DROP PROCEDURE IF EXISTS sp78;
 CREATE PROCEDURE sp78( f1 real unsigned)
 BEGIN
@@ -17084,9 +16655,7 @@ SELECT f1;
 END//
 CALL sp78(1.1);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp79;
 CREATE PROCEDURE sp79( f1 real unsigned zerofill)
 BEGIN
@@ -17095,9 +16664,7 @@ SELECT f1;
 END//
 CALL sp79(1.1);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp80;
 CREATE PROCEDURE sp80( f1 real zerofill)
 BEGIN
@@ -17106,9 +16673,7 @@ SELECT f1;
 END//
 CALL sp80(1.1);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp81;
 CREATE PROCEDURE sp81( f1 smallint)
 BEGIN
@@ -17144,11 +16709,7 @@ SELECT f1;
 END//
 CALL sp84(-32601);
 f1
-65535
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-32602
 DROP PROCEDURE IF EXISTS sp85;
 CREATE PROCEDURE sp85( f1 tinyint)
 BEGIN
@@ -17184,11 +16745,7 @@ SELECT f1;
 END//
 CALL sp88(-101);
 f1
-255
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-102
 DROP PROCEDURE IF EXISTS sp89;
 DROP PROCEDURE IF EXISTS sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -17208,7 +16765,7 @@ SELECT f1;
 END//
 CALL sp92( '23:59:59.999999');
 f1
-25:59:59
+26:00:00.999997
 DROP PROCEDURE IF EXISTS sp93;
 CREATE PROCEDURE sp93( f1 datetime)
 BEGIN
@@ -17217,7 +16774,7 @@ SELECT f1;
 END//
 CALL sp93('1997-12-31 23:59:59.999999');
 f1
-1998-01-02 01:01:00
+1998-01-02 01:01:01.000001
 DROP PROCEDURE IF EXISTS sp94;
 CREATE PROCEDURE sp94( f1 char)
 BEGIN
@@ -17226,9 +16783,7 @@ SELECT f1;
 END//
 CALL sp94( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp95;
 CREATE PROCEDURE sp95( f1 char ascii)
 BEGIN
@@ -17237,9 +16792,7 @@ SELECT f1;
 END//
 CALL sp95( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp96;
 CREATE PROCEDURE sp96( f1 char binary)
 BEGIN
@@ -17248,9 +16801,7 @@ SELECT f1;
 END//
 CALL sp96( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp97;
 CREATE PROCEDURE sp97( f1 longtext)
 BEGIN
@@ -17295,7 +16846,7 @@ SELECT f1;
 END//
 CALL sp101(51);
 f1
-2061
+61
 DROP PROCEDURE IF EXISTS sp102;
 CREATE PROCEDURE sp102( f1 year(4))
 BEGIN
@@ -17350,8 +16901,6 @@ END//
 CALL sp107(2.00e+13);
 f1
 returned
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 USE db_storedproc;
 DROP DATABASE db1;
 DROP DATABASE IF EXISTS db1;
@@ -17388,9 +16937,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute01();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-2061	2061	2071	2061	2061	2071	2033	2033	2084	2033	2033	2084
+61	61	71	61	61	71	2033	2033	2084	2033	2033	2084
 var1	var2	var3	var4	var5	var6	var7	var8
-2061	2071	2061	2071	2033	2084	2033	2084
+61	71	61	71	2033	2084	2033	2084
 DROP PROCEDURE spexecute01;
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp2;
@@ -17461,9 +17010,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute03();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
+ah	ah	aah	ah	ah	aah	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	helloworld	NULL	helloworld	hellohelloworld
+ah	aah	ah	aah	helloworld	NULL	helloworld	hellohelloworld
 DROP PROCEDURE spexecute03;
 DROP PROCEDURE sp3;
 DROP PROCEDURE IF EXISTS sp4;
@@ -17606,7 +17155,7 @@ SELECT var7, var8;
 END//
 CALL spexecute07();
 var1	var2
-18400000000000000000	NULL
+9223372036854775807	NULL
 var3	var4
 -9220000000000000000	NULL
 var5	var6
@@ -17614,7 +17163,7 @@ var5	var6
 var7	var8
 -9220000000000000000	NULL
 f1	f2	f3
-18400000000000000000	18400000000000000000	NULL
+9223372036854775807	9223372036854775807	NULL
 f4	f5	f6
 -9220000000000000000	-9220000000000000000	NULL
 f7	f8	f9
@@ -17622,7 +17171,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	-9220000000000000000	NULL
 f1	f2	f3
-18353255926290448384	18353255926290448384	18353255926290448384
+-2	-2	-2
 f4	f5	f6
 -9220000000000000000	6744073709551616	6744073709551616
 f7	f8	f9
@@ -17630,7 +17179,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	6744073709551616	6744073709551616
 var1	var2
-18353255926290448384	18353255926290448384
+-2	-2
 var3	var4
 6744073709551616	6744073709551616
 var5	var6
@@ -17688,9 +17237,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute08();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-00368000000000000000	00368000000000000000	00368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+368000000000000000	368000000000000000	368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-00368000000000000000	00368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+368000000000000000	368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute08;
 DROP PROCEDURE sp8;
 DROP PROCEDURE IF EXISTS sp9;
@@ -17742,9 +17291,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute09();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-00000000000000000000	00000000000000000000	00000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-18440000000000000	-18440000000000000	-18439999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-00000000000000000000	00000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-18440000000000000	-18439999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute09;
 DROP PROCEDURE sp9;
 DROP PROCEDURE IF EXISTS sp10;
@@ -17788,9 +17337,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute10();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute10;
 DROP PROCEDURE sp10;
 DROP PROCEDURE IF EXISTS sp11;
@@ -17823,9 +17372,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute11();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000.000000000	1000000000.000000000	1000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000.000000000	1000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute11;
 DROP PROCEDURE sp11;
 DROP PROCEDURE IF EXISTS sp12;
@@ -17858,9 +17407,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute12();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999999.000000000	99999999999.000000000	100000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999999.000000000	100000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute12;
 DROP PROCEDURE sp12;
 DROP PROCEDURE IF EXISTS sp13;
@@ -17893,9 +17442,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute13();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute13;
 DROP PROCEDURE sp13;
 DROP PROCEDURE IF EXISTS sp14;
@@ -17928,9 +17477,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute14();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000000000000000000000000	-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute14;
 DROP PROCEDURE sp14;
 DROP PROCEDURE IF EXISTS sp15;
@@ -17996,9 +17545,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute16();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute16;
 DROP PROCEDURE sp16;
 DROP PROCEDURE IF EXISTS sp17;
@@ -18030,9 +17579,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute17();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute17;
 DROP PROCEDURE sp17;
 DROP PROCEDURE IF EXISTS sp18;
@@ -18064,9 +17613,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute18();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute18;
 DROP PROCEDURE sp18;
 DROP PROCEDURE IF EXISTS sp19;
@@ -18098,9 +17647,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute19();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute19;
 DROP PROCEDURE sp19;
 DROP PROCEDURE IF EXISTS sp20;
@@ -18132,9 +17681,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute20();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute20;
 DROP PROCEDURE sp20;
 DROP PROCEDURE IF EXISTS sp21;
@@ -18166,9 +17715,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute21();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute21;
 DROP PROCEDURE sp21;
 DROP PROCEDURE IF EXISTS sp22;
@@ -18234,9 +17783,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute23();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute23;
 DROP PROCEDURE sp23;
 DROP PROCEDURE IF EXISTS sp24;
@@ -18268,9 +17817,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute24();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.1	1.1	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.1	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute24;
 DROP PROCEDURE sp24;
 DROP PROCEDURE IF EXISTS sp25;
@@ -18302,9 +17851,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute25();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--32758	-32758	-32748	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-65402	-65402	-65392	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--32758	-32748	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-65402	-65392	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute25;
 DROP PROCEDURE sp25;
 DROP PROCEDURE IF EXISTS sp26;
@@ -18370,9 +17919,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute27();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-25:59:59	25:59:59	27:59:59	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+26:00:00.999997	26:00:00.999997	28:00:01.999995	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-25:59:59	27:59:59	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+26:00:00.999997	28:00:01.999995	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute27;
 DROP PROCEDURE sp27;
 DROP PROCEDURE IF EXISTS sp28;
@@ -18404,9 +17953,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute28();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1998-01-02 01:01:00	1998-01-02 01:01:00	1998-01-03 02:02:01	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1998-01-02 01:01:01.000001	1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1998-01-02 01:01:00	1998-01-03 02:02:01	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute28;
 DROP PROCEDURE sp28;
 DROP PROCEDURE IF EXISTS sp29;
@@ -18438,9 +17987,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute29();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute29;
 DROP PROCEDURE sp29;
 DROP PROCEDURE IF EXISTS sp30;
@@ -18472,9 +18021,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute30();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute30;
 DROP PROCEDURE sp30;
 DROP PROCEDURE IF EXISTS sp31;
@@ -18540,9 +18089,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute32();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute32;
 DROP PROCEDURE sp32;
 DROP PROCEDURE IF EXISTS sp33;
@@ -18574,9 +18123,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute33();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute33;
 DROP PROCEDURE sp33;
 DROP PROCEDURE IF EXISTS sp34;
@@ -18642,9 +18191,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute35();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute35;
 DROP PROCEDURE sp35;
 DROP PROCEDURE IF EXISTS sp36;
@@ -18676,9 +18225,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute36();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute36;
 DROP PROCEDURE sp36;
 DROP PROCEDURE IF EXISTS sp37;
@@ -18744,9 +18293,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute38();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute38;
 DROP PROCEDURE sp38;
 DROP PROCEDURE IF EXISTS sp39;
@@ -18778,9 +18327,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute39();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute39;
 DROP PROCEDURE sp39;
 DROP PROCEDURE IF EXISTS sp40;
@@ -18812,9 +18361,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute40();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute40;
 DROP PROCEDURE sp40;
 DROP PROCEDURE IF EXISTS sp41;
@@ -18846,9 +18395,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute41();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute41;
 DROP PROCEDURE sp41;
 DROP PROCEDURE IF EXISTS sp42;
@@ -18880,9 +18429,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute42();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute42;
 DROP PROCEDURE sp42;
 DROP PROCEDURE IF EXISTS sp43;
@@ -18914,9 +18463,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute43();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute43;
 DROP PROCEDURE sp43;
 DROP PROCEDURE IF EXISTS sp44;
@@ -18948,9 +18497,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute44();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute44;
 DROP PROCEDURE sp44;
 DROP PROCEDURE IF EXISTS sp45;
@@ -18982,9 +18531,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute45();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute45;
 DROP PROCEDURE sp45;
 DROP PROCEDURE IF EXISTS sp46;
@@ -19016,9 +18565,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute46();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute46;
 DROP PROCEDURE sp46;
 DROP PROCEDURE IF EXISTS sp47;
@@ -19050,9 +18599,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute47();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute47;
 DROP PROCEDURE sp47;
 DROP PROCEDURE IF EXISTS sp48;
@@ -19084,9 +18633,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute48();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute48;
 DROP PROCEDURE sp48;
 DROP PROCEDURE IF EXISTS sp49;
@@ -19118,9 +18667,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute49();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute49;
 DROP PROCEDURE sp49;
 DROP PROCEDURE IF EXISTS sp50;
@@ -19152,9 +18701,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute50();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute50;
 DROP PROCEDURE sp50;
 DROP PROCEDURE IF EXISTS sp51;
@@ -19186,9 +18735,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute51();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute51;
 DROP PROCEDURE sp51;
 DROP PROCEDURE IF EXISTS sp52;
@@ -19220,9 +18769,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute52();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000000000000000000000000	-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute52;
 DROP PROCEDURE sp52;
 DROP PROCEDURE IF EXISTS sp53;
@@ -19254,9 +18803,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute53();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute53;
 DROP PROCEDURE sp53;
 DROP PROCEDURE IF EXISTS sp54;
@@ -19288,9 +18837,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute54();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute54;
 DROP PROCEDURE sp54;
 DROP PROCEDURE IF EXISTS sp55;
@@ -19322,9 +18871,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute55();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute55;
 DROP PROCEDURE sp55;
 DROP PROCEDURE IF EXISTS sp56;
@@ -19356,9 +18905,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute56();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-2061	2061	2071	2061	2061	2071	2061	2061	2071	2061	2061	2071
+61	61	71	61	61	71	61	61	71	61	61	71
 var1	var2	var3	var4	var5	var6	var7	var8
-2061	2071	2061	2071	2061	2071	2061	2071
+61	71	61	71	61	71	61	71
 DROP PROCEDURE spexecute56;
 DROP PROCEDURE sp56;
 DROP PROCEDURE IF EXISTS sp57;
@@ -19492,9 +19041,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute60();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	a	a	a	a	a	a
+ah	ah	aah	ah	ah	aah	ah	ah	aah	ah	ah	aah
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	a	a	a	a
+ah	aah	ah	aah	ah	aah	ah	aah
 DROP PROCEDURE spexecute60;
 DROP PROCEDURE sp60;
 DROP PROCEDURE IF EXISTS sp61;
@@ -19526,9 +19075,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute61();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	a	a	NULL	a	a	a
+ah	ah	aah	ah	ah	aah	ah	ah	NULL	ah	ah	aah
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	a	NULL	a	a
+ah	aah	ah	aah	ah	NULL	ah	aah
 DROP PROCEDURE spexecute61;
 DROP PROCEDURE sp61;
 DROP PROCEDURE IF EXISTS sp62;
@@ -19628,9 +19177,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute64();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010
+1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	1000000000	1000000010	1000000000	1000000010	1000000000	1000000010
+1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000
 DROP PROCEDURE spexecute64;
 DROP PROCEDURE sp64;
 DROP PROCEDURE IF EXISTS sp65;
@@ -19662,9 +19211,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute65();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+999999999.000000000	999999999.000000000	1000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+999999999.000000000	1000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute65;
 DROP PROCEDURE sp65;
 DROP PROCEDURE IF EXISTS sp66;
@@ -19696,9 +19245,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute66();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000000000000000000000000	10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute66;
 DROP PROCEDURE sp66;
 DROP PROCEDURE IF EXISTS sp67;
@@ -19730,9 +19279,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute67();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute67;
 DROP PROCEDURE sp67;
 DROP PROCEDURE IF EXISTS sp68;
@@ -19764,9 +19313,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute68();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute68;
 DROP PROCEDURE sp68;
 DROP PROCEDURE IF EXISTS sp69;
@@ -19798,9 +19347,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute69();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute69;
 DROP PROCEDURE sp69;
 DROP PROCEDURE IF EXISTS sp70;
@@ -19832,9 +19381,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute70();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute70;
 DROP PROCEDURE sp70;
 DROP PROCEDURE IF EXISTS sp71;
@@ -19866,9 +19415,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute71();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute71;
 DROP PROCEDURE sp71;
 DROP PROCEDURE IF EXISTS sp72;
@@ -19900,9 +19449,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute72();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute72;
 DROP PROCEDURE sp72;
 DROP PROCEDURE IF EXISTS sp73;
@@ -19934,9 +19483,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute73();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute73;
 DROP PROCEDURE sp73;
 DROP PROCEDURE IF EXISTS sp74;
@@ -19968,9 +19517,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute74();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute74;
 DROP PROCEDURE sp74;
 DROP PROCEDURE IF EXISTS sp75;
@@ -20002,9 +19551,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute75();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute75;
 DROP PROCEDURE sp75;
 DROP PROCEDURE IF EXISTS sp76;
@@ -20036,9 +19585,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute76();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute76;
 DROP PROCEDURE sp76;
 DROP PROCEDURE IF EXISTS sp77;
@@ -20070,9 +19619,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute77();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute77;
 DROP PROCEDURE sp77;
 DROP PROCEDURE IF EXISTS sp78;
@@ -20104,9 +19653,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute78();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute78;
 DROP PROCEDURE sp78;
 DROP PROCEDURE IF EXISTS sp79;
@@ -20138,9 +19687,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute79();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute79;
 DROP PROCEDURE sp79;
 DROP PROCEDURE IF EXISTS sp80;
@@ -20172,9 +19721,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute80();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--2147483638	-2147483638	-2147483628	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-2150000000	-2150000000	-2149999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--2147483638	-2147483628	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-2150000000	-2149999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute80;
 DROP PROCEDURE sp80;
 DROP PROCEDURE IF EXISTS sp81;
@@ -20274,9 +19823,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute83();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0215000000	0215000000	0215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+215000000	215000000	215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0215000000	0215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+215000000	215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute83;
 DROP PROCEDURE sp83;
 DROP PROCEDURE IF EXISTS sp84;
@@ -20308,9 +19857,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute84();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388598	-8388598	-8388588	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388600	-8388600	-8388590	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388598	-8388588	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388600	-8388590	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute84;
 DROP PROCEDURE sp84;
 DROP PROCEDURE IF EXISTS sp85;
@@ -20376,9 +19925,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute86();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777210	16777210	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777210	16777210	16777220	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777210	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777210	16777220	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute86;
 DROP PROCEDURE sp86;
 DROP PROCEDURE IF EXISTS sp87;
@@ -20410,9 +19959,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute87();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777215	16777215	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388602	-8388602	-8388592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777215	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388602	-8388592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute87;
 DROP PROCEDURE sp87;
 DROP PROCEDURE IF EXISTS sp88;
@@ -20444,9 +19993,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute88();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute88;
 DROP PROCEDURE sp88;
 DROP PROCEDURE IF EXISTS sp89;
@@ -20478,9 +20027,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute89();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute89;
 DROP PROCEDURE sp89;
 DROP PROCEDURE IF EXISTS sp90;
@@ -20512,9 +20061,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute90();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000000000000000000000000	10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute90;
 DROP PROCEDURE sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -20546,9 +20095,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute91();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000100000000000000000000.000000000000000000000000000000	000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute91;
 DROP PROCEDURE sp91;
 DROP PROCEDURE IF EXISTS sp92;
@@ -20580,9 +20129,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute92();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute92;
 DROP PROCEDURE sp92;
 DROP PROCEDURE IF EXISTS sp93;
@@ -20614,9 +20163,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute93();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute93;
 DROP PROCEDURE sp93;
 DROP PROCEDURE IF EXISTS sp94;
@@ -20682,9 +20231,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute95();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute95;
 DROP PROCEDURE sp95;
 DROP PROCEDURE IF EXISTS sp96;
@@ -20716,9 +20265,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute96();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute96;
 DROP PROCEDURE sp96;
 DROP PROCEDURE IF EXISTS sp97;
@@ -20750,9 +20299,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute97();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65535	65535	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-32602	-32602	-32592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65535	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-32602	-32592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute97;
 DROP PROCEDURE sp97;
 DROP PROCEDURE IF EXISTS sp98;
@@ -20818,9 +20367,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute99();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-252	252	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+252	252	262	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-252	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+252	262	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute99;
 DROP PROCEDURE sp99;
 DROP PROCEDURE IF EXISTS sp100;
@@ -20886,9 +20435,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute101();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-255	255	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-102	-102	-92	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-255	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-102	-92	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute101;
 DROP PROCEDURE sp101;
 USE db_storedproc;
@@ -20914,7 +20463,7 @@ insert into temp_table values(a);
 END//
 show CREATE PROCEDURE sp2;
 Procedure	sql_mode	Create Procedure
-sp2	ALLOW_INVALID_DATES	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
+sp2	ALLOW_INVALID_DATES	CREATE PROCEDURE `sp2`()
 BEGIN
 declare a datetime;
 set a = '2005-03-14 01:01:02';
@@ -20950,7 +20499,7 @@ SELECT not 1 between a and b;
 END//
 show CREATE PROCEDURE sp3;
 Procedure	sql_mode	Create Procedure
-sp3	HIGH_NOT_PRECEDENCE	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp3`()
+sp3	HIGH_NOT_PRECEDENCE	CREATE PROCEDURE `sp3`()
 BEGIN
 declare a int signed;
 declare b int unsigned;
@@ -20993,7 +20542,7 @@ show warnings;
 END//
 show CREATE PROCEDURE sp4;
 Procedure	sql_mode	Create Procedure
-sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE DEFINER="root"@"localhost" PROCEDURE "sp4"()
+sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE PROCEDURE "sp4"()
 BEGIN
 declare a int;
 declare b int;
@@ -21041,14 +20590,14 @@ set @y=@x;
 END//
 show CREATE PROCEDURE sp6a;
 Procedure	sql_mode	Create Procedure
-sp6a		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
+sp6a		CREATE PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
 BEGIN
 set @x=i1;
 set @y=@x;
 END
 show CREATE PROCEDURE sp6b;
 Procedure	sql_mode	Create Procedure
-sp6b		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
+sp6b		CREATE PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
     DETERMINISTIC
 BEGIN
 set @x=i1;
@@ -21056,7 +20605,7 @@ set @y=@x;
 END
 show CREATE PROCEDURE sp6c;
 Procedure	sql_mode	Create Procedure
-sp6c		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
+sp6c		CREATE PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
     COMMENT 'this is a comment'
 BEGIN
 set @x=i1;
@@ -21242,7 +20791,7 @@ END//
 alter function fn1 sql security invoker;
 show  create  function  fn1;
 Function	sql_mode	Create Function
-fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
+fn1		CREATE FUNCTION `fn1`(x int) RETURNS int(11)
     SQL SECURITY INVOKER
 BEGIN
 return x;
@@ -21274,7 +20823,7 @@ END//
 alter procedure sp6 comment 'this is simple';
 show CREATE PROCEDURE sp6;
 Procedure	sql_mode	Create Procedure
-sp6		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6`(i1 int , i2 int)
+sp6		CREATE PROCEDURE `sp6`(i1 int , i2 int)
     COMMENT 'this is simple'
 BEGIN
 set @x=i1;
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
index 731d5c4a8cf..903f2b3d01f 100755
--- a/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc_02.result
@@ -166,7 +166,7 @@ declare y integer default 1;
 set @x = x;
 set @y = y;
 set @z = 234;
-SELECT f1, f2 into @x, @y from t2 limit 1;
+SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
 SELECT @x, @y, @z, invar;
 BEGIN
 set @x = 2;
@@ -209,7 +209,7 @@ BEGIN
 declare x integer; declare y integer;
 set @x=x;
 set @y=y;
-SELECT f4, f3 into @x, @y from t2 limit 1;
+SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
 SELECT @x, @y;
 END//
 CALL sp1();
@@ -544,6 +544,9 @@ exit handler 2
 exit handler 2
 exit handler 1
 exit handler 1
+Warnings:
+Note	1051	Unknown table 'tqq'
+Note	1051	Unknown table 'tqq'
 create table res_t1(w char unique, x char);
 insert into res_t1 values ('a', 'b');
 CREATE PROCEDURE h1 ()
@@ -1084,7 +1087,8 @@ declare f2_value char(20);
 declare f5_value char(20);
 declare f4_value integer;
 declare f6_value integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
+where f4 >=-5000 order by f4 limit 3;
 open cur1;
 while proceed do
 SELECT count AS 'loop';
@@ -1167,7 +1171,7 @@ of a compound statement ends.
 DROP TABLE IF EXISTS temp1;
 DROP PROCEDURE IF EXISTS sp1;
 create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) );
-SELECT f1, f2, f4, f5 from t2;
+SELECT f1, f2, f4, f5 from t2 order by f4;
 f1	f2	f4	f5
 a`	a`	-5000	a`
 aaa	aaa	-4999	aaa
@@ -1187,21 +1191,21 @@ declare newf1 char(20);
 declare newf2 char(20);
 declare newf5 char(20);
 declare newf4 integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
-declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
+declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
+declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
 open cur1;
 open cur2;
 BEGIN
-declare continue handler for sqlstate '02000' set count = 1;
+declare continue handler for sqlstate '02000' set count=1;
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-1-', count, newf1, newf2, newf4, newf5;
 insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
-set count = 4;
+set count= 4;
 BEGIN
-while count > 0 do
+while count> 0 do
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-2-', count, newf1, newf2, newf4, newf5;
-set count = count - 1;
+set count = count- 1;
 END while;
 SELECT '-3-', count, newf1, newf2, newf4, newf4;
 END;
@@ -1270,8 +1274,10 @@ declare i_newf11 char(20);
 declare i_newf12 char(20);
 declare i_newf13 date;
 declare i_newf14 integer;
-declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
-declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 4;
+declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 3;
 declare continue handler for sqlstate '02000' set proceed=0;
 open cur1;
 open cur2;
@@ -1302,8 +1308,10 @@ DECLARE o_newf11 CHAR(20);
 DECLARE o_newf12 CHAR(20);
 DECLARE o_newf13 DATE;
 DECLARE o_newf14 INTEGER;
-DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
-DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
+DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
+DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
 DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
 OPEN cur1;
 OPEN cur2;
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_10.result b/mysql-test/suite/funcs_1/r/memory_storedproc_10.result
index 89c2fb736eb..e924cf0731a 100755
--- a/mysql-test/suite/funcs_1/r/memory_storedproc_10.result
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc_10.result
@@ -80,7 +80,7 @@ connect(localhost,user_1,,db_storedproc,MYSQL_PORT,MYSQL_SOCK);
 user_1@localhost	db_storedproc
 CREATE PROCEDURE sp31102 () SQL SECURITY INVOKER
 BEGIN
-SELECT * FROM db_storedproc.t1 LIMIT 1;
+SELECT * FROM db_storedproc.t1 WHERE f4=-5000 LIMIT 1;
 END//
 CREATE FUNCTION fn31105(n INT) RETURNS INT
 BEGIN
@@ -209,7 +209,7 @@ CALL sp_ins_1();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -226,7 +226,7 @@ CALL sp_ins_3();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -246,7 +246,7 @@ CALL sp_upd();
 SELECT row_count();
 row_count()
 4
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -279,7 +279,7 @@ COUNT( f1 )	f1
 SELECT row_count();
 row_count()
 3
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0102.result b/mysql-test/suite/funcs_1/r/memory_trig_0102.result
index 0a640201d76..1319fc3e361 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_0102.result
@@ -195,6 +195,9 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 for each row set new.f3 = '14';
 CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
 BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
+ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
+CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
+BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
 insert into t1 (f2) values ('insert 3.5.1.7');
 select * from t1;
 f1	f2	f3
@@ -203,12 +206,14 @@ update t1 set f2='update 3.5.1.7';
 select * from t1;
 f1	f2	f3
 NULL	update 3.5.1.7	42
-select trigger_name from information_schema.triggers;
+select trigger_name from information_schema.triggers order by trigger_name;
 trigger_name
 trg5_1
 trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
 drop trigger trg5_1;
 drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
+ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
+drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
 drop table t1;
 
 Testcase 3.5.1.8:
@@ -310,7 +315,7 @@ insert into trig_db3.t1 (f1,f2) values ('insert to db3 t1 from db1',4);
 select @test_var1, @test_var2, @test_var3;
 @test_var1	@test_var2	@test_var3
 trig1	trig2	trig3
-select * from t1;
+select * from t1 order by f2;
 f1	f2
 trig1	1
 trig1	2
@@ -320,7 +325,7 @@ trig2	3
 select * from trig_db3.t1;
 f1	f2
 trig3	4
-select * from t1;
+select * from t1 order by f2;
 f1	f2
 trig1	1
 trig1	2
@@ -345,10 +350,10 @@ for each row set @test_var2='trig1_a';
 create trigger trig_db2.trig2 before insert on trig_db2.t1 
 for each row set @test_var3='trig2';
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers;
+from information_schema.triggers order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-trig_db1	trig1_b	t1
 trig_db1	trig1_a	t1
+trig_db1	trig1_b	t1
 trig_db2	trig2	t1
 set @test_var1= '', @test_var2= '', @test_var3= '';
 insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_03.result b/mysql-test/suite/funcs_1/r/memory_trig_03.result
index 7309e403cff..ae7b83f820d 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_03.result
@@ -78,16 +78,16 @@ Testcase 3.5.3.2/6:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
 grant ALL  on *.* to test_noprivs@localhost;
-revoke SUPER  on *.* from test_noprivs@localhost;
+revoke TRIGGER on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -100,10 +100,10 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+Got one of the listed errors
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 select current_user;
@@ -118,15 +118,12 @@ root@localhost
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
 ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for column 'f1' in table 't1'
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
-
-note: once 15166 is fixed a similar case for SELECT needs to be added
----------------------------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -135,10 +132,10 @@ Testcase 3.5.3.6:
 -----------------
 use priv_db;
 drop trigger trg1_2;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+Got one of the listed errors
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -147,12 +144,12 @@ use priv_db;
 drop trigger trg1_2;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-no');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
 drop trigger trg1_2;
 
 Testcase 3.5.3.7a:
@@ -162,12 +159,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke UPDATE  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER, UPDATE on *.* to test_yesprivs@localhost;
+grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -176,24 +173,24 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-select f1 from t1;
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1a');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 drop trigger trg4a_1;
 use priv_db;
 select current_user;
@@ -201,236 +198,220 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg4a_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2a';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 drop trigger trg4a_2;
 
 Testcase 3.5.3.7b:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs;
+grant TRIGGER on *.* to test_noprivs;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke UPDATE  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
 GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
 insert 3.5.3.7-1b
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
 update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4b_2 before UPDATE  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2b';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on priv_db.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-2b
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
-insert 3.5.3.7-2b
 update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
+update 3.5.3.7-1b
 drop trigger trg4b_2;
 
 Testcase 3.5.3.7c
 -----------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke UPDATE  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1c');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-1c
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
+update 3.5.3.7-1b
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4c_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2c';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2c');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-1c
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
 trig 3.5.3.7-2c
+update 3.5.3.7-1b
 drop trigger trg4c_2;
 
 Testcase 3.5.3.7d:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant SELECT (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1d');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-1c
+insert 3.5.3.7-1d
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
 trig 3.5.3.7-2c
-insert 3.5.3.7-1d
+update 3.5.3.7-1b
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4d_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2d';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2d');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-1c
+insert 3.5.3.7-1d
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
 trig 3.5.3.7-2c
-insert 3.5.3.7-1d
 trig 3.5.3.7-2d
+update 3.5.3.7-1b
 drop trigger trg4d_2;
 
 Testcase 3.5.3.8a:
@@ -440,12 +421,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke SELECT  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER, SELECT on *.* to test_yesprivs@localhost;
+grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -454,7 +435,7 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 
 Trigger create disabled - should fail - Bug 8887
 ------------------------------------------------
@@ -473,17 +454,13 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg5a_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-2a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-2a
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2a');
 select @test_var;
 @test_var
@@ -493,26 +470,26 @@ drop trigger trg5a_2;
 Testcase: 3.5.3.8b
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke SELECT  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -529,7 +506,7 @@ before trig 3.5.3.8-1b
 drop trigger trg5b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5b_2 before UPDATE  on t1 for each row
@@ -539,10 +516,6 @@ insert into t1 (f1) values ('insert 3.5.3.8-2b');
 select @test_var;
 @test_var
 before trig 3.5.3.8-2b
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on priv_db.* to test_yesprivs@localhost;
 update t1 set  f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b';
 select @test_var;
 @test_var
@@ -552,26 +525,26 @@ drop trigger trg5b_2;
 Testcase 3.5.3.8c:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke SELECT  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -584,16 +557,12 @@ before trig 3.5.3.8-1c
 drop trigger trg5c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5c_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2c';
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2c');
 select @test_var;
 @test_var
@@ -603,24 +572,24 @@ drop trigger trg5c_2;
 Testcase: 3.5.3.8d:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant UPDATE (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
@@ -634,16 +603,12 @@ before trig 3.5.3.8-1d
 drop trigger trg5d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5d_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2d';
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2d');
 select @test_var;
 @test_var
@@ -658,12 +623,12 @@ drop table if exists t2;
 create table t1 (f1 int) engine= memory;
 create table t2 (f2 int) engine= memory;
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t2` TO 'test_yesprivs'@'localhost'
 GRANT SELECT, UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -679,10 +644,10 @@ ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (4);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 4
-select f2 from t2;
+select f2 from t2 order by f2;
 f2
 4
 use priv_db;
@@ -695,11 +660,11 @@ ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table
 revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (2);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
 2
-select f2 from t2;
+4
+select f2 from t2 order by f2;
 f2
 1
 use priv_db;
@@ -712,12 +677,12 @@ ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table
 revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
-2
 1
-select f2 from t2;
+2
+4
+select f2 from t2 order by f2;
 f2
 1
 select @aaa;
@@ -733,13 +698,13 @@ ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
-2
 1
 1
-select f2 from t2;
+2
+4
+select f2 from t2 order by f2;
 f2
 drop database if exists priv_db;
 drop user test_yesprivs@localhost;
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0407.result b/mysql-test/suite/funcs_1/r/memory_trig_0407.result
index 588039983e2..005fd43fb5b 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_0407.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_0407.result
@@ -89,18 +89,18 @@ Create trigger trg1 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.1';
 Use db_drop;
 Insert into t1 values ('Insert error 3.5.4.1');
-Select * from t1;
+Select * from t1 order by f1;
 f1
 Trigger 3.5.4.1
 drop trigger trg1;
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers;
+from information_schema.triggers order by trigger_name;
 trigger_schema	trigger_name	event_object_table
 Insert into t1 values ('Insert no trigger 3.5.4.1');
-Select * from t1;
+Select * from t1 order by f1;
 f1
-Trigger 3.5.4.1
 Insert no trigger 3.5.4.1
+Trigger 3.5.4.1
 drop trigger trg1;
 drop database if exists db_drop;
 revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost';
@@ -254,7 +254,7 @@ use dbtest_one;
 Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4');
 Warnings:
 Warning	1265	Data truncated for column 'f1' at row 1
-Select * from dbtest_two.t2;
+Select * from dbtest_two.t2 order by f1;
 f1
 1st Insert 3.5.
 2nd Insert 3.5.
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_08.result b/mysql-test/suite/funcs_1/r/memory_trig_08.result
index 9a14845d0eb..ddc990d1919 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_08.result
@@ -135,10 +135,10 @@ values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
 f120	f122	f136	f144	f163
 1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i;
+select * from db_test.t1_i order by i120;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u;
+select * from db_test.t1_u order by u120;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
 b	00222	0000023456	1.050000000000000000000000000000
@@ -146,7 +146,7 @@ c	00333	0000099999	999.990000000000000000000000000000
 d	00222	0000023456	1.050000000000000000000000000000
 e	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-select * from db_test.t1_d;
+select * from db_test.t1_d order by d120;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -158,14 +158,22 @@ select @test_var;
 3.5.8.4 - single SQL - insert
 -----------------------------
 Create trigger trg2 BEFORE UPDATE on tb3 for each row
+BEGIN
 insert into db_test.t1_i 
 values (new.f120, new.f136, new.f144, new.f163);
+END//
+Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
+f120	f122	f136	f144	f163
+1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
+select * from db_test.t1_i order by i120;
+i120	i136	i144	i163
+1	00222	0000023456	1.050000000000000000000000000000
 update tb3 set f120='I', f122='Test 3.5.8.4-Single Insert'
 		 where f122='Test 3.5.8.4';
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 I	Test 3.5.8.4-Single Insert	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i;
+select * from db_test.t1_i order by i120;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
 I	00222	0000023456	1.050000000000000000000000000000
@@ -182,14 +190,14 @@ update tb3 set f120='U', f122='Test 3.5.8.4-Single Update'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 U	Test 3.5.8.4-Single Update	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u;
+select * from db_test.t1_u order by u120;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
+f	00333	0000099999	999.990000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
 U	00222	0000023456	1.050000000000000000000000000000
 U	00222	0000023456	1.050000000000000000000000000000
-f	00333	0000099999	999.990000000000000000000000000000
 
 3.5.8.3/4 - single SQL - delete
 -------------------------------
@@ -202,7 +210,7 @@ f122='Test 3.5.8.4-Single Delete'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 D	Test 3.5.8.4-Single Delete	00444	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_d;
+select * from db_test.t1_d order by d120;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -249,29 +257,29 @@ END//
 set @test_var='Empty', @test_var2=0;
 Insert into tb3 (f120, f122, f136) values ('1', 'Test 3.5.8.5-if', 101);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	one	2nd else
 Insert into tb3 (f120, f122, f136) values ('2', 'Test 3.5.8.5-if', 102);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	two	2nd else
 D	Test 3.5.8.5-if	00102	two	2nd else
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 10);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
+d	Test 3.5.8.5-if	00010	three	2nd if
 D	Test 3.5.8.5-if	00101	three	2nd if
 D	Test 3.5.8.5-if	00102	three	2nd if
-d	Test 3.5.8.5-if	00010	three	2nd if
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 103);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
+d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00101	three	2nd else
 D	Test 3.5.8.5-if	00102	three	2nd else
-d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00103	three	2nd else
 create trigger trg3 before update on tb3 for each row
 BEGIN
@@ -331,20 +339,20 @@ set @test_var='Empty';
 Insert into tb3 (f120, f122, f136, f144) 
 values ('a', 'Test 3.5.8.5-case', 5, 7);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	A*seven
 Insert into tb3 (f120, f122, f136, f144) 
 values ('b', 'Test 3.5.8.5-case', 71,16);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	B*0000000016
 B	Test 3.5.8.5-case	00191	0000000016	B*0000000016
 Insert into tb3 (f120, f122, f136, f144) 
 values ('c', 'Test 3.5.8.5-case', 80,1);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	C=one
 B	Test 3.5.8.5-case	00191	0000000016	C=one
@@ -354,34 +362,34 @@ values ('d', 'Test 3.5.8.5-case', 152);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 A	Test 3.5.8.5-case	00125	0000000007	1*0000099999
 B	Test 3.5.8.5-case	00191	0000000016	1*0000099999
 C	Test 3.5.8.5-case	00200	0000000001	1*0000099999
-1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 Insert into tb3 (f120, f122, f136, f144) 
 values ('e', 'Test 3.5.8.5-case', 200, 8);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 Insert into tb3 (f120, f122, f136, f144) 
 values ('f', 'Test 3.5.8.5-case', 100, 8);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 create trigger trg3a before update on tb3 for each row
 BEGIN
 CASE
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_09.result b/mysql-test/suite/funcs_1/r/memory_trig_09.result
index c1b9ec6d33f..0a25dbfc1ca 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_09.result
@@ -116,7 +116,7 @@ set @tr_var_af_118=old.f118, @tr_var_af_121=old.f121,
 Insert into tb3 (f122, f136, f163) 
 values ('Test 3.5.9.3', 7, 123.17);
 Update tb3 Set f136=8 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
 a	NULL	Test 3.5.9.3	00008	123.170000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -132,7 +132,7 @@ a	NULL	Test 3.5.9.3	7	123.170000000000000000000000000000
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 0	0	0	0	0
 delete from tb3 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 @tr_var_b4_136, @tr_var_b4_163;
@@ -172,7 +172,7 @@ set @tr_var_af_118=new.f118, @tr_var_af_121=new.f121,
 Insert into tb3 (f122, f136, f151, f163) 
 values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4%';
+where f122 like 'Test 3.5.9.4%' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4	00007	999	995.240000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -190,9 +190,9 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 Warnings:
-Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
+Warning	1048	Column 'f136' cannot be null
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4-trig';
+where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4-trig	00000	999	NULL
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result b/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
index b93c67e894b..451041575af 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
@@ -83,7 +83,7 @@ Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 1);
 Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2);
 Insert into vw11 (f122, f151) values ('Not in View', 3);
 select f121, f122, f151, f163
-from tb3 where f122 like 'Test 3.5.10.1/2/3%';
+from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 NULL	Test 3.5.10.1/2/3	1	111.110000000000000000000000000000
 NULL	Test 3.5.10.1/2/3	2	111.110000000000000000000000000000
@@ -97,7 +97,7 @@ f121	f122	f151	f163
 NULL	Not in View	3	111.110000000000000000000000000000
 Update vw11 set f163=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	1	1.000000000000000000000000000000
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
@@ -111,7 +111,7 @@ before delete
 0
 delete from vw11 where f151=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
 select f121, f122, f151, f163 from vw11;
@@ -142,7 +142,7 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
 select @counter as 'Rows Loaded After';
 Rows Loaded After
 10
-Select * from tb_load limit 10;
+Select * from tb_load order by f1 limit 10;
 f1	f2	f3
 -5000	a`	1000
 -4999	aaa	999
@@ -237,7 +237,7 @@ insert into t3 (f1) values (new.f1+1000);
 create trigger tr2_4 after insert on t2_4 for each row
 insert into t3 (f1) values (new.f1+10000);
 insert into t1 values (1);
-select * from t3;
+select * from t3 order by f1;
 f1
 12
 102
@@ -272,17 +272,17 @@ create trigger tr4 after insert on t4
 for each row insert into t1 (f1) values (new.f4+1);
 insert into t1 values (1);
 ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
-select * from t1;
+select * from t1 order by f1;
 f1
 0
 1
-select * from t2;
+select * from t2 order by f2;
 f2
 2
-select * from t3;
+select * from t3 order by f3;
 f3
 3
-select * from t4;
+select * from t4 order by f4;
 f4
 4
 drop trigger tr1;
@@ -369,7 +369,7 @@ create table t4 (f4 tinyint) engine = memory;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL
+  `f1` int(11) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 insert into t1 values (1);
 create trigger tr1 after insert on t1
@@ -381,16 +381,16 @@ for each row insert into t4 (f4) values (new.f3+1000);
 set autocommit=0;
 start transaction;
 insert into t1 values (1);
-ERROR 22003: Out of range value adjusted for column 'f4' at row 1
+ERROR 22003: Out of range value for column 'f4' at row 1
 commit;
-select * from t1;
+select * from t1 order by f1;
 f1
 1
 1
-select * from t2;
+select * from t2 order by f2;
 f2
 2
-select * from t3;
+select * from t3 order by f3;
 f3
 3
 drop trigger tr1;
diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result
index 516eef24439..9267cc5a98b 100644
--- a/mysql-test/suite/funcs_1/r/memory_views.result
+++ b/mysql-test/suite/funcs_1/r/memory_views.result
@@ -1930,7 +1930,7 @@ f1	f2
 2	two
 4	four
 INSERT INTO v1 VALUES(2,'two');
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
 INSERT INTO v1 VALUES(3,'three');
 affected rows: 1
 INSERT INTO v1 VALUES(6,'six');
@@ -1949,7 +1949,7 @@ f1	f2
 3	three
 4	four
 UPDATE v1 SET f1 = 2 WHERE f1 = 3;
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
 UPDATE v1 SET f2 = 'number' WHERE f1 = 3;
 affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
@@ -1997,12 +1997,12 @@ DROP VIEW  IF EXISTS test.v1;
 CREATE TABLE t1 (f1 ENUM('A', 'B', 'C') NOT NULL, f2 INTEGER)
 ENGINE = memory;
 INSERT INTO t1 VALUES ('A', 1);
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 A	1
 CREATE VIEW  v1 AS SELECT * FROM t1 WHERE f2 BETWEEN 1 AND 2
 WITH CASCADED CHECK OPTION ;
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	1
 UPDATE v1 SET f2 = 2 WHERE f2 = 1;
@@ -2010,7 +2010,7 @@ affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
 INSERT INTO v1 VALUES('B',2);
 affected rows: 1
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	2
 B	2
@@ -2018,7 +2018,7 @@ UPDATE v1 SET f2 = 4;
 ERROR HY000: CHECK OPTION failed 'test.v1'
 INSERT INTO v1 VALUES('B',3);
 ERROR HY000: CHECK OPTION failed 'test.v1'
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	2
 B	2
@@ -10585,7 +10585,7 @@ f1	f2	f3	f4
 DELETE FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 1
+ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10654,7 +10654,7 @@ DROP VIEW v1;
 CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 1
+ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10989,11 +10989,11 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(5)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11013,12 +11013,12 @@ f4x	char(5)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4x	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 CHANGE COLUMN f4x f4 CHAR(5);
 ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(10);
@@ -11036,14 +11036,14 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(10)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
 2	NULL	<-- 10 -->	t1 2
 2	NULL	<-- 10 -->	v1 2
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11072,7 +11072,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(8)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11081,7 +11081,7 @@ f1	f2	f4	report
 2	NULL	<-- 10 -	v1 2
 3	NULL	<-- 10 -	t1 3
 3	NULL	<-- 10 -	v1 3
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11105,7 +11105,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11116,7 +11116,7 @@ f1	f2	f4	report
 3	NULL	<-- 10 -	v1 3
 4	NULL	<------ 20 -------->	t1 4
 4	NULL	<------ 20 -------->	v1 4
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11144,7 +11144,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11157,7 +11157,7 @@ f1	f2	f4	report
 4	NULL	<------ 20 -------->	v1 4
 <------------- 30 ----------->	NULL	<------ 20 -------->	t1 5
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11181,7 +11181,7 @@ f4	varchar(20)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report
 -1	ABC	t1 0
 -1	ABC	v1 0
@@ -11195,7 +11195,7 @@ f1	f4	report
 <------------- 30 ----------->	<------ 20 -------->	t1 5
 <------------- 30 ----------->	<------ 20 -------->	v1 5
 ABC	<------ 20 -------->	t1 6
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 ADD COLUMN f2 DATE DEFAULT NULL;
 INSERT INTO t1 SET f1 = 'ABC', f2 = '1500-12-04',
@@ -11214,7 +11214,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11230,7 +11230,7 @@ f1	f4	report	f2
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	1500-12-04
 ABC	<------ 20 -------->	v1 7	1500-12-04
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11264,7 +11264,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11279,10 +11279,10 @@ f1	f4	report	f2
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	NULL
-ABC	<------ 20 -------->	v1 7	NULL
 ABC	<------ 20 -------->	t1 8	-0.00033
+ABC	<------ 20 -------->	v1 7	NULL
 ABC	<------ 20 -------->	v1 8	-0.00033
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11297,8 +11297,8 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	t1 8
+ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	v1 8
 ALTER TABLE t1 ADD COLUMN f3 NUMERIC(7,2);
 INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
@@ -11321,7 +11321,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2	f3
 -1	ABC	t1 0	NULL	NULL
 -1	ABC	v1 0	NULL	NULL
@@ -11336,12 +11336,12 @@ f1	f4	report	f2	f3
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL	NULL
 ABC	<------ 20 -------->	t1 6	NULL	NULL
 ABC	<------ 20 -------->	t1 7	NULL	NULL
-ABC	<------ 20 -------->	v1 7	NULL	NULL
 ABC	<------ 20 -------->	t1 8	-0.00033	NULL
-ABC	<------ 20 -------->	v1 8	-0.00033	NULL
 ABC	<------ 20 -------->	t1 9	-0.00033	-2.20
+ABC	<------ 20 -------->	v1 7	NULL	NULL
+ABC	<------ 20 -------->	v1 8	-0.00033	NULL
 ABC	<------ 20 -------->	v1 9a	-0.00033	NULL
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11356,10 +11356,10 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	t1 8
-ABC	-0.00033	<------ 20 -------->	v1 8
 ABC	-0.00033	<------ 20 -------->	t1 9
+ABC	NULL	<------ 20 -------->	v1 7
+ABC	-0.00033	<------ 20 -------->	v1 8
 ABC	-0.00033	<------ 20 -------->	v1 9a
 DROP TABLE t1;
 DROP VIEW  v1;
@@ -11374,10 +11374,10 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 ABC	3
-SELECT * FROM v1;
+SELECT * FROM v1 order by 2;
 f1	my_sqrt
 ABC	1.7320508075689
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
@@ -11390,21 +11390,21 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 ABC	3
 ABC	DEF
-SELECT * FROM v1;
+SELECT * FROM v1 order by 2;
 f1	my_sqrt
-ABC	1.7320508075689
 ABC	0
+ABC	1.7320508075689
 SELECT SQRT('DEF');
 SQRT('DEF')
 0
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 CREATE VIEW v2 AS SELECT SQRT('DEF');
-SELECT * FROM v2;
+SELECT * FROM v2 order by 1;
 SQRT('DEF')
 0
 Warnings:
@@ -11414,27 +11414,27 @@ DESCRIBE v2;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM v2;
+SELECT * FROM v2 order by 2;
 f1	my_sqrt
-ABC	1.7320508075689
 ABC	0
+ABC	1.7320508075689
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/r/myisam__datadict.result b/mysql-test/suite/funcs_1/r/myisam__datadict.result
index e9082e7aee7..36662ad9259 100644
--- a/mysql-test/suite/funcs_1/r/myisam__datadict.result
+++ b/mysql-test/suite/funcs_1/r/myisam__datadict.result
@@ -463,10 +463,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -489,7 +500,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -510,7 +521,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -531,7 +542,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	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -552,7 +563,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -573,7 +584,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -591,10 +602,199 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	ENGINES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	EVENTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	FILES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PARTITIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PLUGINS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PROCESSLIST
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	REFERENTIAL_CONSTRAINTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -615,7 +815,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -636,7 +836,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -657,7 +857,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -675,10 +875,52 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -699,7 +941,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -720,7 +962,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -741,7 +983,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -762,7 +1004,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -783,7 +1025,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -804,7 +1046,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -929,6 +1171,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	event
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Events
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -950,6 +1213,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	general_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	General log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1055,6 +1339,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	ndb_binlog_index
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	latin1_swedish_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	plugin
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_bin
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL plugins
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1097,6 +1423,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	servers
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL Foreign Servers table
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	slow_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Slow log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -1562,6 +1930,11 @@ t.table_type, t.engine
 from schemata s inner join tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
@@ -1594,6 +1967,10 @@ NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
@@ -1606,6 +1983,14 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -1613,6 +1998,10 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
@@ -1645,6 +2034,13 @@ NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
@@ -1661,9 +2057,18 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
@@ -1696,6 +2101,13 @@ NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
@@ -1708,6 +2120,13 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -1715,6 +2134,8 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	CSV
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
@@ -1747,6 +2168,13 @@ NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
@@ -1759,6 +2187,14 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -1766,6 +2202,8 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	CSV
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
@@ -1798,6 +2236,13 @@ NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
@@ -1810,6 +2255,14 @@ NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
@@ -1817,6 +2270,11 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
@@ -1849,6 +2307,9 @@ NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
@@ -1861,6 +2322,15 @@ NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
@@ -1886,14 +2356,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -1908,6 +2378,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			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	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			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	SQL_MODE	12		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	ENDS	14	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	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	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	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			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	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_SCHEMA	6	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	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	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DELETED_ROWS	12	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	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			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	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATION_TIME	20	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	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	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	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	TABLE_ROWS	27	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	DATA_LENGTH	29	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	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1920,6 +2459,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	SUBPARTITION_NAME	5	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_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_LENGTH	15	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	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			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_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_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_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			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	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1950,6 +2543,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 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	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -1970,20 +2567,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -2034,20 +2631,20 @@ NULL	db_datadict	v1	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_genera
 NULL	db_datadict	v1	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
 NULL	db_datadict	v1	ENGINE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	VERSION	6	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select,insert,update,references	
-NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
-NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	TABLE_ROWS	8	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	AVG_ROW_LENGTH	9	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	DATA_LENGTH	10	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	INDEX_LENGTH	12	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
+NULL	db_datadict	v1	AUTO_INCREMENT	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COLLATION	18	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21)			select,insert,update,references	
+NULL	db_datadict	v1	CHECKSUM	19	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select,insert,update,references	
 NULL	db_datadict	v1	CREATE_OPTIONS	20	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			select,insert,update,references	
 NULL	db_datadict	v1	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select,insert,update,references	
 NULL	db_datadict	vu	u	1		NO	varchar	81	243	NULL	NULL	utf8	utf8_general_ci	varchar(81)			select,insert,update,references	
@@ -2081,10 +2678,36 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	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	
 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	Event_priv	21	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	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		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	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			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	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	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	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			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	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	ends	12	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	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
+NULL	mysql	event	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	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			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	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			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	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			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	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+NULL	mysql	general_log	argument	6	NULL	YES	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	
@@ -2118,6 +2741,16 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	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	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	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			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	inserts	4	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	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	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			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	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			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	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		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	
@@ -2142,13 +2775,33 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 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	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			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	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			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	Username	4		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	Socket	7		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	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	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	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			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	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			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	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
+NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	server_id	10	NULL	YES	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	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		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	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	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	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		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	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	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	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			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	
@@ -2193,14 +2846,16 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			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	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			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	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_connections	36	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	Event_priv	30	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	ssl_type	32		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	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	
+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_connections	38	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	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -2592,7 +3247,7 @@ cp932	cp932_japanese_ci	SJIS for Windows Japanese	2
 eucjpms	eucjpms_japanese_ci	UJIS for Windows Japanese	3
 select sum(id) from collations;
 sum(id)
-10741
+10840
 select collation_name, character_set_name into @x,@y
 from collation_character_set_applicability limit 1;
 select @x, @y;
@@ -2617,6 +3272,8 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -2628,6 +3285,8 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
+NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
+NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	1	NULL	NULL		BTREE	
@@ -2637,6 +3296,7 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -2667,6 +3327,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -2682,6 +3343,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -2692,6 +3354,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -2707,6 +3370,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -2717,6 +3381,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -2732,6 +3397,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select * from schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -2749,6 +3415,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -2763,6 +3431,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 select * from table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 select * from column_privileges;
@@ -2771,6 +3441,7 @@ select * from table_constraints;
 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	PRIMARY	mysql	help_category	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
@@ -2780,8 +3451,11 @@ NULL	mysql	PRIMARY	mysql	help_relation	PRIMARY KEY
 NULL	mysql	PRIMARY	mysql	help_topic	PRIMARY KEY
 NULL	mysql	name	mysql	help_topic	UNIQUE
 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
@@ -2799,6 +3473,8 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_category	name	1	NULL	NULL	NULL	NULL
@@ -2810,6 +3486,8 @@ NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	name	NULL	mysql	help_topic	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -2818,6 +3496,7 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -2833,7 +3512,7 @@ NULL	mysql	PRIMARY	NULL	mysql	user	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	user	User	2	NULL	NULL	NULL	NULL
 select count(*) as max_recs from key_column_usage;
 max_recs
-40
+45
 select max(cardinality) from statistics;
 max(cardinality)
 393
@@ -2854,10 +3533,21 @@ Table or view 'COLLATIONS' is associated with the database 'information_schema'.
 Table or view 'COLLATION_CHARACTER_SET_APPLICABILITY' is associated with the database 'information_schema'.
 Table or view 'COLUMNS' is associated with the database 'information_schema'.
 Table or view 'COLUMN_PRIVILEGES' is associated with the database 'information_schema'.
+Table or view 'ENGINES' is associated with the database 'information_schema'.
+Table or view 'EVENTS' is associated with the database 'information_schema'.
+Table or view 'FILES' is associated with the database 'information_schema'.
+Table or view 'GLOBAL_STATUS' is associated with the database 'information_schema'.
+Table or view 'GLOBAL_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'KEY_COLUMN_USAGE' is associated with the database 'information_schema'.
+Table or view 'PARTITIONS' is associated with the database 'information_schema'.
+Table or view 'PLUGINS' is associated with the database 'information_schema'.
+Table or view 'PROCESSLIST' is associated with the database 'information_schema'.
+Table or view 'REFERENTIAL_CONSTRAINTS' is associated with the database 'information_schema'.
 Table or view 'ROUTINES' is associated with the database 'information_schema'.
 Table or view 'SCHEMATA' is associated with the database 'information_schema'.
 Table or view 'SCHEMA_PRIVILEGES' is associated with the database 'information_schema'.
+Table or view 'SESSION_STATUS' is associated with the database 'information_schema'.
+Table or view 'SESSION_VARIABLES' is associated with the database 'information_schema'.
 Table or view 'STATISTICS' is associated with the database 'information_schema'.
 Table or view 'TABLES' is associated with the database 'information_schema'.
 Table or view 'TABLE_CONSTRAINTS' is associated with the database 'information_schema'.
@@ -2870,14 +3560,20 @@ Table or view 'vu' is associated with the database 'db_datadict'.
 Table or view 'vu1' is associated with the database 'db_datadict'.
 Table or view 'columns_priv' is associated with the database 'mysql'.
 Table or view 'db' is associated with the database 'mysql'.
+Table or view 'event' is associated with the database 'mysql'.
 Table or view 'func' is associated with the database 'mysql'.
+Table or view 'general_log' is associated with the database 'mysql'.
 Table or view 'help_category' is associated with the database 'mysql'.
 Table or view 'help_keyword' is associated with the database 'mysql'.
 Table or view 'help_relation' is associated with the database 'mysql'.
 Table or view 'help_topic' is associated with the database 'mysql'.
 Table or view 'host' is associated with the database 'mysql'.
+Table or view 'ndb_binlog_index' is associated with the database 'mysql'.
+Table or view 'plugin' is associated with the database 'mysql'.
 Table or view 'proc' is associated with the database 'mysql'.
 Table or view 'procs_priv' is associated with the database 'mysql'.
+Table or view 'servers' is associated with the database 'mysql'.
+Table or view 'slow_log' is associated with the database 'mysql'.
 Table or view 'tables_priv' is associated with the database 'mysql'.
 Table or view 'time_zone' is associated with the database 'mysql'.
 Table or view 'time_zone_leap_second' is associated with the database 'mysql'.
@@ -2924,12 +3620,12 @@ select * from table_constraints limit 0,5;
 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	PRIMARY	mysql	help_category	PRIMARY KEY
-NULL	mysql	name	mysql	help_category	UNIQUE
 select count(*) as max_recs from key_column_usage limit 0,5;
 max_recs
-40
+45
 select information_schema.tables.table_name as "table name",
 count(distinct(column_name)) as "no of columns in the table"
   from information_schema.tables left outer join information_schema.columns on
@@ -2942,19 +3638,36 @@ COLLATION_CHARACTER_SET_APPLICABILITY	2
 COLUMNS	19
 columns_priv	7
 COLUMN_PRIVILEGES	7
-db	20
+db	22
+ENGINES	6
+event	18
+EVENTS	21
+FILES	38
 func	4
+general_log	6
+GLOBAL_STATUS	2
+GLOBAL_VARIABLES	2
 help_category	4
 help_keyword	2
 help_relation	2
 help_topic	6
-host	19
+host	20
 KEY_COLUMN_USAGE	12
+ndb_binlog_index	7
+PARTITIONS	25
+plugin	2
+PLUGINS	10
 proc	16
+PROCESSLIST	8
 procs_priv	8
+REFERENTIAL_CONSTRAINTS	11
 ROUTINES	20
 SCHEMATA	5
 SCHEMA_PRIVILEGES	5
+servers	9
+SESSION_STATUS	2
+SESSION_VARIABLES	2
+slow_log	11
 STATISTICS	15
 t1	6
 t10	6
@@ -2980,7 +3693,7 @@ time_zone_name	2
 time_zone_transition	3
 time_zone_transition_type	5
 TRIGGERS	19
-user	37
+user	39
 USER_PRIVILEGES	4
 v1	21
 VIEWS	8
@@ -2994,7 +3707,7 @@ CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_P
 NULL	information_schema	utf8	utf8_general_ci	NULL
 SELECT * FROM tables                                LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	utf8_general_ci	NULL	#CO#	
 SELECT * FROM columns                               LIMIT 1;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 NULL	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -3039,7 +3752,7 @@ TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATA
 SELECT * FROM parameters LIMIT 1;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT * FROM referential_constraints LIMIT 1;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	UNIQUE_CONSTRAINT_CATALOG	UNIQUE_CONSTRAINT_SCHEMA	UNIQUE_CONSTRAINT_NAME	MATCH_OPTION	UPDATE_RULE	DELETE_RULE	TABLE_NAME	REFERENCED_TABLE_NAME
 use db_datadict;
 select * from schemata;
 ERROR 42S02: Table 'db_datadict.schemata' doesn't exist
@@ -3129,7 +3842,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	CHARACTER_SETS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3150,7 +3863,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLLATIONS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3171,7 +3884,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	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3192,7 +3905,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMNS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3213,7 +3926,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	COLUMN_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3231,10 +3944,199 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	ENGINES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	EVENTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	FILES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	GLOBAL_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	KEY_COLUMN_USAGE
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PARTITIONS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PLUGINS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	PROCESSLIST
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	REFERENTIAL_CONSTRAINTS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3255,7 +4157,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3276,7 +4178,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMATA
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3297,7 +4199,28 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	SCHEMA_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_STATUS
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MEMORY
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3315,10 +4238,31 @@ CREATE_OPTIONS	#CO#
 TABLE_COMMENT	
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
+TABLE_NAME	SESSION_VARIABLES
+TABLE_TYPE	SYSTEM VIEW
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	NULL
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	#CO#
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	information_schema
 TABLE_NAME	STATISTICS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3339,7 +4283,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3360,7 +4304,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_CONSTRAINTS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3381,7 +4325,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TABLE_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3402,7 +4346,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	TRIGGERS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3423,7 +4367,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	USER_PRIVILEGES
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MEMORY
-VERSION	0
+VERSION	10
 ROW_FORMAT	Fixed
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3444,7 +4388,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	VIEWS
 TABLE_TYPE	SYSTEM VIEW
 ENGINE	MyISAM
-VERSION	0
+VERSION	10
 ROW_FORMAT	Dynamic
 TABLE_ROWS	NULL
 AVG_ROW_LENGTH	#ARL#
@@ -3569,6 +4513,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	Database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	event
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Events
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	func
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3590,6 +4555,27 @@ CREATE_OPTIONS
 TABLE_COMMENT	User defined functions
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	general_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	General log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	help_category
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3695,6 +4681,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Host privileges;  Merged with database privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	ndb_binlog_index
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	latin1_swedish_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	plugin
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_bin
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL plugins
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	proc
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -3737,6 +4765,48 @@ CREATE_OPTIONS
 TABLE_COMMENT	Procedure privileges
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	mysql
+TABLE_NAME	servers
+TABLE_TYPE	BASE TABLE
+ENGINE	MyISAM
+VERSION	10
+ROW_FORMAT	Fixed
+TABLE_ROWS	0
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	MySQL Foreign Servers table
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
+TABLE_NAME	slow_log
+TABLE_TYPE	BASE TABLE
+ENGINE	CSV
+VERSION	10
+ROW_FORMAT	Dynamic
+TABLE_ROWS	2
+AVG_ROW_LENGTH	#ARL#
+DATA_LENGTH	#DL#
+MAX_DATA_LENGTH	#MDL#
+INDEX_LENGTH	#IL#
+DATA_FREE	#DF#
+AUTO_INCREMENT	NULL
+CREATE_TIME	YYYY-MM-DD hh:mm:ss
+UPDATE_TIME	YYYY-MM-DD hh:mm:ss
+CHECK_TIME	YYYY-MM-DD hh:mm:ss
+TABLE_COLLATION	utf8_general_ci
+CHECKSUM	NULL
+CREATE_OPTIONS	
+TABLE_COMMENT	Slow log
+TABLE_CATALOG	NULL
+TABLE_SCHEMA	mysql
 TABLE_NAME	tables_priv
 TABLE_TYPE	BASE TABLE
 ENGINE	MyISAM
@@ -4202,6 +5272,10 @@ t.table_type, t.engine
 from information_schema.schemata s inner join information_schema.tables t
 ORDER BY s.schema_name, s.default_character_set_name, table_type, engine;
 catalog_name	schema_name	default_character_set_name	table_type	engine
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	CSV
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
@@ -4234,6 +5308,9 @@ NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
 NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	BASE TABLE	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
@@ -4246,6 +5323,16 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
 NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MEMORY
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
+NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
@@ -4253,6 +5340,9 @@ NULL	db_datadict	latin1	SYSTEM VIEW	MyISAM
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
 NULL	db_datadict	latin1	VIEW	NULL
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	CSV
+NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
@@ -4285,6 +5375,10 @@ NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
 NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	BASE TABLE	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
@@ -4297,6 +5391,16 @@ NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
 NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MEMORY
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
+NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
@@ -4304,6 +5408,12 @@ NULL	information_schema	utf8	SYSTEM VIEW	MyISAM
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
 NULL	information_schema	utf8	VIEW	NULL
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	CSV
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
+NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
 NULL	mysql	latin1	BASE TABLE	MyISAM
@@ -4348,6 +5458,17 @@ NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
 NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MEMORY
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
+NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	SYSTEM VIEW	MyISAM
@@ -4355,6 +5476,11 @@ NULL	mysql	latin1	SYSTEM VIEW	MyISAM
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
 NULL	mysql	latin1	VIEW	NULL
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	CSV
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
@@ -4387,6 +5513,10 @@ NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
 NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	BASE TABLE	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
@@ -4399,6 +5529,14 @@ NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
 NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MEMORY
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
+NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	SYSTEM VIEW	MyISAM
@@ -4406,6 +5544,10 @@ NULL	test	latin1	SYSTEM VIEW	MyISAM
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
 NULL	test	latin1	VIEW	NULL
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	CSV
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
@@ -4438,6 +5580,13 @@ NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
 NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	BASE TABLE	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
+NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
 NULL	test1	latin1	SYSTEM VIEW	MEMORY
@@ -4454,9 +5603,19 @@ NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
+NULL	test1	latin1	SYSTEM VIEW	MyISAM
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
 NULL	test1	latin1	VIEW	NULL
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	CSV
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
@@ -4489,6 +5648,13 @@ NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
 NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	BASE TABLE	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
+NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
 NULL	test4	latin1	SYSTEM VIEW	MEMORY
@@ -4505,6 +5671,12 @@ NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
+NULL	test4	latin1	SYSTEM VIEW	MyISAM
 NULL	test4	latin1	VIEW	NULL
 NULL	test4	latin1	VIEW	NULL
 NULL	test4	latin1	VIEW	NULL
@@ -4575,9 +5747,9 @@ select * from information_schema.table_constraints limit 0, 5;
 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	PRIMARY	mysql	help_category	PRIMARY KEY
-NULL	mysql	name	mysql	help_category	UNIQUE
 select * from information_schema.key_column_usage limit 0, 5;
 CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Host	1	NULL	NULL	NULL	NULL
@@ -4587,7 +5759,7 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Table_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 select count(*) as max_recs from information_schema.key_column_usage limit 0, 5;
 max_recs
-40
+45
 
 root: check with db name
 ------------------------
@@ -4596,34 +5768,34 @@ COUNT(*)
 6
 SELECT COUNT(*) FROM information_schema. tables                                ;
 COUNT(*)
-51
+68
 SELECT COUNT(*) FROM information_schema. columns                               ;
 COUNT(*)
-682
+867
 SELECT COUNT(*) FROM information_schema. character_sets                        ;
 COUNT(*)
 36
 SELECT COUNT(*) FROM information_schema. collations                            ;
 COUNT(*)
-126
+127
 SELECT COUNT(*) FROM information_schema. collation_character_set_applicability ;
 COUNT(*)
-126
+128
 SELECT COUNT(*) FROM information_schema. routines                              ;
 COUNT(*)
 1
 SELECT COUNT(*) FROM information_schema. statistics                            ;
 COUNT(*)
-43
+48
 SELECT COUNT(*) FROM information_schema. views                                 ;
 COUNT(*)
 3
 SELECT COUNT(*) FROM information_schema. user_privileges                       ;
 COUNT(*)
-75
+81
 SELECT COUNT(*) FROM information_schema. schema_privileges                     ;
 COUNT(*)
-28
+32
 SELECT COUNT(*) FROM information_schema. table_privileges                      ;
 COUNT(*)
 0
@@ -4632,17 +5804,18 @@ COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. table_constraints                     ;
 COUNT(*)
-20
+24
 SELECT COUNT(*) FROM information_schema. key_column_usage                      ;
 COUNT(*)
-40
+45
 SELECT COUNT(*) FROM information_schema. triggers                              ;
 COUNT(*)
 0
 SELECT COUNT(*) FROM information_schema. parameters ;
 ERROR 42S02: Unknown table 'parameters' in information_schema
 SELECT COUNT(*) FROM information_schema. referential_constraints ;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+COUNT(*)
+0
 USE db_datadict;
 DROP VIEW v1, vu1, vu;
 DROP PROCEDURE db_datadict.sp_1;
@@ -4660,10 +5833,10 @@ NULL	test1	latin1
 NULL	test4	latin1
 select count(*) as tot_tabs from tables;
 tot_tabs
-48
+65
 select count(*) as the_cols from columns;
 the_cols
-657
+842
 select max(maxlen) as the_max from character_sets;
 the_max
 3
@@ -4701,10 +5874,21 @@ information_schema, COLLATIONS
 information_schema, COLLATION_CHARACTER_SET_APPLICABILITY
 information_schema, COLUMNS
 information_schema, COLUMN_PRIVILEGES
+information_schema, ENGINES
+information_schema, EVENTS
+information_schema, FILES
+information_schema, GLOBAL_STATUS
+information_schema, GLOBAL_VARIABLES
 information_schema, KEY_COLUMN_USAGE
+information_schema, PARTITIONS
+information_schema, PLUGINS
+information_schema, PROCESSLIST
+information_schema, REFERENTIAL_CONSTRAINTS
 information_schema, ROUTINES
 information_schema, SCHEMATA
 information_schema, SCHEMA_PRIVILEGES
+information_schema, SESSION_STATUS
+information_schema, SESSION_VARIABLES
 information_schema, STATISTICS
 information_schema, TABLES
 information_schema, TABLE_CONSTRAINTS
@@ -4714,14 +5898,20 @@ information_schema, USER_PRIVILEGES
 information_schema, VIEWS
 mysql, columns_priv
 mysql, db
+mysql, event
 mysql, func
+mysql, general_log
 mysql, help_category
 mysql, help_keyword
 mysql, help_relation
 mysql, help_topic
 mysql, host
+mysql, ndb_binlog_index
+mysql, plugin
 mysql, proc
 mysql, procs_priv
+mysql, servers
+mysql, slow_log
 mysql, tables_priv
 mysql, time_zone
 mysql, time_zone_leap_second
@@ -4767,7 +5957,7 @@ NULL	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
 NULL	mysql	name	mysql	help_category	UNIQUE
 select sum(ordinal_position) from key_column_usage;
 sum(ordinal_position)
-77
+83
 select * from schemata limit 0,5;
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	DEFAULT_COLLATION_NAME	SQL_PATH
 NULL	information_schema	utf8	utf8_general_ci	NULL
@@ -4814,6 +6004,8 @@ grantee
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
 'root'@'127.0.0.1'
+'root'@'127.0.0.1'
+'root'@'127.0.0.1'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
@@ -4839,6 +6031,10 @@ grantee
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
 'root'@'<SERVER_NAME>'
+'root'@'<SERVER_NAME>'
+'root'@'<SERVER_NAME>'
+'root'@'localhost'
+'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
 'root'@'localhost'
@@ -6347,6 +7543,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6362,6 +7559,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6372,6 +7570,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6387,6 +7586,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6397,6 +7597,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6412,6 +7613,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6492,6 +7694,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6507,6 +7710,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6517,6 +7721,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6532,6 +7737,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6542,6 +7748,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6557,6 +7764,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401013'@'localhost'	NULL	USAGE	NO
 select *
@@ -6623,6 +7831,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6638,6 +7847,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6648,6 +7858,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6663,6 +7874,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6673,6 +7885,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6688,6 +7901,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6766,6 +7980,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6781,6 +7996,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6791,6 +8007,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6806,6 +8023,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6816,6 +8034,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6831,6 +8050,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -6905,6 +8125,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -6920,6 +8141,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -6930,6 +8152,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -6945,6 +8168,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -6955,6 +8179,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -6970,6 +8195,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7057,6 +8283,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7072,6 +8299,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7082,6 +8310,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7097,6 +8326,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7107,6 +8337,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7122,6 +8353,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 'u_6_401015'@'localhost'	NULL	USAGE	NO
 select *
@@ -7187,6 +8419,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	CREATE VIEW	YES
 'root'@'127.0.0.1'	NULL	DELETE	YES
 'root'@'127.0.0.1'	NULL	DROP	YES
+'root'@'127.0.0.1'	NULL	EVENT	YES
 'root'@'127.0.0.1'	NULL	EXECUTE	YES
 'root'@'127.0.0.1'	NULL	FILE	YES
 'root'@'127.0.0.1'	NULL	INDEX	YES
@@ -7202,6 +8435,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'127.0.0.1'	NULL	SHOW VIEW	YES
 'root'@'127.0.0.1'	NULL	SHUTDOWN	YES
 'root'@'127.0.0.1'	NULL	SUPER	YES
+'root'@'127.0.0.1'	NULL	TRIGGER	YES
 'root'@'127.0.0.1'	NULL	UPDATE	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER	YES
 'root'@'<SERVER_NAME>'	NULL	ALTER ROUTINE	YES
@@ -7212,6 +8446,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	CREATE VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	DELETE	YES
 'root'@'<SERVER_NAME>'	NULL	DROP	YES
+'root'@'<SERVER_NAME>'	NULL	EVENT	YES
 'root'@'<SERVER_NAME>'	NULL	EXECUTE	YES
 'root'@'<SERVER_NAME>'	NULL	FILE	YES
 'root'@'<SERVER_NAME>'	NULL	INDEX	YES
@@ -7227,6 +8462,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'<SERVER_NAME>'	NULL	SHOW VIEW	YES
 'root'@'<SERVER_NAME>'	NULL	SHUTDOWN	YES
 'root'@'<SERVER_NAME>'	NULL	SUPER	YES
+'root'@'<SERVER_NAME>'	NULL	TRIGGER	YES
 'root'@'<SERVER_NAME>'	NULL	UPDATE	YES
 'root'@'localhost'	NULL	ALTER	YES
 'root'@'localhost'	NULL	ALTER ROUTINE	YES
@@ -7237,6 +8473,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	CREATE VIEW	YES
 'root'@'localhost'	NULL	DELETE	YES
 'root'@'localhost'	NULL	DROP	YES
+'root'@'localhost'	NULL	EVENT	YES
 'root'@'localhost'	NULL	EXECUTE	YES
 'root'@'localhost'	NULL	FILE	YES
 'root'@'localhost'	NULL	INDEX	YES
@@ -7252,6 +8489,7 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'root'@'localhost'	NULL	SHOW VIEW	YES
 'root'@'localhost'	NULL	SHUTDOWN	YES
 'root'@'localhost'	NULL	SUPER	YES
+'root'@'localhost'	NULL	TRIGGER	YES
 'root'@'localhost'	NULL	UPDATE	YES
 select *
 from information_schema.column_privileges
@@ -7293,10 +8531,21 @@ information_schema	COLLATIONS	MEMORY
 information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	MEMORY
 information_schema	COLUMNS	MyISAM
 information_schema	COLUMN_PRIVILEGES	MEMORY
+information_schema	ENGINES	MEMORY
+information_schema	EVENTS	MyISAM
+information_schema	FILES	MEMORY
+information_schema	GLOBAL_STATUS	MEMORY
+information_schema	GLOBAL_VARIABLES	MyISAM
 information_schema	KEY_COLUMN_USAGE	MEMORY
+information_schema	PARTITIONS	MyISAM
+information_schema	PLUGINS	MyISAM
+information_schema	PROCESSLIST	MyISAM
+information_schema	REFERENTIAL_CONSTRAINTS	MEMORY
 information_schema	ROUTINES	MyISAM
 information_schema	SCHEMATA	MEMORY
 information_schema	SCHEMA_PRIVILEGES	MEMORY
+information_schema	SESSION_STATUS	MEMORY
+information_schema	SESSION_VARIABLES	MyISAM
 information_schema	STATISTICS	MEMORY
 information_schema	TABLES	MEMORY
 information_schema	TABLE_CONSTRAINTS	MEMORY
@@ -7325,10 +8574,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7355,10 +8615,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7422,6 +8693,7 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
+filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -7436,6 +8708,7 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
+cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -7526,10 +8799,21 @@ COLLATIONS
 COLLATION_CHARACTER_SET_APPLICABILITY
 COLUMNS
 COLUMN_PRIVILEGES
+ENGINES
+EVENTS
+FILES
+GLOBAL_STATUS
+GLOBAL_VARIABLES
 KEY_COLUMN_USAGE
+PARTITIONS
+PLUGINS
+PROCESSLIST
+REFERENTIAL_CONSTRAINTS
 ROUTINES
 SCHEMATA
 SCHEMA_PRIVILEGES
+SESSION_STATUS
+SESSION_VARIABLES
 STATISTICS
 TABLES
 TABLE_CONSTRAINTS
@@ -7568,14 +8852,14 @@ COLUMNS	TABLE_CATALOG	varchar(4096)
 COLUMNS	TABLE_SCHEMA	varchar(64)
 COLUMNS	TABLE_NAME	varchar(64)
 COLUMNS	COLUMN_NAME	varchar(64)
-COLUMNS	ORDINAL_POSITION	bigint(21)
+COLUMNS	ORDINAL_POSITION	bigint(21) unsigned
 COLUMNS	COLUMN_DEFAULT	longtext
 COLUMNS	IS_NULLABLE	varchar(3)
 COLUMNS	DATA_TYPE	varchar(64)
-COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21)
-COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21)
-COLUMNS	NUMERIC_PRECISION	bigint(21)
-COLUMNS	NUMERIC_SCALE	bigint(21)
+COLUMNS	CHARACTER_MAXIMUM_LENGTH	bigint(21) unsigned
+COLUMNS	CHARACTER_OCTET_LENGTH	bigint(21) unsigned
+COLUMNS	NUMERIC_PRECISION	bigint(21) unsigned
+COLUMNS	NUMERIC_SCALE	bigint(21) unsigned
 COLUMNS	CHARACTER_SET_NAME	varchar(64)
 COLUMNS	COLLATION_NAME	varchar(64)
 COLUMNS	COLUMN_TYPE	longtext
@@ -7590,6 +8874,75 @@ COLUMN_PRIVILEGES	TABLE_NAME	varchar(64)
 COLUMN_PRIVILEGES	COLUMN_NAME	varchar(64)
 COLUMN_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 COLUMN_PRIVILEGES	IS_GRANTABLE	varchar(3)
+ENGINES	ENGINE	varchar(64)
+ENGINES	SUPPORT	varchar(8)
+ENGINES	COMMENT	varchar(80)
+ENGINES	TRANSACTIONS	varchar(3)
+ENGINES	XA	varchar(3)
+ENGINES	SAVEPOINTS	varchar(3)
+EVENTS	EVENT_CATALOG	varchar(64)
+EVENTS	EVENT_SCHEMA	varchar(64)
+EVENTS	EVENT_NAME	varchar(64)
+EVENTS	DEFINER	varchar(77)
+EVENTS	TIME_ZONE	varchar(64)
+EVENTS	EVENT_BODY	varchar(8)
+EVENTS	EVENT_DEFINITION	longtext
+EVENTS	EVENT_TYPE	varchar(9)
+EVENTS	EXECUTE_AT	datetime
+EVENTS	INTERVAL_VALUE	varchar(256)
+EVENTS	INTERVAL_FIELD	varchar(18)
+EVENTS	SQL_MODE	longtext
+EVENTS	STARTS	datetime
+EVENTS	ENDS	datetime
+EVENTS	STATUS	varchar(18)
+EVENTS	ON_COMPLETION	varchar(12)
+EVENTS	CREATED	datetime
+EVENTS	LAST_ALTERED	datetime
+EVENTS	LAST_EXECUTED	datetime
+EVENTS	EVENT_COMMENT	varchar(64)
+EVENTS	ORIGINATOR	bigint(10)
+FILES	FILE_ID	bigint(4)
+FILES	FILE_NAME	varchar(64)
+FILES	FILE_TYPE	varchar(20)
+FILES	TABLESPACE_NAME	varchar(64)
+FILES	TABLE_CATALOG	varchar(64)
+FILES	TABLE_SCHEMA	varchar(64)
+FILES	TABLE_NAME	varchar(64)
+FILES	LOGFILE_GROUP_NAME	varchar(64)
+FILES	LOGFILE_GROUP_NUMBER	bigint(4)
+FILES	ENGINE	varchar(64)
+FILES	FULLTEXT_KEYS	varchar(64)
+FILES	DELETED_ROWS	bigint(4)
+FILES	UPDATE_COUNT	bigint(4)
+FILES	FREE_EXTENTS	bigint(4)
+FILES	TOTAL_EXTENTS	bigint(4)
+FILES	EXTENT_SIZE	bigint(4)
+FILES	INITIAL_SIZE	bigint(21) unsigned
+FILES	MAXIMUM_SIZE	bigint(21) unsigned
+FILES	AUTOEXTEND_SIZE	bigint(21) unsigned
+FILES	CREATION_TIME	datetime
+FILES	LAST_UPDATE_TIME	datetime
+FILES	LAST_ACCESS_TIME	datetime
+FILES	RECOVER_TIME	bigint(4)
+FILES	TRANSACTION_COUNTER	bigint(4)
+FILES	VERSION	bigint(21) unsigned
+FILES	ROW_FORMAT	varchar(10)
+FILES	TABLE_ROWS	bigint(21) unsigned
+FILES	AVG_ROW_LENGTH	bigint(21) unsigned
+FILES	DATA_LENGTH	bigint(21) unsigned
+FILES	MAX_DATA_LENGTH	bigint(21) unsigned
+FILES	INDEX_LENGTH	bigint(21) unsigned
+FILES	DATA_FREE	bigint(21) unsigned
+FILES	CREATE_TIME	datetime
+FILES	UPDATE_TIME	datetime
+FILES	CHECK_TIME	datetime
+FILES	CHECKSUM	bigint(21) unsigned
+FILES	STATUS	varchar(20)
+FILES	EXTRA	varchar(255)
+GLOBAL_STATUS	VARIABLE_NAME	varchar(64)
+GLOBAL_STATUS	VARIABLE_VALUE	decimal(22,7)
+GLOBAL_VARIABLES	VARIABLE_NAME	varchar(64)
+GLOBAL_VARIABLES	VARIABLE_VALUE	longtext
 KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar(4096)
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	CONSTRAINT_NAME	varchar(64)
@@ -7602,6 +8955,60 @@ KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	bigint(10)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	varchar(64)
 KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	varchar(64)
+PARTITIONS	TABLE_CATALOG	varchar(4096)
+PARTITIONS	TABLE_SCHEMA	varchar(64)
+PARTITIONS	TABLE_NAME	varchar(64)
+PARTITIONS	PARTITION_NAME	varchar(64)
+PARTITIONS	SUBPARTITION_NAME	varchar(64)
+PARTITIONS	PARTITION_ORDINAL_POSITION	bigint(21) unsigned
+PARTITIONS	SUBPARTITION_ORDINAL_POSITION	bigint(21) unsigned
+PARTITIONS	PARTITION_METHOD	varchar(12)
+PARTITIONS	SUBPARTITION_METHOD	varchar(12)
+PARTITIONS	PARTITION_EXPRESSION	longtext
+PARTITIONS	SUBPARTITION_EXPRESSION	longtext
+PARTITIONS	PARTITION_DESCRIPTION	longtext
+PARTITIONS	TABLE_ROWS	bigint(21) unsigned
+PARTITIONS	AVG_ROW_LENGTH	bigint(21) unsigned
+PARTITIONS	DATA_LENGTH	bigint(21) unsigned
+PARTITIONS	MAX_DATA_LENGTH	bigint(21) unsigned
+PARTITIONS	INDEX_LENGTH	bigint(21) unsigned
+PARTITIONS	DATA_FREE	bigint(21) unsigned
+PARTITIONS	CREATE_TIME	datetime
+PARTITIONS	UPDATE_TIME	datetime
+PARTITIONS	CHECK_TIME	datetime
+PARTITIONS	CHECKSUM	bigint(21) unsigned
+PARTITIONS	PARTITION_COMMENT	varchar(80)
+PARTITIONS	NODEGROUP	varchar(12)
+PARTITIONS	TABLESPACE_NAME	varchar(64)
+PLUGINS	PLUGIN_NAME	varchar(64)
+PLUGINS	PLUGIN_VERSION	varchar(20)
+PLUGINS	PLUGIN_STATUS	varchar(10)
+PLUGINS	PLUGIN_TYPE	varchar(80)
+PLUGINS	PLUGIN_TYPE_VERSION	varchar(20)
+PLUGINS	PLUGIN_LIBRARY	varchar(64)
+PLUGINS	PLUGIN_LIBRARY_VERSION	varchar(20)
+PLUGINS	PLUGIN_AUTHOR	varchar(64)
+PLUGINS	PLUGIN_DESCRIPTION	longtext
+PLUGINS	PLUGIN_LICENSE	varchar(80)
+PROCESSLIST	ID	bigint(4)
+PROCESSLIST	USER	varchar(16)
+PROCESSLIST	HOST	varchar(64)
+PROCESSLIST	DB	varchar(64)
+PROCESSLIST	COMMAND	varchar(16)
+PROCESSLIST	TIME	bigint(7)
+PROCESSLIST	STATE	varchar(64)
+PROCESSLIST	INFO	longtext
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_SCHEMA	varchar(64)
+REFERENTIAL_CONSTRAINTS	CONSTRAINT_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_CATALOG	varchar(4096)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_SCHEMA	varchar(64)
+REFERENTIAL_CONSTRAINTS	UNIQUE_CONSTRAINT_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	MATCH_OPTION	varchar(64)
+REFERENTIAL_CONSTRAINTS	UPDATE_RULE	varchar(64)
+REFERENTIAL_CONSTRAINTS	DELETE_RULE	varchar(64)
+REFERENTIAL_CONSTRAINTS	TABLE_NAME	varchar(64)
+REFERENTIAL_CONSTRAINTS	REFERENCED_TABLE_NAME	varchar(64)
 ROUTINES	SPECIFIC_NAME	varchar(64)
 ROUTINES	ROUTINE_CATALOG	varchar(4096)
 ROUTINES	ROUTINE_SCHEMA	varchar(64)
@@ -7632,6 +9039,10 @@ SCHEMA_PRIVILEGES	TABLE_CATALOG	varchar(4096)
 SCHEMA_PRIVILEGES	TABLE_SCHEMA	varchar(64)
 SCHEMA_PRIVILEGES	PRIVILEGE_TYPE	varchar(64)
 SCHEMA_PRIVILEGES	IS_GRANTABLE	varchar(3)
+SESSION_STATUS	VARIABLE_NAME	varchar(64)
+SESSION_STATUS	VARIABLE_VALUE	decimal(22,7)
+SESSION_VARIABLES	VARIABLE_NAME	varchar(64)
+SESSION_VARIABLES	VARIABLE_VALUE	longtext
 STATISTICS	TABLE_CATALOG	varchar(4096)
 STATISTICS	TABLE_SCHEMA	varchar(64)
 STATISTICS	TABLE_NAME	varchar(64)
@@ -7652,20 +9063,20 @@ TABLES	TABLE_SCHEMA	varchar(64)
 TABLES	TABLE_NAME	varchar(64)
 TABLES	TABLE_TYPE	varchar(64)
 TABLES	ENGINE	varchar(64)
-TABLES	VERSION	bigint(21)
+TABLES	VERSION	bigint(21) unsigned
 TABLES	ROW_FORMAT	varchar(10)
-TABLES	TABLE_ROWS	bigint(21)
-TABLES	AVG_ROW_LENGTH	bigint(21)
-TABLES	DATA_LENGTH	bigint(21)
-TABLES	MAX_DATA_LENGTH	bigint(21)
-TABLES	INDEX_LENGTH	bigint(21)
-TABLES	DATA_FREE	bigint(21)
-TABLES	AUTO_INCREMENT	bigint(21)
+TABLES	TABLE_ROWS	bigint(21) unsigned
+TABLES	AVG_ROW_LENGTH	bigint(21) unsigned
+TABLES	DATA_LENGTH	bigint(21) unsigned
+TABLES	MAX_DATA_LENGTH	bigint(21) unsigned
+TABLES	INDEX_LENGTH	bigint(21) unsigned
+TABLES	DATA_FREE	bigint(21) unsigned
+TABLES	AUTO_INCREMENT	bigint(21) unsigned
 TABLES	CREATE_TIME	datetime
 TABLES	UPDATE_TIME	datetime
 TABLES	CHECK_TIME	datetime
 TABLES	TABLE_COLLATION	varchar(64)
-TABLES	CHECKSUM	bigint(21)
+TABLES	CHECKSUM	bigint(21) unsigned
 TABLES	CREATE_OPTIONS	varchar(255)
 TABLES	TABLE_COMMENT	varchar(80)
 TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	varchar(4096)
@@ -8084,6 +9495,7 @@ cp1250_general_ci
 cp1250_czech_cs
 cp1250_croatian_ci
 cp1250_bin
+cp1250_polish_ci
 gbk_chinese_ci
 gbk_bin
 latin5_turkish_ci
@@ -8291,10 +9703,10 @@ MAXLEN	bigint(3)	NO		0
 SHOW CREATE TABLE 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8372,12 +9784,12 @@ SORTLEN	bigint(3)	NO		0
 SHOW CREATE TABLE 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8448,6 +9860,7 @@ cp1250_general_ci	cp1250	26	Yes	Yes	1
 cp1250_czech_cs	cp1250	34		Yes	2
 cp1250_croatian_ci	cp1250	44		Yes	1
 cp1250_bin	cp1250	66		Yes	1
+cp1250_polish_ci	cp1250	99		Yes	1
 gbk_chinese_ci	gbk	28	Yes	Yes	1
 gbk_bin	gbk	87		Yes	1
 latin5_turkish_ci	latin5	30	Yes		0
@@ -8541,8 +9954,8 @@ CHARACTER_SET_NAME	varchar(64)	NO
 SHOW CREATE TABLE 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8595,6 +10008,7 @@ sjis_japanese_ci	sjis
 sjis_bin	sjis
 hebrew_general_ci	hebrew
 hebrew_bin	hebrew
+filename	filename
 tis620_thai_ci	tis620
 tis620_bin	tis620
 euckr_korean_ci	euckr
@@ -8609,6 +10023,7 @@ cp1250_general_ci	cp1250
 cp1250_czech_cs	cp1250
 cp1250_croatian_ci	cp1250
 cp1250_bin	cp1250
+cp1250_polish_ci	cp1250
 gbk_chinese_ci	gbk
 gbk_bin	gbk
 latin5_turkish_ci	latin5
@@ -8707,13 +10122,13 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE column_privileges;
 Table	Create Table
 COLUMN_PRIVILEGES	CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8819,6 +10234,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_3'@'localhost'	NULL	db_datadict	SHOW VIEW	NO
 'user_3'@'localhost'	NULL	db_datadict	CREATE ROUTINE	NO
 'user_3'@'localhost'	NULL	db_datadict	ALTER ROUTINE	NO
+'user_3'@'localhost'	NULL	db_datadict	EVENT	NO
+'user_3'@'localhost'	NULL	db_datadict	TRIGGER	NO
 SELECT * FROM information_schema.column_privileges
 WHERE grantee LIKE "'user%"
  ORDER BY grantee, table_name, column_name, privilege_type;
@@ -8859,14 +10276,14 @@ TABLE_CATALOG	varchar(4096)	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			
@@ -8877,25 +10294,25 @@ COLUMN_COMMENT	varchar(255)	NO
 SHOW CREATE TABLE columns;
 Table	Create Table
 COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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(20) NOT NULL DEFAULT '',
+  `PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
+  `COLUMN_COMMENT` varchar(255) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -8912,14 +10329,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -8967,14 +10384,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -8989,6 +10406,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			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	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			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	SQL_MODE	12		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	ENDS	14	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	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	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	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			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	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_SCHEMA	6	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	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	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DELETED_ROWS	12	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	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			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	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATION_TIME	20	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	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	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	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	TABLE_ROWS	27	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	DATA_LENGTH	29	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	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9001,6 +10487,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	SUBPARTITION_NAME	5	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_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_LENGTH	15	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	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			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_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_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_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			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	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9031,6 +10571,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 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	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9051,20 +10595,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -9137,10 +10681,36 @@ NULL	mysql	db	Show_view_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enu
 NULL	mysql	db	Create_routine_priv	18	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	
 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	Event_priv	21	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	event	db	1		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)	PRI		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	body	3	NULL	NO	longblob	4294967295	4294967295	NULL	NULL	NULL	NULL	longblob			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	execute_at	5	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	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	created	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			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	last_executed	10	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	ends	12	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	on_completion	14	DROP	NO	enum	8	24	NULL	NULL	utf8	utf8_general_ci	enum('DROP','PRESERVE')			select,insert,update,references	
+NULL	mysql	event	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	event	comment	16		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)			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	time_zone	18	SYSTEM	NO	char	64	64	NULL	NULL	latin1	latin1_swedish_ci	char(64)			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	dl	3		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			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	event_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			select,insert,update,references	
+NULL	mysql	general_log	user_host	2	NULL	YES	mediumtext	16777215	16777215	NULL	NULL	utf8	utf8_general_ci	mediumtext			select,insert,update,references	
+NULL	mysql	general_log	thread_id	3	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	server_id	4	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	general_log	command_type	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+NULL	mysql	general_log	argument	6	NULL	YES	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	
@@ -9174,6 +10744,16 @@ NULL	mysql	host	Show_view_priv	16	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	host	Create_routine_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Alter_routine_priv	18	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	host	Execute_priv	19	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	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	File	2	NULL	NO	varchar	255	255	NULL	NULL	latin1	latin1_swedish_ci	varchar(255)			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	inserts	4	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	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	schemaops	7	NULL	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20) unsigned			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	plugin	dl	2		NO	char	128	384	NULL	NULL	utf8	utf8_bin	char(128)			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	name	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)	PRI		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	
@@ -9198,13 +10778,33 @@ NULL	mysql	procs_priv	Routine_type	5	NULL	NO	enum	9	27	NULL	NULL	utf8	utf8_bin	e
 NULL	mysql	procs_priv	Grantor	6		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		select,insert,update,references	
 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	Timestamp	8	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	timestamp			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	Host	2		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			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	Username	4		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	Socket	7		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	servers	Owner	9		NO	char	64	192	NULL	NULL	utf8	utf8_general_ci	char(64)			select,insert,update,references	
+NULL	mysql	slow_log	start_time	1	CURRENT_TIMESTAMP	NO	timestamp	NULL	NULL	NULL	NULL	NULL	NULL	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	slow_log	query_time	3	NULL	NO	time	NULL	NULL	NULL	NULL	NULL	NULL	time			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	rows_sent	5	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			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	db	7	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select,insert,update,references	
+NULL	mysql	slow_log	last_insert_id	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	insert_id	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+NULL	mysql	slow_log	server_id	10	NULL	YES	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	tables_priv	Host	1		NO	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)	PRI		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	User	3		NO	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)	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	Grantor	5		NO	char	77	231	NULL	NULL	utf8	utf8_bin	char(77)	MUL		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	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	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	Column_priv	8		NO	set	31	93	NULL	NULL	utf8	utf8_general_ci	set('Select','Insert','Update','References')			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	
@@ -9249,14 +10849,16 @@ NULL	mysql	user	Show_view_priv	26	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	e
 NULL	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			select,insert,update,references	
 NULL	mysql	user	Create_user_priv	29	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')			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	31	NULL	NO	blob	65535	65535	NULL	NULL	NULL	NULL	blob			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	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_connections	36	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	Event_priv	30	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	ssl_type	32		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	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	
+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_connections	38	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	test	t1	f1	1	NULL	YES	char	20	20	NULL	NULL	latin1	latin1_swedish_ci	char(20)			select,insert,update,references	
 NULL	test	t1	f2	2	NULL	YES	char	25	25	NULL	NULL	latin1	latin1_swedish_ci	char(25)			select,insert,update,references	
 NULL	test	t1	f3	3	NULL	YES	date	NULL	NULL	NULL	NULL	NULL	NULL	date			select,insert,update,references	
@@ -9630,14 +11232,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -9652,6 +11254,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			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	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			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	SQL_MODE	12		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	ENDS	14	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	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	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	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			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	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_SCHEMA	6	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	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	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DELETED_ROWS	12	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	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			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	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATION_TIME	20	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	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	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	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	TABLE_ROWS	27	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	DATA_LENGTH	29	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	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9664,6 +11335,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	SUBPARTITION_NAME	5	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_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_LENGTH	15	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	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			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_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_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_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			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	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9694,6 +11419,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 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	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -9714,20 +11443,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -10081,14 +11810,14 @@ NULL	information_schema	COLUMNS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL
 NULL	information_schema	COLUMNS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-NULL	information_schema	COLUMNS	ORDINAL_POSITION	5	0	NO	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) unsigned			select	
 NULL	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	DATA_TYPE	8		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	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	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	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	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_TYPE	15		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -10103,6 +11832,75 @@ NULL	information_schema	COLUMN_PRIVILEGES	TABLE_NAME	4		NO	varchar	64	192	NULL	N
 NULL	information_schema	COLUMN_PRIVILEGES	COLUMN_NAME	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	PRIVILEGE_TYPE	6		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	COLUMN_PRIVILEGES	IS_GRANTABLE	7		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
+NULL	information_schema	ENGINES	ENGINE	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	ENGINES	SUPPORT	2		NO	varchar	8	24	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
+NULL	information_schema	ENGINES	COMMENT	3		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			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	ENGINES	SAVEPOINTS	6		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DEFINER	4		NO	varchar	77	231	NULL	NULL	utf8	utf8_general_ci	varchar(77)			select	
+NULL	information_schema	EVENTS	TIME_ZONE	5		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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_VALUE	10	NULL	YES	varchar	256	768	NULL	NULL	utf8	utf8_general_ci	varchar(256)			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	SQL_MODE	12		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	ENDS	14	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	ON_COMPLETION	16		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	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	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	EVENTS	ORIGINATOR	21	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(10)			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	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_SCHEMA	6	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	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	ENGINE	10		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	DELETED_ROWS	12	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	FREE_EXTENTS	14	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	TOTAL_EXTENTS	15	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	FILES	EXTENT_SIZE	16	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			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	MAXIMUM_SIZE	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATION_TIME	20	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	LAST_ACCESS_TIME	22	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	RECOVER_TIME	23	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	VERSION	25	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	TABLE_ROWS	27	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	DATA_LENGTH	29	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	INDEX_LENGTH	31	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	33	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	UPDATE_TIME	34	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECK_TIME	35	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	FILES	CHECKSUM	36	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			select	
+NULL	information_schema	FILES	STATUS	37		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			select	
+NULL	information_schema	FILES	EXTRA	38	NULL	YES	varchar	255	765	NULL	NULL	utf8	utf8_general_ci	varchar(255)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10115,6 +11913,60 @@ NULL	information_schema	KEY_COLUMN_USAGE	POSITION_IN_UNIQUE_CONSTRAINT	9	NULL	YE
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_TABLE_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	KEY_COLUMN_USAGE	REFERENCED_COLUMN_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PARTITIONS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	SUBPARTITION_NAME	5	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_ORDINAL_POSITION	7	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	SUBPARTITION_METHOD	9	NULL	YES	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	SUBPARTITION_EXPRESSION	11	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			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	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_LENGTH	15	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	INDEX_LENGTH	17	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	19	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECK_TIME	21	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
+NULL	information_schema	PARTITIONS	CHECKSUM	22	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	NODEGROUP	24		NO	varchar	12	36	NULL	NULL	utf8	utf8_general_ci	varchar(12)			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	PLUGINS	PLUGIN_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
+NULL	information_schema	PLUGINS	PLUGIN_VERSION	2		NO	varchar	20	60	NULL	NULL	utf8	utf8_general_ci	varchar(20)			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_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_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_LICENSE	10	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
+NULL	information_schema	PROCESSLIST	ID	1	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(4)			select	
+NULL	information_schema	PROCESSLIST	USER	2		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	HOST	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	COMMAND	5		NO	varchar	16	48	NULL	NULL	utf8	utf8_general_ci	varchar(16)			select	
+NULL	information_schema	PROCESSLIST	TIME	6	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(7)			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	INFO	8	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	ROUTINES	SPECIFIC_NAME	1		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	ROUTINES	ROUTINE_CATALOG	2	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10145,6 +11997,10 @@ NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_CATALOG	2	NULL	YES	varchar	4096
 NULL	information_schema	SCHEMA_PRIVILEGES	TABLE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 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	IS_GRANTABLE	5		NO	varchar	3	9	NULL	NULL	utf8	utf8_general_ci	varchar(3)			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	0.0000000	NO	decimal	NULL	NULL	22	7	NULL	NULL	decimal(22,7)			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	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 NULL	information_schema	STATISTICS	TABLE_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
 NULL	information_schema	STATISTICS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	STATISTICS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -10165,20 +12021,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	TABLE_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			select	
@@ -10538,7 +12394,9 @@ COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
 1.0000	set	latin1	latin1_swedish_ci
 1.0000	text	latin1	latin1_swedish_ci
 1.0000	tinytext	latin1	latin1_swedish_ci
+1.0000	varchar	latin1	latin1_swedish_ci
 1.0000	longtext	utf8	utf8_general_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,
@@ -10626,14 +12484,14 @@ 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
@@ -10648,6 +12506,75 @@ 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)
+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)
+NULL	information_schema	GLOBAL_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
+3.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	GLOBAL_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	KEY_COLUMN_USAGE	CONSTRAINT_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 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)
@@ -10660,6 +12587,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	4096	12288	utf8	utf8_general_ci	varchar(4096)
+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	4096	12288	utf8	utf8_general_ci	varchar(4096)
+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	4096	12288	utf8	utf8_general_ci	varchar(4096)
+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	4096	12288	utf8	utf8_general_ci	varchar(4096)
 3.0000	information_schema	ROUTINES	ROUTINE_SCHEMA	varchar	64	192	utf8	utf8_general_ci	varchar(64)
@@ -10690,6 +12671,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)
+NULL	information_schema	SESSION_STATUS	VARIABLE_VALUE	decimal	NULL	NULL	NULL	NULL	decimal(22,7)
+3.0000	information_schema	SESSION_VARIABLES	VARIABLE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
+1.0000	information_schema	SESSION_VARIABLES	VARIABLE_VALUE	longtext	4294967295	4294967295	utf8	utf8_general_ci	longtext
 3.0000	information_schema	STATISTICS	TABLE_CATALOG	varchar	4096	12288	utf8	utf8_general_ci	varchar(4096)
 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)
@@ -10710,20 +12695,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	4096	12288	utf8	utf8_general_ci	varchar(4096)
@@ -10796,10 +12781,36 @@ 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	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	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	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
@@ -10833,6 +12844,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')
@@ -10857,13 +12878,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	4096	12288	utf8	utf8_general_ci	varchar(4096)
+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')
@@ -10908,6 +12949,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
@@ -11293,18 +13336,18 @@ REFERENCED_COLUMN_NAME	varchar(64)	YES		NULL
 SHOW CREATE TABLE key_column_usage;
 Table	Create Table
 KEY_COLUMN_USAGE	CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` (
-  `CONSTRAINT_CATALOG` varchar(4096) default NULL,
-  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL default '',
-  `CONSTRAINT_NAME` varchar(64) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_CATALOG` varchar(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11365,6 +13408,8 @@ NULL	mysql	PRIMARY	NULL	mysql	columns_priv	Column_name	5	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	db	User	3	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	db	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	event	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	func	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_category	help_category_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_keyword	help_keyword_id	1	NULL	NULL	NULL	NULL
@@ -11373,6 +13418,8 @@ NULL	mysql	PRIMARY	NULL	mysql	help_relation	help_topic_id	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	help_topic	help_topic_id	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	host	Db	2	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	ndb_binlog_index	epoch	1	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	plugin	name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	db	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	name	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	proc	type	3	NULL	NULL	NULL	NULL
@@ -11381,6 +13428,7 @@ NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	User	3	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_name	4	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	procs_priv	Routine_type	5	NULL	NULL	NULL	NULL
+NULL	mysql	PRIMARY	NULL	mysql	servers	Server_name	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Host	1	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	Db	2	NULL	NULL	NULL	NULL
 NULL	mysql	PRIMARY	NULL	mysql	tables_priv	User	3	NULL	NULL	NULL	NULL
@@ -11442,26 +13490,26 @@ DEFINER	varchar(77)	NO
 SHOW CREATE TABLE routines;
 Table	Create Table
 ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
-  `SPECIFIC_NAME` varchar(64) NOT NULL default '',
-  `ROUTINE_CATALOG` varchar(4096) 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(4096) 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 ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11786,11 +13834,11 @@ SQL_PATH	varchar(4096)	YES		NULL
 SHOW CREATE TABLE schemata;
 Table	Create Table
 SCHEMATA	CREATE TEMPORARY TABLE `SCHEMATA` (
-  `CATALOG_NAME` varchar(4096) 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(4096) default NULL
+  `CATALOG_NAME` varchar(4096) 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(4096) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11869,12 +13917,12 @@ CONSTRAINT_TYPE	varchar(64)	NO
 SHOW CREATE TABLE table_constraints;
 Table	Create Table
 TABLE_CONSTRAINTS	CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` (
-  `CONSTRAINT_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -11949,12 +13997,12 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE table_privileges;
 Table	Create Table
 TABLE_PRIVILEGES	CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12008,6 +14056,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
+'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = USER();
@@ -12017,7 +14066,7 @@ SELECT USER(), COUNT(*)
 FROM information_schema.table_privileges
 WHERE grantee = "'user_2'@'localhost'";
 USER()	COUNT(*)
-user_2@localhost	11
+user_2@localhost	12
 connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.table_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -12037,6 +14086,7 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	db_datadict	tb1	ALTER	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	CREATE VIEW	YES
 'user_2'@'localhost'	NULL	db_datadict	tb1	SHOW VIEW	YES
+'user_2'@'localhost'	NULL	db_datadict	tb1	TRIGGER	YES
 'user_1'@'localhost'	NULL	db_datadict	tb1	SELECT	NO
 'user_3'@'localhost'	NULL	db_datadict	tb3	SELECT	NO
 	
@@ -12059,46 +14109,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 tables;
 Table	Create Table
 TABLES	CREATE TEMPORARY TABLE `TABLES` (
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12116,20 +14166,20 @@ NULL	information_schema	TABLES	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8
 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_TYPE	4		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			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	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	TABLES	ROW_FORMAT	7	NULL	YES	varchar	10	30	NULL	NULL	utf8	utf8_general_ci	varchar(10)			select	
-NULL	information_schema	TABLES	TABLE_ROWS	8	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	DATA_LENGTH	10	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)			select	
-NULL	information_schema	TABLES	DATA_FREE	13	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)			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	AVG_ROW_LENGTH	9	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	MAX_DATA_LENGTH	11	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	DATA_FREE	13	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(21) unsigned			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	CREATE_TIME	15	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	UPDATE_TIME	16	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
 NULL	information_schema	TABLES	CHECK_TIME	17	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			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	CHECKSUM	19	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) unsigned			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	TABLE_COMMENT	21		NO	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 
@@ -12157,22 +14207,33 @@ GRANT SELECT ON db_datadict.v3 to 'user_3'@'localhost';
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12197,22 +14258,33 @@ connect(localhost,user_2,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12235,22 +14307,33 @@ connect(localhost,user_3,,db_datadict,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12274,22 +14357,33 @@ root@localhost	db_datadict
 SELECT * FROM information_schema.tables
 WHERE table_schema = 'information_schema';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
-NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	0	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
-NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	0	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	CHARACTER_SETS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATIONS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLLATION_CHARACTER_SET_APPLICABILITY	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMNS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	COLUMN_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ENGINES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	EVENTS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	FILES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	GLOBAL_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	KEY_COLUMN_USAGE	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PARTITIONS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PLUGINS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	PROCESSLIST	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	ROUTINES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMATA	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SCHEMA_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_STATUS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	SESSION_VARIABLES	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	STATISTICS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_CONSTRAINTS	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TABLE_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	TRIGGERS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	USER_PRIVILEGES	SYSTEM VIEW	MEMORY	10	Fixed	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
+NULL	information_schema	VIEWS	SYSTEM VIEW	MyISAM	10	Dynamic	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL	#CO#	
 SELECT * FROM information_schema.tables
 WHERE NOT( table_schema = 'information_schema');
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT
@@ -12299,14 +14393,20 @@ NULL	db_datadict	tb3	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	N
 NULL	db_datadict	v3	VIEW	NULL	NULL	NULL	NULL	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	NULL	NULL	NULL	VIEW
 NULL	mysql	columns_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Column privileges
 NULL	mysql	db	BASE TABLE	MyISAM	10	Fixed	3	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Database privileges
+NULL	mysql	event	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Events
 NULL	mysql	func	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		User defined functions
+NULL	mysql	general_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		General log
 NULL	mysql	help_category	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help categories
 NULL	mysql	help_keyword	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help keywords
 NULL	mysql	help_relation	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		keyword-topic relation
 NULL	mysql	help_topic	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		help topics
 NULL	mysql	host	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Host privileges;  Merged with database privileges
+NULL	mysql	ndb_binlog_index	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	latin1_swedish_ci	NULL		
+NULL	mysql	plugin	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		MySQL plugins
 NULL	mysql	proc	BASE TABLE	MyISAM	10	Dynamic	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Stored Procedures
 NULL	mysql	procs_priv	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Procedure privileges
+NULL	mysql	servers	BASE TABLE	MyISAM	10	Fixed	0	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		MySQL Foreign Servers table
+NULL	mysql	slow_log	BASE TABLE	CSV	10	Dynamic	2	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Slow log
 NULL	mysql	tables_priv	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_bin	NULL		Table privileges
 NULL	mysql	time_zone	BASE TABLE	MyISAM	10	Fixed	5	#ARL#	#DL#	#MDL#	#IL#	#DF#	6	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Time zones
 NULL	mysql	time_zone_leap_second	BASE TABLE	MyISAM	10	Fixed	22	#ARL#	#DL#	#MDL#	#IL#	#DF#	NULL	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	YYYY-MM-DD hh:mm:ss	utf8_general_ci	NULL		Leap seconds information for time zones
@@ -12354,14 +14454,14 @@ SECURITY_TYPE	varchar(7)	NO
 SHOW CREATE TABLE views;
 Table	Create Table
 VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
-  `TABLE_CATALOG` varchar(4096) default NULL,
-  `TABLE_SCHEMA` varchar(64) NOT NULL default '',
-  `TABLE_NAME` varchar(64) NOT NULL default '',
+  `TABLE_CATALOG` varchar(4096) 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 ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12449,21 +14549,21 @@ COMMENT	varchar(16)	YES		NULL
 SHOW CREATE TABLE statistics;
 Table	Create Table
 STATISTICS	CREATE TEMPORARY TABLE `STATISTICS` (
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12541,6 +14641,8 @@ NULL	mysql	db	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 NULL	mysql	db	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	db	0	mysql	PRIMARY	3	User	A	2	NULL	NULL		BTREE	
 NULL	mysql	db	1	mysql	User	1	User	A	1	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	event	0	mysql	PRIMARY	2	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	func	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	PRIMARY	1	help_category_id	A	0	NULL	NULL		BTREE	
 NULL	mysql	help_category	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
@@ -12552,6 +14654,8 @@ NULL	mysql	help_topic	0	mysql	PRIMARY	1	help_topic_id	A	0	NULL	NULL		BTREE
 NULL	mysql	help_topic	0	mysql	name	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	host	0	mysql	PRIMARY	2	Db	A	0	NULL	NULL		BTREE	
+NULL	mysql	ndb_binlog_index	0	mysql	PRIMARY	1	epoch	A	0	NULL	NULL		BTREE	
+NULL	mysql	plugin	0	mysql	PRIMARY	1	name	A	0	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	1	db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	2	name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	proc	0	mysql	PRIMARY	3	type	A	0	NULL	NULL		BTREE	
@@ -12561,6 +14665,7 @@ NULL	mysql	procs_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE
 NULL	mysql	procs_priv	0	mysql	PRIMARY	4	Routine_name	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	0	mysql	PRIMARY	5	Routine_type	A	0	NULL	NULL		BTREE	
 NULL	mysql	procs_priv	1	mysql	Grantor	1	Grantor	A	NULL	NULL	NULL		BTREE	
+NULL	mysql	servers	0	mysql	PRIMARY	1	Server_name	A	0	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	2	Db	A	NULL	NULL	NULL		BTREE	
 NULL	mysql	tables_priv	0	mysql	PRIMARY	3	User	A	NULL	NULL	NULL		BTREE	
@@ -12610,11 +14715,11 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE schema_privileges;
 Table	Create Table
 SCHEMA_PRIVILEGES	CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) 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
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12661,6 +14766,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -12675,6 +14782,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401502,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -12722,6 +14831,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test	CREATE VIEW	NO
 ''@'%'	NULL	test	SHOW VIEW	NO
 ''@'%'	NULL	test	CREATE ROUTINE	NO
+''@'%'	NULL	test	EVENT	NO
+''@'%'	NULL	test	TRIGGER	NO
 ''@'%'	NULL	test\_%	SELECT	NO
 ''@'%'	NULL	test\_%	INSERT	NO
 ''@'%'	NULL	test\_%	UPDATE	NO
@@ -12736,6 +14847,8 @@ GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
 ''@'%'	NULL	test\_%	CREATE VIEW	NO
 ''@'%'	NULL	test\_%	SHOW VIEW	NO
 ''@'%'	NULL	test\_%	CREATE ROUTINE	NO
+''@'%'	NULL	test\_%	EVENT	NO
+''@'%'	NULL	test\_%	TRIGGER	NO
 connect(localhost,u_6_401503_1,,test,MYSQL_PORT,MYSQL_SOCK);
 SELECT * FROM information_schema.schema_privileges;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE
@@ -12772,10 +14885,10 @@ IS_GRANTABLE	varchar(3)	NO
 SHOW CREATE TABLE user_privileges;
 Table	Create Table
 USER_PRIVILEGES	CREATE TEMPORARY TABLE `USER_PRIVILEGES` (
-  `GRANTEE` varchar(81) NOT NULL default '',
-  `TABLE_CATALOG` varchar(4096) 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(4096) DEFAULT NULL,
+  `PRIVILEGE_TYPE` varchar(64) NOT NULL DEFAULT '',
+  `IS_GRANTABLE` varchar(3) NOT NULL DEFAULT ''
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SELECT COUNT(*) FROM information_schema.columns
 WHERE table_schema = 'information_schema'
@@ -12817,10 +14930,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12840,10 +14953,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12855,10 +14968,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -12882,10 +14995,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12902,10 +15015,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12919,10 +15032,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -12934,10 +15047,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	SELECT	YES
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 user_1@localhost
 GRANT SELECT ON *.* TO 'user_1'@'localhost' WITH GRANT OPTION
@@ -12981,10 +15094,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -13034,10 +15147,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -13049,10 +15162,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -13069,10 +15182,10 @@ WHERE grantee LIKE "%user%"
 GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_1'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 user_1@localhost
 GRANT USAGE ON *.* TO 'user_1'@'localhost'
@@ -13095,10 +15208,10 @@ GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE
 'user_2'@'localhost'	NULL	UPDATE	NO
 'user_3'@'localhost'	NULL	USAGE	NO
 SELECT * FROM mysql.user WHERE user LIKE "%user%" 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	user_1		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	user_2		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	user_3		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	user_1		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	user_2		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	user_3		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 root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -13155,23 +15268,23 @@ DEFINER	longtext	NO
 SHOW CREATE TABLE triggers;
 Table	Create Table
 TRIGGERS	CREATE TEMPORARY TABLE `TRIGGERS` (
-  `TRIGGER_CATALOG` varchar(4096) 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(4096) 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(4096) 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(4096) 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
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -13219,11 +15332,70 @@ ERROR 42S02: Unknown table 'parameters' in information_schema
 
 Testcase 3.2.20.1:
 --------------------------------------------------------------------------------
-
-checking a table that will be implemented later
------------------------------------------------
 DESC referential_constraints;
-ERROR 42S02: Unknown table 'referential_constraints' in information_schema
+Field	Type	Null	Key	Default	Extra
+CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO			
+CONSTRAINT_NAME	varchar(64)	NO			
+UNIQUE_CONSTRAINT_CATALOG	varchar(512)	YES		NULL	
+UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
+UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
+MATCH_OPTION	varchar(64)	NO			
+UPDATE_RULE	varchar(64)	NO			
+DELETE_RULE	varchar(64)	NO			
+TABLE_NAME	varchar(64)	NO			
+REFERENCED_TABLE_NAME	varchar(64)	NO			
+USE information_schema;
+DESC referential_constraints;
+Field	Type	Null	Key	Default	Extra
+CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
+CONSTRAINT_SCHEMA	varchar(64)	NO			
+CONSTRAINT_NAME	varchar(64)	NO			
+UNIQUE_CONSTRAINT_CATALOG	varchar(4096)	YES		NULL	
+UNIQUE_CONSTRAINT_SCHEMA	varchar(64)	NO			
+UNIQUE_CONSTRAINT_NAME	varchar(64)	NO			
+MATCH_OPTION	varchar(64)	NO			
+UPDATE_RULE	varchar(64)	NO			
+DELETE_RULE	varchar(64)	NO			
+TABLE_NAME	varchar(64)	NO			
+REFERENCED_TABLE_NAME	varchar(64)	NO			
+SHOW CREATE TABLE referential_constraints;
+Table	Create Table
+REFERENTIAL_CONSTRAINTS	CREATE TEMPORARY TABLE `REFERENTIAL_CONSTRAINTS` (
+  `CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `UNIQUE_CONSTRAINT_CATALOG` varchar(4096) DEFAULT NULL,
+  `UNIQUE_CONSTRAINT_SCHEMA` varchar(64) NOT NULL DEFAULT '',
+  `UNIQUE_CONSTRAINT_NAME` varchar(64) NOT NULL DEFAULT '',
+  `MATCH_OPTION` varchar(64) NOT NULL DEFAULT '',
+  `UPDATE_RULE` varchar(64) NOT NULL DEFAULT '',
+  `DELETE_RULE` varchar(64) NOT NULL DEFAULT '',
+  `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `REFERENCED_TABLE_NAME` varchar(64) NOT NULL DEFAULT ''
+) ENGINE=MEMORY DEFAULT CHARSET=utf8
+SELECT COUNT(*) FROM information_schema.columns
+WHERE table_schema = 'information_schema'
+  AND table_name   = 'referential_constraints'
+ORDER BY ordinal_position;
+COUNT(*)
+11
+SELECT * FROM information_schema.columns
+WHERE table_schema = 'information_schema'
+  AND table_name   = 'referential_constraints'
+ORDER BY ordinal_position;
+TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
+NULL	information_schema	REFERENTIAL_CONSTRAINTS	CONSTRAINT_CATALOG	1	NULL	YES	varchar	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	CONSTRAINT_NAME	3		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	4096	12288	NULL	NULL	utf8	utf8_general_ci	varchar(4096)			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	UNIQUE_CONSTRAINT_NAME	6		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	UPDATE_RULE	8		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	TABLE_NAME	10		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	
 
 *** End of Data Dictionary Tests ***
 --------------------------------------------------------------------------------
diff --git a/mysql-test/suite/funcs_1/r/myisam_func_view.result b/mysql-test/suite/funcs_1/r/myisam_func_view.result
index 13fffecd365..ab4508fb302 100644
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -9,7 +9,7 @@ CREATE TABLE t1_values
 id BIGINT AUTO_INCREMENT,
 select_id BIGINT,
 PRIMARY KEY(id)
-) ENGINE = 'MYISAM' ;
+) ENGINE = <engine_to_be_tested>;
 ALTER TABLE t1_values ADD my_char_30        CHAR(30);
 ALTER TABLE t1_values ADD my_varchar_1000   VARCHAR(1000);
 ALTER TABLE t1_values ADD my_binary_30      BINARY(30);
@@ -123,10 +123,8 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '1 17:58';
 INSERT INTO t1_values SET select_id = @select_id,
 my_bigint = 1758;
-
-some statements disabled because of
-Bug#12440: CAST(data type DOUBLE AS TIME) strange results
---------------------------------------------------------------------------------
+INSERT INTO t1_values SET select_id = @select_id,
+my_double = +1.758E+3;
 INSERT INTO t1_values SET select_id = @select_id,
 my_char_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
@@ -135,29 +133,20 @@ INSERT INTO t1_values SET select_id = @select_id,
 my_binary_30 = '-3333.3333';
 INSERT INTO t1_values SET select_id = @select_id,
 my_varbinary_1000 = '-3333.3333';
-
-some statements disabled because of
-Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian
---------------------------------------------------------------------------------
+INSERT INTO t1_values SET select_id = @select_id,
+my_double = -0.33333333E+4;
 
 "Attention: CAST --> SIGNED INTEGER
-            The file with expected results suffers from
-            Bug#5083 Big integer values are inserted as negative into 
-                     decimal/string columns
             Bug#5913 Traditional mode: BIGINT range not correctly delimited
-            Both have the status: To be fixed later"
---------------------------------------------------------------------------------
-
-some statements disabled because of
-Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result
+            Status: To be fixed later"
 --------------------------------------------------------------------------------
 
 "Attention: CAST --> UNSIGNED INTEGER
-            The file with expected results suffers from Bug 5083 5913 9809"
+            The file with expected results suffers from Bug 5913"
 --------------------------------------------------------------------------------
 
 some statements disabled because of
-Bugs#8663: cant use bgint unsigned as input to cast
+Bug#5913 Traditional mode: BIGINT range not correctly delimited
 --------------------------------------------------------------------------------
 SET @my_select = 'SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values';
@@ -175,11 +164,6 @@ SET @my_select = 'SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values';
-
-"Attention: IF(my_year IS NULL, ...
-            The file with expected results suffers from 
-            Bug#11689. successful CREATE VIEW but SELECT on view fails."
---------------------------------------------------------------------------------
 SET @my_select = 'SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT BIT_LENGTH(my_varchar_1000),
@@ -202,7 +186,7 @@ SET @my_select =
 'SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values';
 
 "Attention: LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', <numeric column>)
-            The file with expected results suffers from Bug 10963 11728"
+            The file with expected results suffers from Bug 10963"
             and the testcases with length = BIGINT or DOUBLE column are deactivated,
 because there are 32/64 Bit differences
 --------------------------------------------------------------------------------
@@ -216,8 +200,9 @@ SET @my_select = 'SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values';
 SET @my_select = 'SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values';
+SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 SET @my_select = 
-'SELECT LOAD_FILE(''../log/current_test''), id FROM t1_values';
+'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_char_30),
 my_char_30, id FROM t1_values';
 SET @my_select = 'SELECT LOCATE(''char'', my_varchar_1000),
@@ -299,19 +284,19 @@ SET sql_mode = '';
 --------------------------------------------------------------------------------
 CREATE VIEW v1 AS SELECT my_char_30, id FROM t1_values;
 SELECT my_char_30, id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL;
+WHERE select_id = 190 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 187 OR select_id IS NULL);
+WHERE select_id = 190 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values;
 SELECT CONCAT('A',my_char_30), my_char_30, id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL;
+WHERE select_id = 189 OR select_id IS NULL order by id;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -323,7 +308,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select concat(_latin1'A',`t1_values`.`my_char_30`) AS `CONCAT('A',my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 186 OR select_id IS NULL);
+WHERE select_id = 189 OR select_id IS NULL) order by id;
 CONCAT('A',my_char_30)	my_char_30	id
 NULL	NULL	1
 A		2
@@ -337,13 +322,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LTRIM(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL;
+WHERE select_id = 188 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varbinary_1000`) AS `LTRIM(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 185 OR select_id IS NULL);
+WHERE select_id = 188 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -351,13 +336,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LTRIM(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL;
+WHERE select_id = 187 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_binary_30`) AS `LTRIM(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 184 OR select_id IS NULL);
+WHERE select_id = 187 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -365,13 +350,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LTRIM(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL;
+WHERE select_id = 186 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_varchar_1000`) AS `LTRIM(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 183 OR select_id IS NULL);
+WHERE select_id = 186 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -379,13 +364,13 @@ CREATE VIEW v1 AS SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LTRIM(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL;
+WHERE select_id = 185 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ltrim(`t1_values`.`my_char_30`) AS `LTRIM(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 182 OR select_id IS NULL);
+WHERE select_id = 185 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -393,13 +378,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOWER(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL;
+WHERE select_id = 184 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varbinary_1000`) AS `LOWER(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 181 OR select_id IS NULL);
+WHERE select_id = 184 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -407,13 +392,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOWER(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL;
+WHERE select_id = 183 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_binary_30`) AS `LOWER(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 180 OR select_id IS NULL);
+WHERE select_id = 183 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -421,13 +406,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOWER(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL;
+WHERE select_id = 182 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LOWER(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 179 OR select_id IS NULL);
+WHERE select_id = 182 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -435,13 +420,13 @@ CREATE VIEW v1 AS SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOWER(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL;
+WHERE select_id = 181 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_char_30`) AS `LOWER(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 178 OR select_id IS NULL);
+WHERE select_id = 181 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -449,13 +434,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_decimal),
 my_decimal, id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL;
+WHERE select_id = 180 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_decimal`) AS `LOCATE('-', ' - -ABC', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 177 OR select_id IS NULL);
+WHERE select_id = 180 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -463,13 +448,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_double),
 my_double, id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL;
+WHERE select_id = 179 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_double`) AS `LOCATE('-', ' - -ABC', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 176 OR select_id IS NULL);
+WHERE select_id = 179 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -477,13 +462,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values;
 SELECT LOCATE('-', ' - -ABC', my_bigint),
 my_bigint, id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL;
+WHERE select_id = 178 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',_latin1' - -ABC',`t1_values`.`my_bigint`) AS `LOCATE('-', ' - -ABC', my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 175 OR select_id IS NULL);
+WHERE select_id = 178 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -491,13 +476,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varbinary_1000, 3),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL;
+WHERE select_id = 177 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varbinary_1000`,3) AS `LOCATE('-', my_varbinary_1000, 3)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 174 OR select_id IS NULL);
+WHERE select_id = 177 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -505,13 +490,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('-', my_binary_30, 3),
 my_binary_30, id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL;
+WHERE select_id = 176 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_binary_30`,3) AS `LOCATE('-', my_binary_30, 3)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 173 OR select_id IS NULL);
+WHERE select_id = 176 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -519,13 +504,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('-', my_varchar_1000, 3),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL;
+WHERE select_id = 175 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_varchar_1000`,3) AS `LOCATE('-', my_varchar_1000, 3)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 172 OR select_id IS NULL);
+WHERE select_id = 175 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -533,13 +518,13 @@ CREATE VIEW v1 AS SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('-', my_char_30, 3),
 my_char_30, id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL;
+WHERE select_id = 174 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'-',`t1_values`.`my_char_30`,3) AS `LOCATE('-', my_char_30, 3)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 171 OR select_id IS NULL);
+WHERE select_id = 174 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -547,13 +532,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_binary_30 ),
 my_varbinary_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL;
+WHERE select_id = 173 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varbinary_1000, my_binary_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 170 OR select_id IS NULL);
+WHERE select_id = 173 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -561,13 +546,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varchar_1000 ),
 my_varbinary_1000, my_varchar_1000 id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL;
+WHERE select_id = 172 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varbinary_1000, my_varchar_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 169 OR select_id IS NULL);
+WHERE select_id = 172 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -575,13 +560,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_char_30 ),
 my_varbinary_1000, my_char_30 id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL;
+WHERE select_id = 171 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varbinary_1000, my_char_30 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 168 OR select_id IS NULL);
+WHERE select_id = 171 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -589,13 +574,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE(my_varbinary_1000, my_varbinary_1000 ),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL;
+WHERE select_id = 170 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varbinary_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varbinary_1000, my_varbinary_1000 )`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 167 OR select_id IS NULL);
+WHERE select_id = 170 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -603,13 +588,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varbinary_1000 ),
 my_binary_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL;
+WHERE select_id = 169 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_binary_30, my_varbinary_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 166 OR select_id IS NULL);
+WHERE select_id = 169 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -617,13 +602,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_varchar_1000 ),
 my_binary_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL;
+WHERE select_id = 168 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_binary_30, my_varchar_1000 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 165 OR select_id IS NULL);
+WHERE select_id = 168 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -631,13 +616,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_char_30 ),
 my_binary_30, my_char_30 id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL;
+WHERE select_id = 167 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_binary_30, my_char_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 164 OR select_id IS NULL);
+WHERE select_id = 167 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -645,13 +630,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE(my_binary_30, my_binary_30 ),
 my_binary_30, id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL;
+WHERE select_id = 166 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_binary_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_binary_30, my_binary_30 )`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 163 OR select_id IS NULL);
+WHERE select_id = 166 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -659,13 +644,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varbinary_1000 ),
 my_varchar_1000, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL;
+WHERE select_id = 165 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_varchar_1000, my_varbinary_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 162 OR select_id IS NULL);
+WHERE select_id = 165 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -673,13 +658,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_binary_30 ),
 my_varchar_1000, my_binary_30 id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL;
+WHERE select_id = 164 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_binary_30`) AS `LOCATE(my_varchar_1000, my_binary_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 161 OR select_id IS NULL);
+WHERE select_id = 164 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -687,13 +672,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_char_30 ),
 my_varchar_1000, my_char_30 id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL;
+WHERE select_id = 163 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_char_30`) AS `LOCATE(my_varchar_1000, my_char_30 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`my_char_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 160 OR select_id IS NULL);
+WHERE select_id = 163 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -701,13 +686,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE(my_varchar_1000, my_varchar_1000 ),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL;
+WHERE select_id = 162 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_varchar_1000`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_varchar_1000, my_varchar_1000 )`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 159 OR select_id IS NULL);
+WHERE select_id = 162 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -715,13 +700,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varbinary_1000 ),
 my_char_30, my_varbinary_1000 id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL;
+WHERE select_id = 161 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varbinary_1000`) AS `LOCATE(my_char_30, my_varbinary_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varbinary_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 158 OR select_id IS NULL);
+WHERE select_id = 161 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -729,13 +714,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_binary_30 ),
 my_char_30, my_binary_30 id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL;
+WHERE select_id = 160 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_binary_30`) AS `LOCATE(my_char_30, my_binary_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_binary_30` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 157 OR select_id IS NULL);
+WHERE select_id = 160 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -743,13 +728,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values;
 SELECT LOCATE(my_char_30, my_varchar_1000 ),
 my_char_30, my_varchar_1000 id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL;
+WHERE select_id = 159 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_varchar_1000`) AS `LOCATE(my_char_30, my_varchar_1000 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`my_varchar_1000` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 156 OR select_id IS NULL);
+WHERE select_id = 159 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -757,13 +742,13 @@ CREATE VIEW v1 AS SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values;
 SELECT LOCATE(my_char_30, my_char_30 ),
 my_char_30, id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL;
+WHERE select_id = 158 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(`t1_values`.`my_char_30`,`t1_values`.`my_char_30`) AS `LOCATE(my_char_30, my_char_30 )`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 155 OR select_id IS NULL);
+WHERE select_id = 158 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -771,13 +756,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL;
+WHERE select_id = 157 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varbinary_1000`) AS `LOCATE('char', my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 154 OR select_id IS NULL);
+WHERE select_id = 157 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -785,13 +770,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LOCATE('char', my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL;
+WHERE select_id = 156 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_binary_30`) AS `LOCATE('char', my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 153 OR select_id IS NULL);
+WHERE select_id = 156 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -799,13 +784,13 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LOCATE('char', my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL;
+WHERE select_id = 155 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_varchar_1000`) AS `LOCATE('char', my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 152 OR select_id IS NULL);
+WHERE select_id = 155 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -813,46 +798,46 @@ CREATE VIEW v1 AS SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LOCATE('char', my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL;
+WHERE select_id = 154 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `LOCATE('char', my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 151 OR select_id IS NULL);
+WHERE select_id = 154 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
-CREATE VIEW v1 AS SELECT LOAD_FILE('../log/current_test'), id FROM t1_values;
-SELECT LOAD_FILE('../log/current_test'), id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL;
-LOAD_FILE('../log/current_test')	id
-CURRENT_TEST: myisam_func_view
+CREATE VIEW v1 AS SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values;
+SELECT LOAD_FILE('../tmp/func_view.dat'), id FROM t1_values
+WHERE select_id = 153 OR select_id IS NULL order by id;
+LOAD_FILE('../tmp/func_view.dat')	id
+äÄ@
 	1
-CURRENT_TEST: myisam_func_view
+äÄ@
 	2
-CURRENT_TEST: myisam_func_view
+äÄ@
 	3
-CURRENT_TEST: myisam_func_view
+äÄ@
 	4
-CURRENT_TEST: myisam_func_view
+äÄ@
 	5
 SHOW CREATE VIEW v1;
 View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../log/current_test') AS `LOAD_FILE('../log/current_test')`,`t1_values`.`id` AS `id` from `t1_values`
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select load_file(_latin1'../tmp/func_view.dat') AS `LOAD_FILE('../tmp/func_view.dat')`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 150 OR select_id IS NULL);
-LOAD_FILE('../log/current_test')	id
-CURRENT_TEST: myisam_func_view
+WHERE select_id = 153 OR select_id IS NULL) order by id;
+LOAD_FILE('../tmp/func_view.dat')	id
+äÄ@
 	1
-CURRENT_TEST: myisam_func_view
+äÄ@
 	2
-CURRENT_TEST: myisam_func_view
+äÄ@
 	3
-CURRENT_TEST: myisam_func_view
+äÄ@
 	4
-CURRENT_TEST: myisam_func_view
+äÄ@
 	5
 DROP VIEW v1;
 
@@ -861,13 +846,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL;
+WHERE select_id = 152 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varbinary_1000`) AS `LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 149 OR select_id IS NULL);
+WHERE select_id = 152 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -875,13 +860,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL;
+WHERE select_id = 151 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_binary_30`) AS `LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 148 OR select_id IS NULL);
+WHERE select_id = 151 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -889,13 +874,13 @@ CREATE VIEW v1 AS SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL;
+WHERE select_id = 150 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_varchar_1000`) AS `LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 147 OR select_id IS NULL);
+WHERE select_id = 150 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -903,19 +888,19 @@ CREATE VIEW v1 AS SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL;
+WHERE select_id = 149 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select length(`t1_values`.`my_char_30`) AS `LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 146 OR select_id IS NULL);
+WHERE select_id = 149 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
 CREATE VIEW v1 AS SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values;
 SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal), my_decimal, id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL;
+WHERE select_id = 148 OR select_id IS NULL order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -930,7 +915,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(_latin1'AaBbCcDdEeFfGgHhIiJj������',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 145 OR select_id IS NULL);
+WHERE select_id = 148 OR select_id IS NULL) order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)	my_decimal	id
 NULL	NULL	1
 	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -945,7 +930,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values;
 SELECT LEFT(my_varbinary_1000, 2), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL;
+WHERE select_id = 147 OR select_id IS NULL order by id;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -957,7 +942,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varbinary_1000`,2) AS `LEFT(my_varbinary_1000, 2)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 144 OR select_id IS NULL);
+WHERE select_id = 147 OR select_id IS NULL) order by id;
 LEFT(my_varbinary_1000, 2)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -969,7 +954,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values;
 SELECT LEFT(my_binary_30, 2), my_binary_30, id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL;
+WHERE select_id = 146 OR select_id IS NULL order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 
@@ -981,7 +966,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_binary_30`,2) AS `LEFT(my_binary_30, 2)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 143 OR select_id IS NULL);
+WHERE select_id = 146 OR select_id IS NULL) order by id;
 LEFT(my_binary_30, 2)	my_binary_30	id
 NULL	NULL	1
 
@@ -993,7 +978,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values;
 SELECT LEFT(my_varchar_1000, 2), my_varchar_1000, id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL;
+WHERE select_id = 145 OR select_id IS NULL order by id;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1005,7 +990,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_varchar_1000`,2) AS `LEFT(my_varchar_1000, 2)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 142 OR select_id IS NULL);
+WHERE select_id = 145 OR select_id IS NULL) order by id;
 LEFT(my_varchar_1000, 2)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -1017,7 +1002,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values;
 SELECT LEFT(my_char_30, 2), my_char_30, id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL;
+WHERE select_id = 144 OR select_id IS NULL order by id;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1029,7 +1014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left(`t1_values`.`my_char_30`,2) AS `LEFT(my_char_30, 2)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 141 OR select_id IS NULL);
+WHERE select_id = 144 OR select_id IS NULL) order by id;
 LEFT(my_char_30, 2)	my_char_30	id
 NULL	NULL	1
 		2
@@ -1043,13 +1028,13 @@ CREATE VIEW v1 AS SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT LCASE(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL;
+WHERE select_id = 143 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select lcase(`t1_values`.`my_varchar_1000`) AS `LCASE(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 140 OR select_id IS NULL);
+WHERE select_id = 143 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1057,13 +1042,13 @@ CREATE VIEW v1 AS SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values;
 SELECT INSTR(my_char_30, 'char'),
 my_char_30, id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL;
+WHERE select_id = 142 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select locate(_latin1'char',`t1_values`.`my_char_30`) AS `INSTR(my_char_30, 'char')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 139 OR select_id IS NULL);
+WHERE select_id = 142 OR select_id IS NULL) order by id;
 DROP VIEW v1;
 
 
@@ -1071,7 +1056,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varbinary_1000),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL;
+WHERE select_id = 141 OR select_id IS NULL order by id;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1083,7 +1068,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varbinary_1000`) AS `BIT_LENGTH(my_varbinary_1000)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 138 OR select_id IS NULL);
+WHERE select_id = 141 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_varbinary_1000)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -1097,7 +1082,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_binary_30),
 my_binary_30, id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL;
+WHERE select_id = 140 OR select_id IS NULL order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240	
@@ -1109,7 +1094,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_binary_30`) AS `BIT_LENGTH(my_binary_30)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 137 OR select_id IS NULL);
+WHERE select_id = 140 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_binary_30)	my_binary_30	id
 NULL	NULL	1
 240	
@@ -1123,7 +1108,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values;
 SELECT BIT_LENGTH(my_varchar_1000),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL;
+WHERE select_id = 139 OR select_id IS NULL order by id;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1135,7 +1120,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_varchar_1000`) AS `BIT_LENGTH(my_varchar_1000)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 136 OR select_id IS NULL);
+WHERE select_id = 139 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_varchar_1000)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -1149,7 +1134,7 @@ CREATE VIEW v1 AS SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values;
 SELECT BIT_LENGTH(my_char_30),
 my_char_30, id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL;
+WHERE select_id = 138 OR select_id IS NULL order by id;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1161,7 +1146,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select bit_length(`t1_values`.`my_char_30`) AS `BIT_LENGTH(my_char_30)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 135 OR select_id IS NULL);
+WHERE select_id = 138 OR select_id IS NULL) order by id;
 BIT_LENGTH(my_char_30)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -1175,7 +1160,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values;
 SELECT IFNULL(my_year,'IS_NULL'),
 my_year, id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL;
+WHERE select_id = 137 OR select_id IS NULL order by id;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1187,7 +1172,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_year`,_latin1'IS_NULL') AS `IFNULL(my_year,'IS_NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 134 OR select_id IS NULL);
+WHERE select_id = 137 OR select_id IS NULL) order by id;
 IFNULL(my_year,'IS_NULL')	my_year	id
 IS_NULL	NULL	1
 1901	1901	2
@@ -1201,7 +1186,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values;
 SELECT IFNULL(my_time,'IS_NULL'),
 my_time, id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL;
+WHERE select_id = 136 OR select_id IS NULL order by id;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1213,7 +1198,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_time`,_latin1'IS_NULL') AS `IFNULL(my_time,'IS_NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 133 OR select_id IS NULL);
+WHERE select_id = 136 OR select_id IS NULL) order by id;
 IFNULL(my_time,'IS_NULL')	my_time	id
 IS_NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -1227,7 +1212,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values;
 SELECT IFNULL(my_timestamp,'IS_NULL'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL;
+WHERE select_id = 135 OR select_id IS NULL order by id;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1239,7 +1224,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_timestamp`,_latin1'IS_NULL') AS `IFNULL(my_timestamp,'IS_NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 132 OR select_id IS NULL);
+WHERE select_id = 135 OR select_id IS NULL) order by id;
 IFNULL(my_timestamp,'IS_NULL')	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -1253,7 +1238,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values;
 SELECT IFNULL(my_date,'IS_NULL'),
 my_date, id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL;
+WHERE select_id = 134 OR select_id IS NULL order by id;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1265,7 +1250,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_date`,_latin1'IS_NULL') AS `IFNULL(my_date,'IS_NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 131 OR select_id IS NULL);
+WHERE select_id = 134 OR select_id IS NULL) order by id;
 IFNULL(my_date,'IS_NULL')	my_date	id
 IS_NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -1279,7 +1264,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values;
 SELECT IFNULL(my_datetime,'IS_NULL'),
 my_datetime, id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL;
+WHERE select_id = 133 OR select_id IS NULL order by id;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1291,7 +1276,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_datetime`,_latin1'IS_NULL') AS `IFNULL(my_datetime,'IS_NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 130 OR select_id IS NULL);
+WHERE select_id = 133 OR select_id IS NULL) order by id;
 IFNULL(my_datetime,'IS_NULL')	my_datetime	id
 IS_NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -1305,7 +1290,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values;
 SELECT IFNULL(my_double,'IS_NULL'),
 my_double, id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL;
+WHERE select_id = 132 OR select_id IS NULL order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1317,7 +1302,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_double`,_latin1'IS_NULL') AS `IFNULL(my_double,'IS_NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 129 OR select_id IS NULL);
+WHERE select_id = 132 OR select_id IS NULL) order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -1331,7 +1316,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values;
 SELECT IFNULL(my_decimal,'IS_NULL'),
 my_decimal, id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL;
+WHERE select_id = 131 OR select_id IS NULL order by id;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1343,7 +1328,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_decimal`,_latin1'IS_NULL') AS `IFNULL(my_decimal,'IS_NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 128 OR select_id IS NULL);
+WHERE select_id = 131 OR select_id IS NULL) order by id;
 IFNULL(my_decimal,'IS_NULL')	my_decimal	id
 IS_NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -1357,7 +1342,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values;
 SELECT IFNULL(my_bigint,'IS_NULL'),
 my_bigint, id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL;
+WHERE select_id = 130 OR select_id IS NULL order by id;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1369,7 +1354,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_bigint`,_latin1'IS_NULL') AS `IFNULL(my_bigint,'IS_NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 127 OR select_id IS NULL);
+WHERE select_id = 130 OR select_id IS NULL) order by id;
 IFNULL(my_bigint,'IS_NULL')	my_bigint	id
 IS_NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -1383,7 +1368,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IFNULL(my_varbinary_1000,'IS_NULL'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL;
+WHERE select_id = 129 OR select_id IS NULL order by id;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1395,7 +1380,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varbinary_1000`,_latin1'IS_NULL') AS `IFNULL(my_varbinary_1000,'IS_NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 126 OR select_id IS NULL);
+WHERE select_id = 129 OR select_id IS NULL) order by id;
 IFNULL(my_varbinary_1000,'IS_NULL')	my_varbinary_1000	id
 IS_NULL	NULL	1
 		2
@@ -1409,7 +1394,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values;
 SELECT IFNULL(my_binary_30,'IS_NULL'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL;
+WHERE select_id = 128 OR select_id IS NULL order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 
@@ -1421,7 +1406,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_binary_30`,_latin1'IS_NULL') AS `IFNULL(my_binary_30,'IS_NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 125 OR select_id IS NULL);
+WHERE select_id = 128 OR select_id IS NULL) order by id;
 IFNULL(my_binary_30,'IS_NULL')	my_binary_30	id
 IS_NULL	NULL	1
 
@@ -1435,7 +1420,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values;
 SELECT IFNULL(my_varchar_1000,'IS_NULL'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL;
+WHERE select_id = 127 OR select_id IS NULL order by id;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1447,7 +1432,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_varchar_1000`,_latin1'IS_NULL') AS `IFNULL(my_varchar_1000,'IS_NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 124 OR select_id IS NULL);
+WHERE select_id = 127 OR select_id IS NULL) order by id;
 IFNULL(my_varchar_1000,'IS_NULL')	my_varchar_1000	id
 IS_NULL	NULL	1
 		2
@@ -1461,7 +1446,7 @@ CREATE VIEW v1 AS SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values;
 SELECT IFNULL(my_char_30,'IS_NULL'),
 my_char_30, id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL;
+WHERE select_id = 126 OR select_id IS NULL order by id;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1473,7 +1458,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select ifnull(`t1_values`.`my_char_30`,_latin1'IS_NULL') AS `IFNULL(my_char_30,'IS_NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 123 OR select_id IS NULL);
+WHERE select_id = 126 OR select_id IS NULL) order by id;
 IFNULL(my_char_30,'IS_NULL')	my_char_30	id
 IS_NULL	NULL	1
 		2
@@ -1487,7 +1472,7 @@ CREATE VIEW v1 AS SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values;
 SELECT IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_year, id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL;
+WHERE select_id = 125 OR select_id IS NULL order by id;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1501,7 +1486,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 122 OR select_id IS NULL);
+WHERE select_id = 125 OR select_id IS NULL) order by id;
 IF(my_year IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_year	id
 IS     NULL	NULL	1
@@ -1516,7 +1501,7 @@ CREATE VIEW v1 AS SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values;
 SELECT IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_time, id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL;
+WHERE select_id = 124 OR select_id IS NULL order by id;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1530,7 +1515,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 121 OR select_id IS NULL);
+WHERE select_id = 124 OR select_id IS NULL) order by id;
 IF(my_time IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_time	id
 IS     NULL	NULL	1
@@ -1545,7 +1530,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_timestamp, id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL;
+WHERE select_id = 123 OR select_id IS NULL order by id;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1559,7 +1544,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 120 OR select_id IS NULL);
+WHERE select_id = 123 OR select_id IS NULL) order by id;
 IF(my_timestamp IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_timestamp	id
 IS NOT NULL	0000-00-00 00:00:00	1
@@ -1574,7 +1559,7 @@ CREATE VIEW v1 AS SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values;
 SELECT IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_date, id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL;
+WHERE select_id = 122 OR select_id IS NULL order by id;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1588,7 +1573,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 119 OR select_id IS NULL);
+WHERE select_id = 122 OR select_id IS NULL) order by id;
 IF(my_date IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_date	id
 IS     NULL	NULL	1
@@ -1603,7 +1588,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values;
 SELECT IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_datetime, id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL;
+WHERE select_id = 121 OR select_id IS NULL order by id;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1617,7 +1602,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 118 OR select_id IS NULL);
+WHERE select_id = 121 OR select_id IS NULL) order by id;
 IF(my_datetime IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_datetime	id
 IS     NULL	NULL	1
@@ -1632,7 +1617,7 @@ CREATE VIEW v1 AS SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values;
 SELECT IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_double, id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL;
+WHERE select_id = 120 OR select_id IS NULL order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1646,7 +1631,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 117 OR select_id IS NULL);
+WHERE select_id = 120 OR select_id IS NULL) order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
@@ -1661,7 +1646,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values;
 SELECT IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_decimal, id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL;
+WHERE select_id = 119 OR select_id IS NULL order by id;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1675,7 +1660,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 116 OR select_id IS NULL);
+WHERE select_id = 119 OR select_id IS NULL) order by id;
 IF(my_decimal IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_decimal	id
 IS     NULL	NULL	1
@@ -1690,7 +1675,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values;
 SELECT IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_bigint, id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL;
+WHERE select_id = 118 OR select_id IS NULL order by id;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1704,7 +1689,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 115 OR select_id IS NULL);
+WHERE select_id = 118 OR select_id IS NULL) order by id;
 IF(my_bigint IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_bigint	id
 IS     NULL	NULL	1
@@ -1719,7 +1704,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varbinary_1000, id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL;
+WHERE select_id = 117 OR select_id IS NULL order by id;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1733,7 +1718,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 114 OR select_id IS NULL);
+WHERE select_id = 117 OR select_id IS NULL) order by id;
 IF(my_varbinary_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varbinary_1000	id
 IS     NULL	NULL	1
@@ -1748,7 +1733,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_binary_30, id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL;
+WHERE select_id = 116 OR select_id IS NULL order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1762,7 +1747,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 113 OR select_id IS NULL);
+WHERE select_id = 116 OR select_id IS NULL) order by id;
 IF(my_binary_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_binary_30	id
 IS     NULL	NULL	1
@@ -1777,7 +1762,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_varchar_1000, id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL;
+WHERE select_id = 115 OR select_id IS NULL order by id;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1791,7 +1776,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 112 OR select_id IS NULL);
+WHERE select_id = 115 OR select_id IS NULL) order by id;
 IF(my_varchar_1000 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_varchar_1000	id
 IS     NULL	NULL	1
@@ -1806,7 +1791,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values;
 SELECT IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL'), my_char_30, id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL;
+WHERE select_id = 114 OR select_id IS NULL order by id;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1820,7 +1805,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 'IS NOT NULL')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 111 OR select_id IS NULL);
+WHERE select_id = 114 OR select_id IS NULL) order by id;
 IF(my_char_30 IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_char_30	id
 IS     NULL	NULL	1
@@ -1835,7 +1820,7 @@ CREATE VIEW v1 AS SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values;
 SELECT IF(my_year, 'IS     TRUE', 'IS NOT TRUE'),
 my_year, id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL;
+WHERE select_id = 113 OR select_id IS NULL order by id;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1847,7 +1832,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_year`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_year, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 110 OR select_id IS NULL);
+WHERE select_id = 113 OR select_id IS NULL) order by id;
 IF(my_year, 'IS     TRUE', 'IS NOT TRUE')	my_year	id
 IS NOT TRUE	NULL	1
 IS     TRUE	1901	2
@@ -1861,7 +1846,7 @@ CREATE VIEW v1 AS SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values;
 SELECT IF(my_time, 'IS     TRUE', 'IS NOT TRUE'),
 my_time, id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL;
+WHERE select_id = 112 OR select_id IS NULL order by id;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1873,7 +1858,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_time`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_time, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 109 OR select_id IS NULL);
+WHERE select_id = 112 OR select_id IS NULL) order by id;
 IF(my_time, 'IS     TRUE', 'IS NOT TRUE')	my_time	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-838:59:59	2
@@ -1887,7 +1872,7 @@ CREATE VIEW v1 AS SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values;
 SELECT IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE'),
 my_timestamp, id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL;
+WHERE select_id = 111 OR select_id IS NULL order by id;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1899,7 +1884,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_timestamp`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 108 OR select_id IS NULL);
+WHERE select_id = 111 OR select_id IS NULL) order by id;
 IF(my_timestamp, 'IS     TRUE', 'IS NOT TRUE')	my_timestamp	id
 IS NOT TRUE	0000-00-00 00:00:00	1
 IS     TRUE	1970-01-01 03:00:01	2
@@ -1913,7 +1898,7 @@ CREATE VIEW v1 AS SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values;
 SELECT IF(my_date, 'IS     TRUE', 'IS NOT TRUE'),
 my_date, id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL;
+WHERE select_id = 110 OR select_id IS NULL order by id;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1925,7 +1910,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_date`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_date, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 107 OR select_id IS NULL);
+WHERE select_id = 110 OR select_id IS NULL) order by id;
 IF(my_date, 'IS     TRUE', 'IS NOT TRUE')	my_date	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01	2
@@ -1939,7 +1924,7 @@ CREATE VIEW v1 AS SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values;
 SELECT IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE'),
 my_datetime, id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL;
+WHERE select_id = 109 OR select_id IS NULL order by id;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1951,7 +1936,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_datetime`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 106 OR select_id IS NULL);
+WHERE select_id = 109 OR select_id IS NULL) order by id;
 IF(my_datetime, 'IS     TRUE', 'IS NOT TRUE')	my_datetime	id
 IS NOT TRUE	NULL	1
 IS     TRUE	0001-01-01 00:00:00	2
@@ -1965,7 +1950,7 @@ CREATE VIEW v1 AS SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values;
 SELECT IF(my_double, 'IS     TRUE', 'IS NOT TRUE'),
 my_double, id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL;
+WHERE select_id = 108 OR select_id IS NULL order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1977,7 +1962,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_double`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_double, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 105 OR select_id IS NULL);
+WHERE select_id = 108 OR select_id IS NULL) order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-1.7976931348623e+308	2
@@ -1991,7 +1976,7 @@ CREATE VIEW v1 AS SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values;
 SELECT IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE'),
 my_decimal, id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL;
+WHERE select_id = 107 OR select_id IS NULL order by id;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2003,7 +1988,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_decimal`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 104 OR select_id IS NULL);
+WHERE select_id = 107 OR select_id IS NULL) order by id;
 IF(my_decimal, 'IS     TRUE', 'IS NOT TRUE')	my_decimal	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2017,7 +2002,7 @@ CREATE VIEW v1 AS SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values;
 SELECT IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE'),
 my_bigint, id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL;
+WHERE select_id = 106 OR select_id IS NULL order by id;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2029,7 +2014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_bigint`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 103 OR select_id IS NULL);
+WHERE select_id = 106 OR select_id IS NULL) order by id;
 IF(my_bigint, 'IS     TRUE', 'IS NOT TRUE')	my_bigint	id
 IS NOT TRUE	NULL	1
 IS     TRUE	-9223372036854775808	2
@@ -2043,7 +2028,7 @@ CREATE VIEW v1 AS SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values;
 SELECT IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL;
+WHERE select_id = 105 OR select_id IS NULL order by id;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2055,7 +2040,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varbinary_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 102 OR select_id IS NULL);
+WHERE select_id = 105 OR select_id IS NULL) order by id;
 IF(my_varbinary_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varbinary_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2069,7 +2054,7 @@ CREATE VIEW v1 AS SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values;
 SELECT IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_binary_30, id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL;
+WHERE select_id = 104 OR select_id IS NULL order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE	
@@ -2086,7 +2071,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_binary_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 101 OR select_id IS NULL);
+WHERE select_id = 104 OR select_id IS NULL) order by id;
 IF(my_binary_30, 'IS     TRUE', 'IS NOT TRUE')	my_binary_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE	
@@ -2105,7 +2090,7 @@ CREATE VIEW v1 AS SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values;
 SELECT IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE'),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL;
+WHERE select_id = 103 OR select_id IS NULL order by id;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2117,7 +2102,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_varchar_1000`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 100 OR select_id IS NULL);
+WHERE select_id = 103 OR select_id IS NULL) order by id;
 IF(my_varchar_1000, 'IS     TRUE', 'IS NOT TRUE')	my_varchar_1000	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2131,7 +2116,7 @@ CREATE VIEW v1 AS SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values;
 SELECT IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE'),
 my_char_30, id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL;
+WHERE select_id = 102 OR select_id IS NULL order by id;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2146,7 +2131,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select if(`t1_values`.`my_char_30`,_latin1'IS     TRUE',_latin1'IS NOT TRUE') AS `IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 99 OR select_id IS NULL);
+WHERE select_id = 102 OR select_id IS NULL) order by id;
 IF(my_char_30, 'IS     TRUE', 'IS NOT TRUE')	my_char_30	id
 IS NOT TRUE	NULL	1
 IS NOT TRUE		2
@@ -2163,7 +2148,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING koi8r),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING koi8r), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL;
+WHERE select_id = 101 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2175,7 +2160,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using koi8r) AS `CONVERT(my_varbinary_1000 USING koi8r)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 98 OR select_id IS NULL);
+WHERE select_id = 101 OR select_id IS NULL) order by id;
 CONVERT(my_varbinary_1000 USING koi8r)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2189,7 +2174,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING koi8r),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING koi8r), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL;
+WHERE select_id = 100 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 
@@ -2201,7 +2186,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using koi8r) AS `CONVERT(my_binary_30 USING koi8r)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 97 OR select_id IS NULL);
+WHERE select_id = 100 OR select_id IS NULL) order by id;
 CONVERT(my_binary_30 USING koi8r)	my_binary_30	id
 NULL	NULL	1
 
@@ -2215,7 +2200,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING koi8r),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING koi8r), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL;
+WHERE select_id = 99 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2227,7 +2212,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using koi8r) AS `CONVERT(my_varchar_1000 USING koi8r)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 96 OR select_id IS NULL);
+WHERE select_id = 99 OR select_id IS NULL) order by id;
 CONVERT(my_varchar_1000 USING koi8r)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2241,7 +2226,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING koi8r),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING koi8r), 
 my_char_30, id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL;
+WHERE select_id = 98 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2253,7 +2238,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using koi8r) AS `CONVERT(my_char_30 USING koi8r)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 95 OR select_id IS NULL);
+WHERE select_id = 98 OR select_id IS NULL) order by id;
 CONVERT(my_char_30 USING koi8r)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2267,7 +2252,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varbinary_1000 USING utf8),
 my_varbinary_1000, id FROM t1_values;
 SELECT CONVERT(my_varbinary_1000 USING utf8), 
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL;
+WHERE select_id = 97 OR select_id IS NULL order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2279,7 +2264,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varbinary_1000` using utf8) AS `CONVERT(my_varbinary_1000 USING utf8)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 94 OR select_id IS NULL);
+WHERE select_id = 97 OR select_id IS NULL) order by id;
 CONVERT(my_varbinary_1000 USING utf8)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -2293,7 +2278,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_binary_30 USING utf8),
 my_binary_30, id FROM t1_values;
 SELECT CONVERT(my_binary_30 USING utf8), 
 my_binary_30, id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL;
+WHERE select_id = 96 OR select_id IS NULL order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 
@@ -2305,7 +2290,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_binary_30` using utf8) AS `CONVERT(my_binary_30 USING utf8)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 93 OR select_id IS NULL);
+WHERE select_id = 96 OR select_id IS NULL) order by id;
 CONVERT(my_binary_30 USING utf8)	my_binary_30	id
 NULL	NULL	1
 
@@ -2319,7 +2304,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_varchar_1000 USING utf8),
 my_varchar_1000, id FROM t1_values;
 SELECT CONVERT(my_varchar_1000 USING utf8), 
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL;
+WHERE select_id = 95 OR select_id IS NULL order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2331,7 +2316,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_varchar_1000` using utf8) AS `CONVERT(my_varchar_1000 USING utf8)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 92 OR select_id IS NULL);
+WHERE select_id = 95 OR select_id IS NULL) order by id;
 CONVERT(my_varchar_1000 USING utf8)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -2345,7 +2330,7 @@ CREATE VIEW v1 AS SELECT CONVERT(my_char_30 USING utf8),
 my_char_30, id FROM t1_values;
 SELECT CONVERT(my_char_30 USING utf8), 
 my_char_30, id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL;
+WHERE select_id = 94 OR select_id IS NULL order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2357,7 +2342,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select convert(`t1_values`.`my_char_30` using utf8) AS `CONVERT(my_char_30 USING utf8)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 91 OR select_id IS NULL);
+WHERE select_id = 94 OR select_id IS NULL) order by id;
 CONVERT(my_char_30 USING utf8)	my_char_30	id
 NULL	NULL	1
 		2
@@ -2371,7 +2356,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS UNSIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL;
+WHERE select_id = 93 OR select_id IS NULL order by id;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2383,7 +2368,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as unsigned) AS `CAST(my_year AS UNSIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 90 OR select_id IS NULL);
+WHERE select_id = 93 OR select_id IS NULL) order by id;
 CAST(my_year AS UNSIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2397,7 +2382,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS UNSIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL;
+WHERE select_id = 92 OR select_id IS NULL order by id;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2415,7 +2400,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as unsigned) AS `CAST(my_time AS UNSIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 89 OR select_id IS NULL);
+WHERE select_id = 92 OR select_id IS NULL) order by id;
 CAST(my_time AS UNSIGNED INTEGER)	my_time	id
 NULL	NULL	1
 18446744073709550778	-838:59:59	2
@@ -2435,7 +2420,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS UNSIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL;
+WHERE select_id = 91 OR select_id IS NULL order by id;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2453,7 +2438,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as unsigned) AS `CAST(my_timestamp AS UNSIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 88 OR select_id IS NULL);
+WHERE select_id = 91 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS UNSIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2473,7 +2458,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS UNSIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL;
+WHERE select_id = 90 OR select_id IS NULL order by id;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2490,7 +2475,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as unsigned) AS `CAST(my_date AS UNSIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 87 OR select_id IS NULL);
+WHERE select_id = 90 OR select_id IS NULL) order by id;
 CAST(my_date AS UNSIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2509,7 +2494,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS UNSIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL;
+WHERE select_id = 89 OR select_id IS NULL order by id;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2526,7 +2511,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as unsigned) AS `CAST(my_datetime AS UNSIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 86 OR select_id IS NULL);
+WHERE select_id = 89 OR select_id IS NULL) order by id;
 CAST(my_datetime AS UNSIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2545,7 +2530,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS UNSIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL;
+WHERE select_id = 88 OR select_id IS NULL order by id;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2561,7 +2546,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 85 OR select_id IS NULL);
+WHERE select_id = 88 OR select_id IS NULL) order by id;
 CAST(my_decimal AS UNSIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 0	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2579,7 +2564,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS UNSIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL;
+WHERE select_id = 87 OR select_id IS NULL order by id;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2591,7 +2576,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as unsigned) AS `CAST(my_bigint AS UNSIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 84 OR select_id IS NULL);
+WHERE select_id = 87 OR select_id IS NULL) order by id;
 CAST(my_bigint AS UNSIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 9223372036854775808	-9223372036854775808	2
@@ -2605,7 +2590,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS UNSIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL;
+WHERE select_id = 86 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2622,7 +2607,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as unsigned) AS `CAST(my_varbinary_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 83 OR select_id IS NULL);
+WHERE select_id = 86 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS UNSIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2641,7 +2626,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS UNSIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL;
+WHERE select_id = 85 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0	
@@ -2659,7 +2644,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as unsigned) AS `CAST(my_binary_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 82 OR select_id IS NULL);
+WHERE select_id = 85 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS UNSIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0	
@@ -2679,7 +2664,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS UNSIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL;
+WHERE select_id = 84 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2696,7 +2681,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as unsigned) AS `CAST(my_varchar_1000 AS UNSIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 81 OR select_id IS NULL);
+WHERE select_id = 84 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS UNSIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -2715,7 +2700,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS UNSIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL;
+WHERE select_id = 83 OR select_id IS NULL order by id;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2732,7 +2717,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as unsigned) AS `CAST(my_char_30 AS UNSIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 80 OR select_id IS NULL);
+WHERE select_id = 83 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS UNSIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -2751,7 +2736,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS SIGNED INTEGER),
 my_year, id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL;
+WHERE select_id = 82 OR select_id IS NULL order by id;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2763,7 +2748,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as signed) AS `CAST(my_year AS SIGNED INTEGER)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 79 OR select_id IS NULL);
+WHERE select_id = 82 OR select_id IS NULL) order by id;
 CAST(my_year AS SIGNED INTEGER)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -2777,7 +2762,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS SIGNED INTEGER),
 my_time, id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL;
+WHERE select_id = 81 OR select_id IS NULL order by id;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2794,7 +2779,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as signed) AS `CAST(my_time AS SIGNED INTEGER)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 78 OR select_id IS NULL);
+WHERE select_id = 81 OR select_id IS NULL) order by id;
 CAST(my_time AS SIGNED INTEGER)	my_time	id
 NULL	NULL	1
 -838	-838:59:59	2
@@ -2813,7 +2798,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS SIGNED INTEGER),
 my_timestamp, id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL;
+WHERE select_id = 80 OR select_id IS NULL order by id;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2831,7 +2816,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as signed) AS `CAST(my_timestamp AS SIGNED INTEGER)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 77 OR select_id IS NULL);
+WHERE select_id = 80 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS SIGNED INTEGER)	my_timestamp	id
 0	0000-00-00 00:00:00	1
 1970	1970-01-01 03:00:01	2
@@ -2851,7 +2836,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS SIGNED INTEGER),
 my_date, id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL;
+WHERE select_id = 79 OR select_id IS NULL order by id;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2868,7 +2853,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as signed) AS `CAST(my_date AS SIGNED INTEGER)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 76 OR select_id IS NULL);
+WHERE select_id = 79 OR select_id IS NULL) order by id;
 CAST(my_date AS SIGNED INTEGER)	my_date	id
 NULL	NULL	1
 1	0001-01-01	2
@@ -2887,7 +2872,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS SIGNED INTEGER),
 my_datetime, id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL;
+WHERE select_id = 78 OR select_id IS NULL order by id;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2904,7 +2889,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as signed) AS `CAST(my_datetime AS SIGNED INTEGER)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 75 OR select_id IS NULL);
+WHERE select_id = 78 OR select_id IS NULL) order by id;
 CAST(my_datetime AS SIGNED INTEGER)	my_datetime	id
 NULL	NULL	1
 1	0001-01-01 00:00:00	2
@@ -2919,11 +2904,43 @@ Warning	1292	Truncated incorrect INTEGER value: '2005-06-28 10:00:00'
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS SIGNED INTEGER),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS SIGNED INTEGER),
+my_double, id FROM t1_values
+WHERE select_id = 77 OR select_id IS NULL order by id;
+CAST(my_double AS SIGNED INTEGER)	my_double	id
+NULL	NULL	1
+-9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 77 OR select_id IS NULL) order by id;
+CAST(my_double AS SIGNED INTEGER)	my_double	id
+NULL	NULL	1
+-9223372036854775808	-1.7976931348623e+308	2
+9223372036854775807	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+Warnings:
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS SIGNED INTEGER),
 my_decimal, id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL;
+WHERE select_id = 76 OR select_id IS NULL order by id;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2938,7 +2955,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 74 OR select_id IS NULL);
+WHERE select_id = 76 OR select_id IS NULL) order by id;
 CAST(my_decimal AS SIGNED INTEGER)	my_decimal	id
 NULL	NULL	1
 -10000000000000000	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -2955,7 +2972,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS SIGNED INTEGER),
 my_bigint, id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL;
+WHERE select_id = 75 OR select_id IS NULL order by id;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2967,7 +2984,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as signed) AS `CAST(my_bigint AS SIGNED INTEGER)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 73 OR select_id IS NULL);
+WHERE select_id = 75 OR select_id IS NULL) order by id;
 CAST(my_bigint AS SIGNED INTEGER)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -2981,7 +2998,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS SIGNED INTEGER),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL;
+WHERE select_id = 74 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -2997,7 +3014,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as signed) AS `CAST(my_varbinary_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 72 OR select_id IS NULL);
+WHERE select_id = 74 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS SIGNED INTEGER)	my_varbinary_1000	id
 NULL	NULL	1
 0		2
@@ -3015,7 +3032,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS SIGNED INTEGER),
 my_binary_30, id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL;
+WHERE select_id = 73 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0	
@@ -3032,7 +3049,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as signed) AS `CAST(my_binary_30 AS SIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 71 OR select_id IS NULL);
+WHERE select_id = 73 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS SIGNED INTEGER)	my_binary_30	id
 NULL	NULL	1
 0	
@@ -3051,7 +3068,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS SIGNED INTEGER),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL;
+WHERE select_id = 72 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3067,7 +3084,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as signed) AS `CAST(my_varchar_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 70 OR select_id IS NULL);
+WHERE select_id = 72 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS SIGNED INTEGER)	my_varchar_1000	id
 NULL	NULL	1
 0		2
@@ -3085,7 +3102,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS SIGNED INTEGER),
 my_char_30, id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL;
+WHERE select_id = 71 OR select_id IS NULL order by id;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3101,7 +3118,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as signed) AS `CAST(my_char_30 AS SIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 69 OR select_id IS NULL);
+WHERE select_id = 71 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS SIGNED INTEGER)	my_char_30	id
 NULL	NULL	1
 0		2
@@ -3119,25 +3136,25 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DECIMAL),
 my_year, id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL;
+WHERE select_id = 70 OR select_id IS NULL order by id;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901.00	1901	2
-2155.00	2155	3
-2000.00	2000	4
-2005.00	2005	5
+1901	1901	2
+2155	2155	3
+2000	2000	4
+2005	2005	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as decimal) AS `CAST(my_year AS DECIMAL)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 68 OR select_id IS NULL);
+WHERE select_id = 70 OR select_id IS NULL) order by id;
 CAST(my_year AS DECIMAL)	my_year	id
 NULL	NULL	1
-1901.00	1901	2
-2155.00	2155	3
-2000.00	2000	4
-2005.00	2005	5
+1901	1901	2
+2155	2155	3
+2000	2000	4
+2005	2005	5
 DROP VIEW v1;
 
 
@@ -3145,25 +3162,25 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DECIMAL),
 my_time, id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL;
+WHERE select_id = 69 OR select_id IS NULL order by id;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959.00	-838:59:59	2
-8385959.00	838:59:59	3
-130000.00	13:00:00	4
-100000.00	10:00:00	5
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as decimal) AS `CAST(my_time AS DECIMAL)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 67 OR select_id IS NULL);
+WHERE select_id = 69 OR select_id IS NULL) order by id;
 CAST(my_time AS DECIMAL)	my_time	id
 NULL	NULL	1
--8385959.00	-838:59:59	2
-8385959.00	838:59:59	3
-130000.00	13:00:00	4
-100000.00	10:00:00	5
+-8385959	-838:59:59	2
+8385959	838:59:59	3
+130000	13:00:00	4
+100000	10:00:00	5
 DROP VIEW v1;
 
 
@@ -3171,25 +3188,35 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DECIMAL),
 my_timestamp, id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL;
+WHERE select_id = 68 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0.00	0000-00-00 00:00:00	1
-19700101030001.00	1970-01-01 03:00:01	2
-20380101025959.00	2038-01-01 02:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+0	0000-00-00 00:00:00	1
+9999999999	1970-01-01 03:00:01	2
+9999999999	2038-01-01 02:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as decimal) AS `CAST(my_timestamp AS DECIMAL)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 66 OR select_id IS NULL);
+WHERE select_id = 68 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DECIMAL)	my_timestamp	id
-0.00	0000-00-00 00:00:00	1
-19700101030001.00	1970-01-01 03:00:01	2
-20380101025959.00	2038-01-01 02:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+0	0000-00-00 00:00:00	1
+9999999999	1970-01-01 03:00:01	2
+9999999999	2038-01-01 02:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_timestamp AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3197,25 +3224,25 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DECIMAL),
 my_date, id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL;
+WHERE select_id = 67 OR select_id IS NULL order by id;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101.00	0001-01-01	2
-99991231.00	9999-12-31	3
-20040229.00	2004-02-29	4
-20050628.00	2005-06-28	5
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as decimal) AS `CAST(my_date AS DECIMAL)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 65 OR select_id IS NULL);
+WHERE select_id = 67 OR select_id IS NULL) order by id;
 CAST(my_date AS DECIMAL)	my_date	id
 NULL	NULL	1
-10101.00	0001-01-01	2
-99991231.00	9999-12-31	3
-20040229.00	2004-02-29	4
-20050628.00	2005-06-28	5
+10101	0001-01-01	2
+99991231	9999-12-31	3
+20040229	2004-02-29	4
+20050628	2005-06-28	5
 DROP VIEW v1;
 
 
@@ -3223,25 +3250,73 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DECIMAL),
 my_datetime, id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL;
+WHERE select_id = 66 OR select_id IS NULL order by id;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-10101000000.00	0001-01-01 00:00:00	2
-99991231235959.00	9999-12-31 23:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+9999999999	0001-01-01 00:00:00	2
+9999999999	9999-12-31 23:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as decimal) AS `CAST(my_datetime AS DECIMAL)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 64 OR select_id IS NULL);
+WHERE select_id = 66 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DECIMAL)	my_datetime	id
 NULL	NULL	1
-10101000000.00	0001-01-01 00:00:00	2
-99991231235959.00	9999-12-31 23:59:59	3
-20040229235959.00	2004-02-29 23:59:59	4
-20050628100000.00	2005-06-28 10:00:00	5
+9999999999	0001-01-01 00:00:00	2
+9999999999	9999-12-31 23:59:59	3
+9999999999	2004-02-29 23:59:59	4
+9999999999	2005-06-28 10:00:00	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_datetime AS DECIMAL)' at row 1
+DROP VIEW v1;
+
+
+CREATE VIEW v1 AS SELECT CAST(my_double AS DECIMAL),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS DECIMAL),
+my_double, id FROM t1_values
+WHERE select_id = 65 OR select_id IS NULL order by id;
+CAST(my_double AS DECIMAL)	my_double	id
+NULL	NULL	1
+-9999999999	-1.7976931348623e+308	2
+9999999999	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+-3333	-3333.3333	30
+Warnings:
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as decimal) AS `CAST(my_double AS DECIMAL)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 65 OR select_id IS NULL) order by id;
+CAST(my_double AS DECIMAL)	my_double	id
+NULL	NULL	1
+-9999999999	-1.7976931348623e+308	2
+9999999999	1.7976931348623e+308	3
+0	0	4
+-1	-1	5
+-3333	-3333.3333	30
+Warnings:
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
+Error	1292	Truncated incorrect DECIMAL value: ''
+Error	1264	Out of range value for column 'CAST(my_double AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3249,25 +3324,31 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS DECIMAL),
 my_decimal, id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL;
+WHERE select_id = 64 OR select_id IS NULL order by id;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
-0.00	0.000000000000000000000000000000	4
--1.00	-1.000000000000000000000000000000	5
+-9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
+0	0.000000000000000000000000000000	4
+-1	-1.000000000000000000000000000000	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as decimal) AS `CAST(my_decimal AS DECIMAL)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 63 OR select_id IS NULL);
+WHERE select_id = 64 OR select_id IS NULL) order by id;
 CAST(my_decimal AS DECIMAL)	my_decimal	id
 NULL	NULL	1
--10000000000000000000000000000000000.00	-9999999999999999999999999999999999.999999999999999999999999999999	2
-10000000000000000000000000000000000.00	9999999999999999999999999999999999.999999999999999999999999999999	3
-0.00	0.000000000000000000000000000000	4
--1.00	-1.000000000000000000000000000000	5
+-9999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
+9999999999	9999999999999999999999999999999999.999999999999999999999999999999	3
+0	0.000000000000000000000000000000	4
+-1	-1.000000000000000000000000000000	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_decimal AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3275,25 +3356,31 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DECIMAL),
 my_bigint, id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL;
+WHERE select_id = 63 OR select_id IS NULL order by id;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9223372036854775808.00	-9223372036854775808	2
-9223372036854775807.00	9223372036854775807	3
-0.00	0	4
--1.00	-1	5
+-9999999999	-9223372036854775808	2
+9999999999	9223372036854775807	3
+0	0	4
+-1	-1	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as decimal) AS `CAST(my_bigint AS DECIMAL)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 62 OR select_id IS NULL);
+WHERE select_id = 63 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DECIMAL)	my_bigint	id
 NULL	NULL	1
--9223372036854775808.00	-9223372036854775808	2
-9223372036854775807.00	9223372036854775807	3
-0.00	0	4
--1.00	-1	5
+-9999999999	-9223372036854775808	2
+9999999999	9223372036854775807	3
+0	0	4
+-1	-1	5
+Warnings:
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
+Error	1264	Out of range value for column 'CAST(my_bigint AS DECIMAL)' at row 1
 DROP VIEW v1;
 
 
@@ -3301,14 +3388,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DECIMAL),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL;
+WHERE select_id = 62 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	28
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	29
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3318,14 +3405,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as decimal) AS `CAST(my_varbinary_1000 AS DECIMAL)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 61 OR select_id IS NULL);
+WHERE select_id = 62 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DECIMAL)	my_varbinary_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	28
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	29
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3337,14 +3424,14 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DECIMAL),
 my_binary_30, id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL;
+WHERE select_id = 61 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0.00	
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 
--1.00	-1
--3333.33	-3333.3333
+0	
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$-- 
+-1	-1
+-3333	-3333.3333
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3359,14 +3446,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as decimal) AS `CAST(my_binary_30 AS DECIMAL)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 60 OR select_id IS NULL);
+WHERE select_id = 61 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DECIMAL)	my_binary_30	id
 NULL	NULL	1
-0.00	
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$-- 
--1.00	-1
--3333.33	-3333.3333
+0	
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$-- 
+-1	-1
+-3333	-3333.3333
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: ''
@@ -3383,14 +3470,14 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DECIMAL),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL;
+WHERE select_id = 60 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	26
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3400,14 +3487,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as decimal) AS `CAST(my_varchar_1000 AS DECIMAL)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 59 OR select_id IS NULL);
+WHERE select_id = 60 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DECIMAL)	my_varchar_1000	id
 NULL	NULL	1
-0.00		2
-0.00	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
-0.00	 ---äÖüß@µ*$-- 	4
--1.00	-1	5
--3333.33	-3333.3333	26
+0		2
+0	<---------1000 characters-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->	3
+0	 ---äÖüß@µ*$-- 	4
+-1	-1	5
+-3333	-3333.3333	27
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Error	1366	Incorrect decimal value: '' for column '' at row -1
@@ -3419,14 +3506,14 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DECIMAL),
 my_char_30, id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL;
+WHERE select_id = 59 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$--	4
--1.00	-1	5
--3333.33	-3333.3333	25
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$--	4
+-1	-1	5
+-3333	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3439,14 +3526,14 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as decimal) AS `CAST(my_char_30 AS DECIMAL)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 58 OR select_id IS NULL);
+WHERE select_id = 59 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DECIMAL)	my_char_30	id
 NULL	NULL	1
-0.00		2
-0.00	<--------30 characters------->	3
-0.00	 ---äÖüß@µ*$--	4
--1.00	-1	5
--3333.33	-3333.3333	25
+0		2
+0	<--------30 characters------->	3
+0	 ---äÖüß@µ*$--	4
+-1	-1	5
+-3333	-3333.3333	26
 Warnings:
 Error	1366	Incorrect decimal value: '' for column '' at row -1
 Warning	1292	Truncated incorrect DECIMAL value: '                              '
@@ -3461,7 +3548,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS TIME),
 my_year, id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL;
+WHERE select_id = 58 OR select_id IS NULL order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3473,7 +3560,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as time) AS `CAST(my_year AS TIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 57 OR select_id IS NULL);
+WHERE select_id = 58 OR select_id IS NULL) order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
 00:19:01	1901	2
@@ -3487,7 +3574,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS TIME),
 my_time, id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL;
+WHERE select_id = 57 OR select_id IS NULL order by id;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3499,7 +3586,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as time) AS `CAST(my_time AS TIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 56 OR select_id IS NULL);
+WHERE select_id = 57 OR select_id IS NULL) order by id;
 CAST(my_time AS TIME)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -3513,7 +3600,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS TIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL;
+WHERE select_id = 56 OR select_id IS NULL order by id;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3525,7 +3612,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as time) AS `CAST(my_timestamp AS TIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 55 OR select_id IS NULL);
+WHERE select_id = 56 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS TIME)	my_timestamp	id
 00:00:00	0000-00-00 00:00:00	1
 03:00:01	1970-01-01 03:00:01	2
@@ -3539,7 +3626,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS TIME),
 my_date, id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL;
+WHERE select_id = 55 OR select_id IS NULL order by id;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3551,7 +3638,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as time) AS `CAST(my_date AS TIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 54 OR select_id IS NULL);
+WHERE select_id = 55 OR select_id IS NULL) order by id;
 CAST(my_date AS TIME)	my_date	id
 NULL	NULL	1
 00:00:00	0001-01-01	2
@@ -3565,7 +3652,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS TIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL;
+WHERE select_id = 54 OR select_id IS NULL order by id;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3577,7 +3664,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as time) AS `CAST(my_datetime AS TIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 53 OR select_id IS NULL);
+WHERE select_id = 54 OR select_id IS NULL) order by id;
 CAST(my_datetime AS TIME)	my_datetime	id
 NULL	NULL	1
 00:00:00	0001-01-01 00:00:00	2
@@ -3587,11 +3674,45 @@ NULL	NULL	1
 DROP VIEW v1;
 
 
+CREATE VIEW v1 AS SELECT CAST(my_double AS TIME),
+my_double, id FROM t1_values;
+SELECT CAST(my_double AS TIME),
+my_double, id FROM t1_values
+WHERE select_id = 53 OR select_id IS NULL order by id;
+CAST(my_double AS TIME)	my_double	id
+NULL	NULL	1
+NULL	-1.7976931348623e+308	2
+NULL	1.7976931348623e+308	3
+00:00:00	0	4
+-00:00:01	-1	5
+00:17:58	1758	25
+Warnings:
+Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
+SELECT v1.* FROM v1
+WHERE v1.id IN (SELECT id FROM t1_values
+WHERE select_id = 53 OR select_id IS NULL) order by id;
+CAST(my_double AS TIME)	my_double	id
+NULL	NULL	1
+NULL	-1.7976931348623e+308	2
+NULL	1.7976931348623e+308	3
+00:00:00	0	4
+-00:00:01	-1	5
+00:17:58	1758	25
+Warnings:
+Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+DROP VIEW v1;
+
+
 CREATE VIEW v1 AS SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS TIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL;
+WHERE select_id = 52 OR select_id IS NULL order by id;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3607,7 +3728,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 52 OR select_id IS NULL);
+WHERE select_id = 52 OR select_id IS NULL) order by id;
 CAST(my_bigint AS TIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3625,7 +3746,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS TIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL;
+WHERE select_id = 51 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3642,7 +3763,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as time) AS `CAST(my_varbinary_1000 AS TIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 51 OR select_id IS NULL);
+WHERE select_id = 51 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS TIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -3661,7 +3782,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS TIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL;
+WHERE select_id = 50 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00	
@@ -3680,7 +3801,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as time) AS `CAST(my_binary_30 AS TIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 50 OR select_id IS NULL);
+WHERE select_id = 50 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS TIME)	my_binary_30	id
 NULL	NULL	1
 00:00:00	
@@ -3701,7 +3822,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS TIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL;
+WHERE select_id = 49 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3718,7 +3839,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as time) AS `CAST(my_varchar_1000 AS TIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 49 OR select_id IS NULL);
+WHERE select_id = 49 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS TIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -3737,7 +3858,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS TIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL;
+WHERE select_id = 48 OR select_id IS NULL order by id;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3754,7 +3875,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as time) AS `CAST(my_char_30 AS TIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 48 OR select_id IS NULL);
+WHERE select_id = 48 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS TIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -3773,7 +3894,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATETIME),
 my_year, id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL;
+WHERE select_id = 47 OR select_id IS NULL order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3781,16 +3902,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as datetime) AS `CAST(my_year AS DATETIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 47 OR select_id IS NULL);
+WHERE select_id = 47 OR select_id IS NULL) order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -3798,10 +3919,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -3809,35 +3930,31 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATETIME),
 my_time, id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL;
+WHERE select_id = 46 OR select_id IS NULL order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 00:00:00	13:00:00	4
-0000-00-00 00:00:00	10:00:00	5
+0000-00-00 13:00:00	13:00:00	4
+0000-00-00 10:00:00	10:00:00	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 46 OR select_id IS NULL);
+WHERE select_id = 46 OR select_id IS NULL) order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 0000-00-00 00:00:00	-838:59:59	2
 0000-00-00 00:00:00	838:59:59	3
-0000-00-00 00:00:00	13:00:00	4
-0000-00-00 00:00:00	10:00:00	5
+0000-00-00 13:00:00	13:00:00	4
+0000-00-00 10:00:00	10:00:00	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 838:59:59'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 13:00:00'
-Warning	1292	Truncated incorrect datetime value: '0000-00-00 10:00:00'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
+Warning	1292	Incorrect datetime value: '0000-00-00 838:59:59'
 DROP VIEW v1;
 
 
@@ -3845,7 +3962,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATETIME),
 my_timestamp, id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL;
+WHERE select_id = 45 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3857,7 +3974,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as datetime) AS `CAST(my_timestamp AS DATETIME)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 45 OR select_id IS NULL);
+WHERE select_id = 45 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DATETIME)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -3871,7 +3988,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATETIME),
 my_date, id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL;
+WHERE select_id = 44 OR select_id IS NULL order by id;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -3883,7 +4000,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as datetime) AS `CAST(my_date AS DATETIME)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 44 OR select_id IS NULL);
+WHERE select_id = 44 OR select_id IS NULL) order by id;
 CAST(my_date AS DATETIME)	my_date	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01	2
@@ -3897,7 +4014,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATETIME),
 my_datetime, id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL;
+WHERE select_id = 43 OR select_id IS NULL order by id;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -3909,7 +4026,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as datetime) AS `CAST(my_datetime AS DATETIME)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 43 OR select_id IS NULL);
+WHERE select_id = 43 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DATETIME)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -3923,7 +4040,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATETIME),
 my_double, id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL;
+WHERE select_id = 42 OR select_id IS NULL order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -3932,17 +4049,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 42 OR select_id IS NULL);
+WHERE select_id = 42 OR select_id IS NULL) order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -3951,11 +4068,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -3963,7 +4080,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATETIME),
 my_bigint, id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL;
+WHERE select_id = 41 OR select_id IS NULL order by id;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3972,17 +4089,17 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 41 OR select_id IS NULL);
+WHERE select_id = 41 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DATETIME)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -3991,11 +4108,11 @@ NULL	0	4
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
-Warning	1292	Truncated incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '200506271758'
 DROP VIEW v1;
 
 
@@ -4003,7 +4120,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATETIME),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL;
+WHERE select_id = 40 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4012,16 +4129,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as datetime) AS `CAST(my_varbinary_1000 AS DATETIME)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 40 OR select_id IS NULL);
+WHERE select_id = 40 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DATETIME)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4030,10 +4147,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	17
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4041,7 +4158,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATETIME),
 my_binary_30, id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL;
+WHERE select_id = 39 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL	
@@ -4050,17 +4167,17 @@ NULL	 ---äÖüß@µ*$-- 
 NULL	-1
 2005-06-27 17:58:00	2005-06-27 17:58
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as datetime) AS `CAST(my_binary_30 AS DATETIME)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 39 OR select_id IS NULL);
+WHERE select_id = 39 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DATETIME)	my_binary_30	id
 NULL	NULL	1
 NULL	
@@ -4069,10 +4186,10 @@ NULL	 ---äÖüß@µ*$-- 
 NULL	-1
 2005-06-27 17:58:00	2005-06-27 17:58
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect datetime value: '2005-06-27 17:58'
 DROP VIEW v1;
 
@@ -4081,7 +4198,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATETIME),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL;
+WHERE select_id = 38 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4090,16 +4207,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as datetime) AS `CAST(my_varchar_1000 AS DATETIME)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 38 OR select_id IS NULL);
+WHERE select_id = 38 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DATETIME)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4108,10 +4225,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	15
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4119,7 +4236,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATETIME),
 my_char_30, id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL;
+WHERE select_id = 37 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4128,16 +4245,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$--'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as datetime) AS `CAST(my_char_30 AS DATETIME)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 37 OR select_id IS NULL);
+WHERE select_id = 37 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DATETIME)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4146,10 +4263,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27 17:58:00	2005-06-27 17:58	14
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$--'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4157,7 +4274,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS DATE),
 my_year, id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL;
+WHERE select_id = 36 OR select_id IS NULL order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4165,16 +4282,16 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as date) AS `CAST(my_year AS DATE)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 36 OR select_id IS NULL);
+WHERE select_id = 36 OR select_id IS NULL) order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
 NULL	1901	2
@@ -4182,10 +4299,10 @@ NULL	2155	3
 NULL	2000	4
 NULL	2005	5
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '1901'
-Warning	1292	Truncated incorrect datetime value: '2155'
-Warning	1292	Truncated incorrect datetime value: '2000'
-Warning	1292	Truncated incorrect datetime value: '2005'
+Warning	1292	Incorrect datetime value: '1901'
+Warning	1292	Incorrect datetime value: '2155'
+Warning	1292	Incorrect datetime value: '2000'
+Warning	1292	Incorrect datetime value: '2005'
 DROP VIEW v1;
 
 
@@ -4193,7 +4310,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS DATE),
 my_time, id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL;
+WHERE select_id = 35 OR select_id IS NULL order by id;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4205,7 +4322,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 35 OR select_id IS NULL);
+WHERE select_id = 35 OR select_id IS NULL) order by id;
 CAST(my_time AS DATE)	my_time	id
 NULL	NULL	1
 0000-00-00	-838:59:59	2
@@ -4219,7 +4336,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS DATE),
 my_timestamp, id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL;
+WHERE select_id = 34 OR select_id IS NULL order by id;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4231,7 +4348,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as date) AS `CAST(my_timestamp AS DATE)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 34 OR select_id IS NULL);
+WHERE select_id = 34 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS DATE)	my_timestamp	id
 0000-00-00	0000-00-00 00:00:00	1
 1970-01-01	1970-01-01 03:00:01	2
@@ -4245,7 +4362,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS DATE),
 my_date, id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL;
+WHERE select_id = 33 OR select_id IS NULL order by id;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4257,7 +4374,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as date) AS `CAST(my_date AS DATE)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 33 OR select_id IS NULL);
+WHERE select_id = 33 OR select_id IS NULL) order by id;
 CAST(my_date AS DATE)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4271,7 +4388,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS DATE),
 my_datetime, id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL;
+WHERE select_id = 32 OR select_id IS NULL order by id;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4283,7 +4400,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as date) AS `CAST(my_datetime AS DATE)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 32 OR select_id IS NULL);
+WHERE select_id = 32 OR select_id IS NULL) order by id;
 CAST(my_datetime AS DATE)	my_datetime	id
 NULL	NULL	1
 0001-01-01	0001-01-01 00:00:00	2
@@ -4297,7 +4414,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS DATE),
 my_double, id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL;
+WHERE select_id = 31 OR select_id IS NULL order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4306,16 +4423,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 31 OR select_id IS NULL);
+WHERE select_id = 31 OR select_id IS NULL) order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
@@ -4324,10 +4441,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4335,7 +4452,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS DATE),
 my_bigint, id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL;
+WHERE select_id = 30 OR select_id IS NULL order by id;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4344,16 +4461,16 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 30 OR select_id IS NULL);
+WHERE select_id = 30 OR select_id IS NULL) order by id;
 CAST(my_bigint AS DATE)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -4362,10 +4479,10 @@ NULL	0	4
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '-9223372036854775808'
-Warning	1292	Truncated incorrect datetime value: '9223372036854775807'
-Warning	1292	Truncated incorrect datetime value: '0'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-9223372036854775808'
+Warning	1292	Incorrect datetime value: '9223372036854775807'
+Warning	1292	Incorrect datetime value: '0'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4373,7 +4490,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS DATE),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL;
+WHERE select_id = 29 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4382,16 +4499,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as date) AS `CAST(my_varbinary_1000 AS DATE)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 29 OR select_id IS NULL);
+WHERE select_id = 29 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS DATE)	my_varbinary_1000	id
 NULL	NULL	1
 NULL		2
@@ -4400,10 +4517,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	11
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4411,7 +4528,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS DATE),
 my_binary_30, id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL;
+WHERE select_id = 28 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL	
@@ -4420,17 +4537,17 @@ NULL	 ---äÖüß@µ*$-- 
 NULL	-1
 2005-06-27	2005-06-27
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as date) AS `CAST(my_binary_30 AS DATE)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 28 OR select_id IS NULL);
+WHERE select_id = 28 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS DATE)	my_binary_30	id
 NULL	NULL	1
 NULL	
@@ -4439,10 +4556,10 @@ NULL	 ---äÖüß@µ*$-- 
 NULL	-1
 2005-06-27	2005-06-27
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Truncated incorrect date value: '2005-06-27'
 DROP VIEW v1;
 
@@ -4451,7 +4568,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS DATE),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL;
+WHERE select_id = 27 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4460,16 +4577,16 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as date) AS `CAST(my_varchar_1000 AS DATE)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 27 OR select_id IS NULL);
+WHERE select_id = 27 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS DATE)	my_varchar_1000	id
 NULL	NULL	1
 NULL		2
@@ -4478,10 +4595,10 @@ NULL	 ---äÖüß@µ*$-- 	4
 NULL	-1	5
 2005-06-27	2005-06-27	9
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$-- '
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<---------1000 characters-------------------------------------------------------------------------------------------------------'
+Warning	1292	Incorrect datetime value: ' ---����@�*$-- '
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4489,7 +4606,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS DATE),
 my_char_30, id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL;
+WHERE select_id = 26 OR select_id IS NULL order by id;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4498,16 +4615,16 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$--'
+Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as date) AS `CAST(my_char_30 AS DATE)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 26 OR select_id IS NULL);
+WHERE select_id = 26 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS DATE)	my_char_30	id
 NULL	NULL	1
 NULL		2
@@ -4516,10 +4633,10 @@ NULL	 ---äÖüß@µ*$--	4
 NULL	-1	5
 2005-06-27	2005-06-27	8
 Warnings:
-Warning	1292	Truncated incorrect datetime value: ''
-Warning	1292	Truncated incorrect datetime value: '<--------30 characters------->'
-Warning	1292	Truncated incorrect datetime value: ' ---����@�*$--'
-Warning	1292	Truncated incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: ''
+Warning	1292	Incorrect datetime value: '<--------30 characters------->'
+Warning	1292	Incorrect datetime value: ' ---����@�*$--'
+Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
 
 
@@ -4527,7 +4644,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS CHAR),
 my_year, id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL;
+WHERE select_id = 25 OR select_id IS NULL order by id;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4539,7 +4656,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset latin1) AS `CAST(my_year AS CHAR)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 25 OR select_id IS NULL);
+WHERE select_id = 25 OR select_id IS NULL) order by id;
 CAST(my_year AS CHAR)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4553,7 +4670,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS CHAR),
 my_time, id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL;
+WHERE select_id = 24 OR select_id IS NULL order by id;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4565,7 +4682,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset latin1) AS `CAST(my_time AS CHAR)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 24 OR select_id IS NULL);
+WHERE select_id = 24 OR select_id IS NULL) order by id;
 CAST(my_time AS CHAR)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4579,7 +4696,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS CHAR),
 my_timestamp, id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL;
+WHERE select_id = 23 OR select_id IS NULL order by id;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4591,7 +4708,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset latin1) AS `CAST(my_timestamp AS CHAR)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 23 OR select_id IS NULL);
+WHERE select_id = 23 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS CHAR)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4605,7 +4722,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS CHAR),
 my_date, id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL;
+WHERE select_id = 22 OR select_id IS NULL order by id;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4617,7 +4734,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset latin1) AS `CAST(my_date AS CHAR)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 22 OR select_id IS NULL);
+WHERE select_id = 22 OR select_id IS NULL) order by id;
 CAST(my_date AS CHAR)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4631,7 +4748,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS CHAR),
 my_datetime, id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL;
+WHERE select_id = 21 OR select_id IS NULL order by id;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4643,7 +4760,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset latin1) AS `CAST(my_datetime AS CHAR)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 21 OR select_id IS NULL);
+WHERE select_id = 21 OR select_id IS NULL) order by id;
 CAST(my_datetime AS CHAR)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4657,7 +4774,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS CHAR),
 my_double, id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL;
+WHERE select_id = 20 OR select_id IS NULL order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4669,7 +4786,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset latin1) AS `CAST(my_double AS CHAR)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 20 OR select_id IS NULL);
+WHERE select_id = 20 OR select_id IS NULL) order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4683,7 +4800,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS CHAR),
 my_decimal, id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL;
+WHERE select_id = 19 OR select_id IS NULL order by id;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4695,7 +4812,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset latin1) AS `CAST(my_decimal AS CHAR)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 19 OR select_id IS NULL);
+WHERE select_id = 19 OR select_id IS NULL) order by id;
 CAST(my_decimal AS CHAR)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -4709,7 +4826,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS CHAR),
 my_bigint, id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL;
+WHERE select_id = 18 OR select_id IS NULL order by id;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4721,7 +4838,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset latin1) AS `CAST(my_bigint AS CHAR)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 18 OR select_id IS NULL);
+WHERE select_id = 18 OR select_id IS NULL) order by id;
 CAST(my_bigint AS CHAR)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -4735,7 +4852,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS CHAR),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL;
+WHERE select_id = 17 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4747,7 +4864,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset latin1) AS `CAST(my_varbinary_1000 AS CHAR)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 17 OR select_id IS NULL);
+WHERE select_id = 17 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS CHAR)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -4761,7 +4878,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS CHAR),
 my_binary_30, id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL;
+WHERE select_id = 16 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 
@@ -4773,7 +4890,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset latin1) AS `CAST(my_binary_30 AS CHAR)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 16 OR select_id IS NULL);
+WHERE select_id = 16 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS CHAR)	my_binary_30	id
 NULL	NULL	1
 
@@ -4787,7 +4904,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS CHAR),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL;
+WHERE select_id = 15 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4799,7 +4916,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset latin1) AS `CAST(my_varchar_1000 AS CHAR)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 15 OR select_id IS NULL);
+WHERE select_id = 15 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS CHAR)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -4813,7 +4930,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS CHAR),
 my_char_30, id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL;
+WHERE select_id = 14 OR select_id IS NULL order by id;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4825,7 +4942,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset latin1) AS `CAST(my_char_30 AS CHAR)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 14 OR select_id IS NULL);
+WHERE select_id = 14 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS CHAR)	my_char_30	id
 NULL	NULL	1
 		2
@@ -4839,7 +4956,7 @@ CREATE VIEW v1 AS SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values;
 SELECT CAST(my_year AS BINARY),
 my_year, id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL;
+WHERE select_id = 13 OR select_id IS NULL order by id;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4851,7 +4968,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_year` as char charset binary) AS `CAST(my_year AS BINARY)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 13 OR select_id IS NULL);
+WHERE select_id = 13 OR select_id IS NULL) order by id;
 CAST(my_year AS BINARY)	my_year	id
 NULL	NULL	1
 1901	1901	2
@@ -4865,7 +4982,7 @@ CREATE VIEW v1 AS SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values;
 SELECT CAST(my_time AS BINARY),
 my_time, id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL;
+WHERE select_id = 12 OR select_id IS NULL order by id;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4877,7 +4994,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as char charset binary) AS `CAST(my_time AS BINARY)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 12 OR select_id IS NULL);
+WHERE select_id = 12 OR select_id IS NULL) order by id;
 CAST(my_time AS BINARY)	my_time	id
 NULL	NULL	1
 -838:59:59	-838:59:59	2
@@ -4891,7 +5008,7 @@ CREATE VIEW v1 AS SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values;
 SELECT CAST(my_timestamp AS BINARY),
 my_timestamp, id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL;
+WHERE select_id = 11 OR select_id IS NULL order by id;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4903,7 +5020,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_timestamp` as char charset binary) AS `CAST(my_timestamp AS BINARY)`,`t1_values`.`my_timestamp` AS `my_timestamp`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 11 OR select_id IS NULL);
+WHERE select_id = 11 OR select_id IS NULL) order by id;
 CAST(my_timestamp AS BINARY)	my_timestamp	id
 0000-00-00 00:00:00	0000-00-00 00:00:00	1
 1970-01-01 03:00:01	1970-01-01 03:00:01	2
@@ -4917,7 +5034,7 @@ CREATE VIEW v1 AS SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values;
 SELECT CAST(my_date AS BINARY),
 my_date, id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL;
+WHERE select_id = 10 OR select_id IS NULL order by id;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4929,7 +5046,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_date` as char charset binary) AS `CAST(my_date AS BINARY)`,`t1_values`.`my_date` AS `my_date`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 10 OR select_id IS NULL);
+WHERE select_id = 10 OR select_id IS NULL) order by id;
 CAST(my_date AS BINARY)	my_date	id
 NULL	NULL	1
 0001-01-01	0001-01-01	2
@@ -4943,7 +5060,7 @@ CREATE VIEW v1 AS SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values;
 SELECT CAST(my_datetime AS BINARY),
 my_datetime, id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL;
+WHERE select_id = 9 OR select_id IS NULL order by id;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4955,7 +5072,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_datetime` as char charset binary) AS `CAST(my_datetime AS BINARY)`,`t1_values`.`my_datetime` AS `my_datetime`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 9 OR select_id IS NULL);
+WHERE select_id = 9 OR select_id IS NULL) order by id;
 CAST(my_datetime AS BINARY)	my_datetime	id
 NULL	NULL	1
 0001-01-01 00:00:00	0001-01-01 00:00:00	2
@@ -4969,7 +5086,7 @@ CREATE VIEW v1 AS SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values;
 SELECT CAST(my_double AS BINARY),
 my_double, id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL;
+WHERE select_id = 8 OR select_id IS NULL order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4981,7 +5098,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as char charset binary) AS `CAST(my_double AS BINARY)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 8 OR select_id IS NULL);
+WHERE select_id = 8 OR select_id IS NULL) order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
 -1.7976931348623e+308	-1.7976931348623e+308	2
@@ -4995,7 +5112,7 @@ CREATE VIEW v1 AS SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values;
 SELECT CAST(my_decimal AS BINARY),
 my_decimal, id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL;
+WHERE select_id = 7 OR select_id IS NULL order by id;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5007,7 +5124,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as char charset binary) AS `CAST(my_decimal AS BINARY)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 7 OR select_id IS NULL);
+WHERE select_id = 7 OR select_id IS NULL) order by id;
 CAST(my_decimal AS BINARY)	my_decimal	id
 NULL	NULL	1
 -9999999999999999999999999999999999.999999999999999999999999999999	-9999999999999999999999999999999999.999999999999999999999999999999	2
@@ -5021,7 +5138,7 @@ CREATE VIEW v1 AS SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values;
 SELECT CAST(my_bigint AS BINARY),
 my_bigint, id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL;
+WHERE select_id = 6 OR select_id IS NULL order by id;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5033,7 +5150,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as char charset binary) AS `CAST(my_bigint AS BINARY)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 6 OR select_id IS NULL);
+WHERE select_id = 6 OR select_id IS NULL) order by id;
 CAST(my_bigint AS BINARY)	my_bigint	id
 NULL	NULL	1
 -9223372036854775808	-9223372036854775808	2
@@ -5047,7 +5164,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values;
 SELECT CAST(my_varbinary_1000 AS BINARY),
 my_varbinary_1000, id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL;
+WHERE select_id = 5 OR select_id IS NULL order by id;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5059,7 +5176,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as char charset binary) AS `CAST(my_varbinary_1000 AS BINARY)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 5 OR select_id IS NULL);
+WHERE select_id = 5 OR select_id IS NULL) order by id;
 CAST(my_varbinary_1000 AS BINARY)	my_varbinary_1000	id
 NULL	NULL	1
 		2
@@ -5073,7 +5190,7 @@ CREATE VIEW v1 AS SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values;
 SELECT CAST(my_binary_30 AS BINARY),
 my_binary_30, id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL;
+WHERE select_id = 4 OR select_id IS NULL order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 
@@ -5085,7 +5202,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as char charset binary) AS `CAST(my_binary_30 AS BINARY)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 4 OR select_id IS NULL);
+WHERE select_id = 4 OR select_id IS NULL) order by id;
 CAST(my_binary_30 AS BINARY)	my_binary_30	id
 NULL	NULL	1
 
@@ -5099,7 +5216,7 @@ CREATE VIEW v1 AS SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values;
 SELECT CAST(my_varchar_1000 AS BINARY),
 my_varchar_1000, id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL;
+WHERE select_id = 3 OR select_id IS NULL order by id;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5111,7 +5228,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as char charset binary) AS `CAST(my_varchar_1000 AS BINARY)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 3 OR select_id IS NULL);
+WHERE select_id = 3 OR select_id IS NULL) order by id;
 CAST(my_varchar_1000 AS BINARY)	my_varchar_1000	id
 NULL	NULL	1
 		2
@@ -5125,7 +5242,7 @@ CREATE VIEW v1 AS SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values;
 SELECT CAST(my_char_30 AS BINARY),
 my_char_30, id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL;
+WHERE select_id = 2 OR select_id IS NULL order by id;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5137,7 +5254,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as char charset binary) AS `CAST(my_char_30 AS BINARY)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 2 OR select_id IS NULL);
+WHERE select_id = 2 OR select_id IS NULL) order by id;
 CAST(my_char_30 AS BINARY)	my_char_30	id
 NULL	NULL	1
 		2
@@ -5149,7 +5266,7 @@ DROP VIEW v1;
 
 CREATE VIEW v1 AS SELECT sqrt(my_bigint), my_bigint, id FROM t1_values;
 SELECT sqrt(my_bigint), my_bigint, id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL;
+WHERE select_id = 1 OR select_id IS NULL order by id;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
@@ -5163,7 +5280,7 @@ View	Create View
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sqrt(`t1_values`.`my_bigint`) AS `sqrt(my_bigint)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`
 SELECT v1.* FROM v1
 WHERE v1.id IN (SELECT id FROM t1_values
-WHERE select_id = 1 OR select_id IS NULL);
+WHERE select_id = 1 OR select_id IS NULL) order by id;
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc.result b/mysql-test/suite/funcs_1/r/myisam_storedproc.result
index a1e08c94ab9..b52f0dbbbf0 100644
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc.result
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc.result
@@ -3,19 +3,16 @@
 .                         IMPORTANT NOTICE:
 .                         -----------------
 .
-.  FIXME: The <engine>_storedproc.result files are still NOT CHECKED
-.         for correctness!
+.  FIXME: The .result files are still NOT CHECKED for correctness!
 .
 .  FIXME: Several tests are affected by known problems around DECIMAL
-.  FIXME: and NUMERIC that needs to be checked again after WL#2984
+.  FIXME: and NUMERIC that will be checked again after WL#2984 once
 .  FIXME: has been completed. Some of them are marked in the result.
 .
-.  This .result file has been checked OK with Linux 5.0.23-bk,
-.  ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
-.
-. This file has been saved although it might contain failures / wrong
-. results to be able to detect _new_ differences in the behaviour.
-. Hopefully the remaining checks can be made soon.
+. Currently (Dec 06, 2005) this .result file is checked OK for Linux
+. with 5.0.17-bk (ChangeSet@1.1975.1.2, 2005-12-05 18:33:48+01:00).
+. Using the available Windows version 5.0.16 there are differences
+. that can be ignored (e.g. WL#2984).
 .
 --------------------------------------------------------------------------------
 	FIXME: There are subtests that are switched off due to known bugs:
@@ -99,20 +96,21 @@ USE db_storedproc;
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
-ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934('aaaa');
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
+f1	f2	f3	f4	f5	f6
 DROP PROCEDURE IF EXISTS sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
 CREATE PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( f1 tinytext ) language sql deterministic sql security definer comment 'this is simple'
   BEGIN
 set @v1 = f1;
 SELECT @v1, @v1;
 END//
-ERROR 42000: Identifier name 'sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde' is too long
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( 'abc' );
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
+@v1	@v1
+abc	abc
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 binary ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -121,12 +119,12 @@ SELECT @v1;
 END//
 CALL sp1( 34 );
 @v1
-3
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+34
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 blob ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
@@ -139,6 +137,8 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 int )  language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
@@ -151,6 +151,8 @@ CALL sp1( 34 );
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: SP definition accepted with m>60 in DECIMAL(m,n)
@@ -159,19 +161,13 @@ BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
-ERROR 42000: Too big precision 256 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(66, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
 SELECT @v1;
 END//
-ERROR 42000: Too big precision 66 specified for column ''. Maximum is 65.
 DROP PROCEDURE IF EXISTS sp1//
-Warnings:
-Note	1305	PROCEDURE sp1 does not exist
 CREATE PROCEDURE sp1( f1 decimal(60, 30) ) language sql not deterministic sql security invoker comment 'this is simple'
 BEGIN
 set @v1 = f1;
@@ -179,56 +175,51 @@ SELECT @v1;
 END//
 CALL sp1( 17976931340000 );
 @v1
-17976931340000.000000000000000000000000000000
+17976931340000
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 set("value1", "value1") ) language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
 CALL sp1( "value1, value1" );
 f1
-value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
-Warning	1265	Data truncated for column 'f1' at row 1
+value1, value1
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 enum("value1", "value1") )  language sql not deterministic sql security invoker comment 'this is simple'
   BEGIN
 SELECT f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 CALL sp1( "value1" );
 f1
 value1
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is simple
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongname2348	PROCEDURE	root@localhost	modified	created	DEFINER	
+db_storedproc	sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcd	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( f1 text ) language sql SELECT f1;
 CALL sp1( 'abc' );
@@ -278,9 +269,7 @@ SHOW PROCEDURE status like 'sp1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	DEFINER	this is simple
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934;
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongname234872934 does not exist
 DROP PROCEDURE sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde;
-ERROR 42000: PROCEDURE db_storedproc.sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde does not exist
 DROP PROCEDURE sp1;
 
 Testcase 4.1.2:
@@ -344,13 +333,11 @@ CREATE FUNCTION fn1( f1 enum("value1", "value1") ) returns decimal(63, 30)  lang
   BEGIN
 return f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
 SELECT fn1( "value1" );
 fn1( "value1" )
-1.000000000000000000000000000000
+0.000000000000000000000000000000
 Warnings:
-Note	1291	Column '' has duplicated value 'value1' in ENUM
+Warning	1292	Truncated incorrect DECIMAL value: 'value1'
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -359,14 +346,11 @@ CREATE FUNCTION fn1( f1 set("value1", "value1") ) returns decimal(63, 30) langua
   BEGIN
 return f1;
 END//
-Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
 SELECT fn1( "value1, value1" );
 fn1( "value1, value1" )
-1.000000000000000000000000000000
+0.000000000000000000000000000000
 Warnings:
-Note	1291	Column '' has duplicated value 'value1' in SET
-Warning	1265	Data truncated for column 'f1' at row 1
+Warning	1292	Truncated incorrect DECIMAL value: 'value1, value1'
 SHOW FUNCTION STATUS LIKE 'fn1';
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 db_storedproc	fn1	FUNCTION	root@localhost	modified	created	INVOKER	this is simple
@@ -457,7 +441,7 @@ CREATE PROCEDURE sp1 (f1 char(20) )
 SELECT * from t1 where f2 = f1;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(f1 char(20) )
+sp1		CREATE PROCEDURE `sp1`(f1 char(20) )
 SELECT * from t1 where f2 = f1
 DROP PROCEDURE sp1;
 
@@ -470,7 +454,7 @@ CREATE FUNCTION fn1 (s char(20)) returns char(50)
 return concat('hello, ', s, '!');
 show CREATE FUNCTION fn1;
 Function	sql_mode	Create Function
-fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(s char(20)) RETURNS char(50)
+fn1		CREATE FUNCTION `fn1`(s char(20)) RETURNS char(50)
 return concat('hello, ', s, '!')
 DROP FUNCTION fn1;
 
@@ -514,7 +498,7 @@ CREATE PROCEDURE sp7b (a char (20), out b char(20))
 SELECT f1 into b from t1 where t1.f2= a;
 CALL sp7b('xyz', @out_param);
 Warnings:
-Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data to FETCH
 SELECT @out_param;
 @out_param
 NULL
@@ -527,8 +511,8 @@ END//
 set @c=1;
 CALL sp7c('xyz', @out_param, @c);
 Warnings:
-Warning	1329	No data - zero rows fetched, selected, or processed
-Warning	1329	No data - zero rows fetched, selected, or processed
+Warning	1329	No data to FETCH
+Warning	1329	No data to FETCH
 SELECT @out_param;
 @out_param
 NULL
@@ -2581,12 +2565,12 @@ alter procedure sp1 sql security definer;
 alter function sp1 sql security definer;
 show CREATE PROCEDURE sp1;
 Procedure	sql_mode	Create Procedure
-sp1		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
+sp1		CREATE PROCEDURE `sp1`()
     COMMENT 'this is a procedure'
 set @x= 3
 show CREATE FUNCTION sp1;
 Function	sql_mode	Create Function
-sp1		CREATE DEFINER=`root`@`localhost` FUNCTION `sp1`() RETURNS int(11)
+sp1		CREATE FUNCTION `sp1`() RETURNS int(11)
     COMMENT 'this is a function'
 return 4
 USE db_storedproc;
@@ -4603,9 +4587,6 @@ END begin_label//
 CALL sp1();
 @v1	@v2
 1	2
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
-Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.7:
@@ -4640,9 +4621,6 @@ declare y char;
 SELECT f1, f2 into x, y from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
-Warning	1265	Data truncated for column 'y' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.9:
@@ -4725,9 +4703,9 @@ fetch cur1 into e;
 SELECT x, y, z, a, b, c, d, e;
 close cur1;
 END//
-ERROR 42000: Too big scale 255 specified for column ''. Maximum is 30.
 CALL sp6();
-ERROR 42000: PROCEDURE db_storedproc.sp6 does not exist
+x	y	z	a	b	c	d	e
+a	1	1.1	value1	1200000000000	mediumtext	2005-02-02 12:12:12	a`
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( )
 BEGIN
@@ -4759,7 +4737,7 @@ BEGIN
 declare x char, integer default '0';
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0';
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -4768,7 +4746,7 @@ BEGIN
 declare x1, x2 char, integer default '0', 1;
 SELECT x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'char, integer default '0', 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ' integer default '0', 1;
 SELECT x;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp6;
@@ -6010,11 +5988,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-000	000	000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6023,7 +5997,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-001	001	001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6050,11 +6024,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000	00000	00000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6063,7 +6033,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00001	00001	00001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6090,11 +6060,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000	00000000	00000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6103,7 +6069,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001	00000001	00000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6130,11 +6096,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6143,7 +6105,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000001	0000000001	0000000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6161,7 +6123,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-18446744073709551615	18446744073709551615	18446744073709551615
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6170,11 +6132,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000000000000000	00000000000000000000	00000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-1	-1	-1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6183,7 +6141,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000000000000000001	00000000000000000001	00000000000000000001
+1	1	1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6192,11 +6150,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
--9999999999	-9999999999	-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6207,11 +6161,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6220,11 +6170,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
-Warning	1264	Out of range value adjusted for column 'y' at row 1
-Warning	1264	Out of range value adjusted for column 'z' at row 1
+-34028234660123456789012345678901234567	-34028234660123456789012345678901234567	-34028234660123456789012345678901234567
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6235,11 +6181,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6250,11 +6192,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6265,11 +6203,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0	0	0
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6280,11 +6214,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6295,11 +6225,7 @@ FIXME: Following test contains a known problem that will be checked again
 FIXME: after WL#2984 has been completed: default (10,0) for DECIMAL not checked
 CALL sp1();
 x	y	z
-0000000000	0000000000	0000000000
-Warnings:
-Note	1265	Data truncated for column 'x' at row 1
-Note	1265	Data truncated for column 'y' at row 1
-Note	1265	Data truncated for column 'z' at row 1
+0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351	0.00000000000000000000000000000000000001175494351
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6326,7 +6252,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6335,7 +6261,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-00000001.175494351e-38	00000001.175494351e-38	00000001.175494351e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6344,7 +6270,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.17549e-38	1.17549e-38	1.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6353,7 +6279,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-1.17549e-38	1.17549e-38	1.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6362,7 +6288,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-01.17549e-38	01.17549e-38	01.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6371,7 +6297,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-01.17549e-38	01.17549e-38	01.17549e-38
+1.175494351e-38	1.175494351e-38	1.175494351e-38
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -6407,7 +6333,7 @@ SELECT x, y, z;
 END//
 CALL sp1();
 x	y	z
-2005-02-02 12:20:12	2005-02-02 12:20:12	2005-02-02 12:20:12
+20050202122012	20050202122012	20050202122012
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1( )
 BEGIN
@@ -12458,13 +12384,10 @@ set @v2 = y;
 END//
 CALL sp1();
 x	y	@x
-NULL	a	3
-Warnings:
-Warning	1265	Data truncated for column 'y' at row 3
-Warning	1265	Data truncated for column 'y' at row 1
+NULL	abaa	3
 SELECT @v1, @v2;
 @v1	@v2
-4	a
+4	a`
 DROP PROCEDURE sp1;
 
 Testcase 4.2.28:
@@ -12531,7 +12454,7 @@ CALL sp1();
 @xx
 0
 Warnings:
-Warning	1264	Out of range value adjusted for column 'xx' at row 1
+Warning	1292	Truncated incorrect INTEGER value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12558,11 +12481,9 @@ set xx = 'temp';
 set @xx = xx;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'xx' at row 1
 SELECT @xx;
 @xx
-t
+temp
 DROP PROCEDURE sp1;
 
 Testcase 4.2.31 - b:
@@ -12580,7 +12501,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1265	Data truncated for column 'xx' at row 1
+Warning	1292	Truncated incorrect DOUBLE value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12606,9 +12527,7 @@ SELECT xx;
 END//
 CALL sp1();
 xx
-0000-00-00 00:00:00
-Warnings:
-Warning	1264	Out of range value adjusted for column 'xx' at row 1
+asd
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12652,7 +12571,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
+Warning	1292	Truncated incorrect INTEGER value: 'asd'
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12683,8 +12602,6 @@ declare x char ascii;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12748,8 +12665,6 @@ declare x binary;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12757,8 +12672,6 @@ declare x tinyint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12766,8 +12679,6 @@ declare x tinyint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12775,8 +12686,6 @@ declare x tinyint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12784,8 +12693,6 @@ declare x tinyint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12793,8 +12700,6 @@ declare x smallint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12802,8 +12707,6 @@ declare x smallint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12811,8 +12714,6 @@ declare x smallint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12820,8 +12721,6 @@ declare x smallint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12829,8 +12728,6 @@ declare x mediumint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12838,8 +12735,6 @@ declare x mediumint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12847,8 +12742,6 @@ declare x mediumint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12856,8 +12749,6 @@ declare x mediumint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1366	Incorrect integer value: 'a`' for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12865,8 +12756,6 @@ declare x int;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12874,8 +12763,6 @@ declare x int unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12883,8 +12770,6 @@ declare x int zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12892,8 +12777,6 @@ declare x int unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12901,8 +12784,6 @@ declare x bigint;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12910,8 +12791,6 @@ declare x bigint unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12919,8 +12798,6 @@ declare x bigint zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12928,8 +12805,6 @@ declare x bigint unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12938,7 +12813,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12947,7 +12822,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12956,7 +12831,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12965,7 +12840,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12974,7 +12849,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12983,7 +12858,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -12992,7 +12867,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13001,7 +12876,7 @@ SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
 Warnings:
-Warning	1366	Incorrect decimal value: 'a`                  a`                       !?x???a`                       x???' for column 'x' at row 1
+Error	1366	Incorrect decimal value: '' for column '' at row -1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13009,8 +12884,6 @@ declare x real;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13018,8 +12891,6 @@ declare x real unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13027,8 +12898,6 @@ declare x real zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13036,8 +12905,6 @@ declare x real unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13045,8 +12912,6 @@ declare x float;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13054,8 +12919,6 @@ declare x float unsigned;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13063,8 +12926,6 @@ declare x float zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13072,8 +12933,6 @@ declare x float unsigned zerofill;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13081,8 +12940,6 @@ declare x date;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13090,8 +12947,6 @@ declare x time;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13099,8 +12954,6 @@ declare x datetime;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13108,8 +12961,6 @@ declare x timestamp;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13117,8 +12968,6 @@ declare x year;
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13126,8 +12975,6 @@ declare x year(3);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13135,8 +12982,6 @@ declare x year(4);
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1264	Out of range value adjusted for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13144,8 +12989,6 @@ declare x enum("1enum", "2enum");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13153,8 +12996,6 @@ declare x set("1set", "2set");
 SELECT f1 into x from t2 limit 1;
 END//
 CALL sp1();
-Warnings:
-Warning	1265	Data truncated for column 'x' at row 1
 DROP PROCEDURE sp1;
 
 Testcase 4.2.38:
@@ -13802,7 +13643,7 @@ fetch cur1 into newf1, newf2, newf4, newf3;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data - zero rows fetched, selected, or processed
+ERROR 02000: No data to FETCH
 DROP PROCEDURE sp1;
 
 Testcase 4.2.65:
@@ -13828,7 +13669,7 @@ commit;
 END;
 END//
 CALL sp1();
-ERROR 02000: No data - zero rows fetched, selected, or processed
+ERROR 02000: No data to FETCH
 DROP PROCEDURE sp1;
 
 Testcase 4.2.66:
@@ -15085,7 +14926,7 @@ return f1;
 END//
 SELECT fn2(1.84e+19);
 fn2(1.84e+19)
--46744073709551616
+0
 DROP FUNCTION IF EXISTS fn3;
 CREATE FUNCTION fn3( f1 bigint unsigned zerofill) returns bigint unsigned zerofill
 BEGIN
@@ -15104,8 +14945,6 @@ END//
 SELECT fn4(-9.22e+15);
 fn4(-9.22e+15)
 0
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn5;
 CREATE FUNCTION fn5( f1 decimal) returns decimal
 BEGIN
@@ -15133,10 +14972,6 @@ END//
 SELECT fn7(99999999999);
 fn7(99999999999)
 9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn8;
 CREATE FUNCTION fn8( f1 decimal (0) unsigned zerofill) returns decimal (0) unsigned zerofill
 BEGIN
@@ -15145,9 +14980,7 @@ return f1;
 END//
 SELECT fn8(999999999);
 fn8(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn9;
 CREATE FUNCTION fn9( f1 decimal (0) zerofill) returns decimal (0) zerofill
 BEGIN
@@ -15156,10 +14989,7 @@ return f1;
 END//
 SELECT fn9(-1.00e+09);
 fn9(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn10;
 CREATE FUNCTION fn10( f1 decimal (0, 0)) returns decimal (0, 0)
 BEGIN
@@ -15178,10 +15008,6 @@ END//
 SELECT fn11(99999999999);
 fn11(99999999999)
 9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn12;
 CREATE FUNCTION fn12( f1 decimal (0, 0) unsigned zerofill) returns decimal (0, 0) unsigned zerofill
 BEGIN
@@ -15190,9 +15016,7 @@ return f1;
 END//
 SELECT fn12(999999999);
 fn12(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn13;
 CREATE FUNCTION fn13( f1 decimal (0, 0) zerofill) returns decimal (0, 0) zerofill
 BEGIN
@@ -15201,10 +15025,7 @@ return f1;
 END//
 SELECT fn13(-1.00e+09);
 fn13(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn14;
 CREATE FUNCTION fn14( f1 decimal (63, 30)) returns decimal (63, 30)
 BEGIN
@@ -15240,10 +15061,7 @@ return f1;
 END//
 SELECT fn17(-1.00e+21);
 fn17(-1.00e+21)
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+000000000000000000000000000000000.000000000000000000000000000000
 DROP FUNCTION IF EXISTS fn18_d;
 CREATE FUNCTION fn18_d( f1 decimal (64)) returns decimal (64)
 BEGIN
@@ -15279,10 +15097,7 @@ return f1;
 END//
 SELECT fn21_d_z(1.00e+00);
 fn21_d_z(1.00e+00)
-0000000000000000000000000000000000000000000000000000000000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000000000000000000000000000000000000000000000000000000001
 DROP FUNCTION IF EXISTS fn22;
 CREATE FUNCTION fn22( f1 decimal unsigned) returns decimal unsigned
 BEGIN
@@ -15291,10 +15106,7 @@ return f1;
 END//
 SELECT fn22(1.00e+00);
 fn22(1.00e+00)
-10
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn23;
 CREATE FUNCTION fn23( f1 decimal unsigned zerofill) returns decimal unsigned zerofill
 BEGIN
@@ -15303,10 +15115,7 @@ return f1;
 END//
 SELECT fn23(1.00e+00);
 fn23(1.00e+00)
-0000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000001
 DROP FUNCTION IF EXISTS fn24;
 CREATE FUNCTION fn24( f1 decimal zerofill) returns decimal zerofill
 BEGIN
@@ -15315,10 +15124,7 @@ return f1;
 END//
 SELECT fn24(-1.00e+09);
 fn24(-1.00e+09)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn25;
 CREATE FUNCTION fn25( f1 double) returns double
 BEGIN
@@ -15336,9 +15142,7 @@ return f1;
 END//
 SELECT fn26(1.00e+00);
 fn26(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn27;
 CREATE FUNCTION fn27( f1 double unsigned zerofill) returns double unsigned zerofill
 BEGIN
@@ -15347,9 +15151,7 @@ return f1;
 END//
 SELECT fn27(1.00e+00);
 fn27(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn28;
 CREATE FUNCTION fn28( f1 double zerofill) returns double zerofill
 BEGIN
@@ -15358,9 +15160,7 @@ return f1;
 END//
 SELECT fn28(1.00e+00);
 fn28(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn29;
 CREATE FUNCTION fn29( f1 float) returns float
 BEGIN
@@ -15378,9 +15178,7 @@ return f1;
 END//
 SELECT fn30(1.00e+00);
 fn30(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn31;
 CREATE FUNCTION fn31( f1 float unsigned zerofill) returns float unsigned zerofill
 BEGIN
@@ -15389,9 +15187,7 @@ return f1;
 END//
 SELECT fn31(1.00e+00);
 fn31(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn32;
 CREATE FUNCTION fn32( f1 float zerofill) returns float zerofill
 BEGIN
@@ -15400,9 +15196,7 @@ return f1;
 END//
 SELECT fn32(1.00e+00);
 fn32(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn33;
 CREATE FUNCTION fn33( f1 float(0)) returns float(0)
 BEGIN
@@ -15420,9 +15214,7 @@ return f1;
 END//
 SELECT fn34(1.00e+00);
 fn34(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn35;
 CREATE FUNCTION fn35( f1 float(0) unsigned zerofill) returns float(0) unsigned zerofill
 BEGIN
@@ -15431,9 +15223,7 @@ return f1;
 END//
 SELECT fn35(1.00e+00);
 fn35(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn36;
 CREATE FUNCTION fn36( f1 float(0) zerofill) returns float(0) zerofill
 BEGIN
@@ -15442,9 +15232,7 @@ return f1;
 END//
 SELECT fn36(1.00e+00);
 fn36(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn37;
 CREATE FUNCTION fn37( f1 float(23)) returns float(23)
 BEGIN
@@ -15462,9 +15250,7 @@ return f1;
 END//
 SELECT fn38(1.00e+00);
 fn38(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn39;
 CREATE FUNCTION fn39( f1 float(23) unsigned zerofill) returns float(23) unsigned zerofill
 BEGIN
@@ -15473,9 +15259,7 @@ return f1;
 END//
 SELECT fn39(1.00e+00);
 fn39(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn40;
 CREATE FUNCTION fn40( f1 float(23) zerofill) returns float(23) zerofill
 BEGIN
@@ -15484,9 +15268,7 @@ return f1;
 END//
 SELECT fn40(1.00e+00);
 fn40(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn41;
 CREATE FUNCTION fn41( f1 float(24)) returns float(24)
 BEGIN
@@ -15504,9 +15286,7 @@ return f1;
 END//
 SELECT fn42(1.00e+00);
 fn42(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn43;
 CREATE FUNCTION fn43( f1 float(24) unsigned zerofill) returns float(24) unsigned zerofill
 BEGIN
@@ -15515,9 +15295,7 @@ return f1;
 END//
 SELECT fn43(1.00e+00);
 fn43(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn44;
 CREATE FUNCTION fn44( f1 float(24) zerofill) returns float(24) zerofill
 BEGIN
@@ -15526,9 +15304,7 @@ return f1;
 END//
 SELECT fn44(1.00e+00);
 fn44(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn45;
 CREATE FUNCTION fn45( f1 float(53)) returns float(53)
 BEGIN
@@ -15546,9 +15322,7 @@ return f1;
 END//
 SELECT fn46(1.00e+00);
 fn46(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn47;
 CREATE FUNCTION fn47( f1 float(53) unsigned zerofill) returns float(53) unsigned zerofill
 BEGIN
@@ -15557,9 +15331,7 @@ return f1;
 END//
 SELECT fn47(1.00e+00);
 fn47(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn48;
 CREATE FUNCTION fn48( f1 float(53) zerofill) returns float(53) zerofill
 BEGIN
@@ -15568,9 +15340,7 @@ return f1;
 END//
 SELECT fn48(1.00e+00);
 fn48(1.00e+00)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP FUNCTION IF EXISTS fn49;
 CREATE FUNCTION fn49( f1 int) returns int
 BEGIN
@@ -15579,10 +15349,7 @@ return f1;
 END//
 SELECT fn49(-2.15e+09);
 fn49(-2.15e+09)
--2147483638
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-2147483648
 DROP FUNCTION IF EXISTS fn50;
 CREATE FUNCTION fn50( f1 int unsigned) returns int unsigned
 BEGIN
@@ -15618,9 +15385,7 @@ return f1;
 END//
 SELECT fn53(-8388600);
 fn53(-8388600)
--8388598
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388600
 DROP FUNCTION IF EXISTS fn54;
 CREATE FUNCTION fn54( f1 mediumint unsigned) returns mediumint unsigned
 BEGIN
@@ -15647,11 +15412,7 @@ return f1;
 END//
 SELECT fn56(-8388601);
 fn56(-8388601)
-16777215
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn57;
 CREATE FUNCTION fn57( f1 numeric) returns numeric
 BEGIN
@@ -15660,9 +15421,7 @@ return f1;
 END//
 SELECT fn57(-999999999);
 fn57(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn58;
 CREATE FUNCTION fn58( f1 numeric (0)) returns numeric (0)
 BEGIN
@@ -15671,9 +15430,7 @@ return f1;
 END//
 SELECT fn58(-999999999);
 fn58(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn59;
 CREATE FUNCTION fn59( f1 numeric (0) unsigned) returns numeric (0) unsigned
 BEGIN
@@ -15683,9 +15440,6 @@ END//
 SELECT fn59(9999999999);
 fn59(9999999999)
 9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn60;
 CREATE FUNCTION fn60( f1 numeric (0) unsigned zerofill) returns numeric (0) unsigned zerofill
 BEGIN
@@ -15694,9 +15448,7 @@ return f1;
 END//
 SELECT fn60(99999999);
 fn60(99999999)
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0099999999
 DROP FUNCTION IF EXISTS fn61;
 CREATE FUNCTION fn61( f1 numeric (0) zerofill) returns numeric (0) zerofill
 BEGIN
@@ -15705,10 +15457,7 @@ return f1;
 END//
 SELECT fn61(-99999999);
 fn61(-99999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn62;
 CREATE FUNCTION fn62( f1 numeric (0, 0)) returns numeric (0, 0)
 BEGIN
@@ -15717,9 +15466,7 @@ return f1;
 END//
 SELECT fn62(-999999999);
 fn62(-999999999)
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999
 DROP FUNCTION IF EXISTS fn63;
 CREATE FUNCTION fn63( f1 numeric (0, 0) unsigned) returns numeric (0, 0) unsigned
 BEGIN
@@ -15729,9 +15476,6 @@ END//
 SELECT fn63(9999999999);
 fn63(9999999999)
 9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn64;
 CREATE FUNCTION fn64( f1 numeric (0, 0) unsigned zerofill) returns numeric (0, 0) unsigned zerofill
 BEGIN
@@ -15740,9 +15484,7 @@ return f1;
 END//
 SELECT fn64(99999999);
 fn64(99999999)
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0099999999
 DROP FUNCTION IF EXISTS fn65;
 CREATE FUNCTION fn65( f1 numeric (0, 0) zerofill) returns numeric (0, 0) zerofill
 BEGIN
@@ -15751,10 +15493,7 @@ return f1;
 END//
 SELECT fn65(-99999999);
 fn65(-99999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn66;
 CREATE FUNCTION fn66( f1 numeric (63, 30)) returns numeric (63, 30)
 BEGIN
@@ -15763,12 +15502,7 @@ return f1;
 END//
 SELECT fn66(-1e+36);
 fn66(-1e+36)
--999999999999999999999999999999989.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-999999999999999999999999999999999.999999999999999999999999999999
 DROP FUNCTION IF EXISTS fn67;
 CREATE FUNCTION fn67( f1 numeric (63, 30) unsigned) returns numeric (63, 30) unsigned
 BEGIN
@@ -15778,10 +15512,6 @@ END//
 SELECT fn67(1e+36);
 fn67(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn68;
 CREATE FUNCTION fn68( f1 numeric (63, 30) unsigned zerofill) returns numeric (63, 30) unsigned zerofill
 BEGIN
@@ -15791,10 +15521,6 @@ END//
 SELECT fn68(1e+36);
 fn68(1e+36)
 999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn69;
 CREATE FUNCTION fn69( f1 numeric (63, 30) zerofill) returns numeric (63, 30) zerofill
 BEGIN
@@ -15803,10 +15529,7 @@ return f1;
 END//
 SELECT fn69(-1e+36);
 fn69(-1e+36)
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+000000000000000000000000000000000.000000000000000000000000000000
 DROP FUNCTION IF EXISTS fn70_n;
 CREATE FUNCTION fn70_n( f1 numeric (64)) returns numeric (64)
 BEGIN
@@ -15854,9 +15577,7 @@ return f1;
 END//
 SELECT fn74(999999999);
 fn74(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999
 DROP FUNCTION IF EXISTS fn75;
 CREATE FUNCTION fn75( f1 numeric unsigned zerofill) returns numeric unsigned zerofill
 BEGIN
@@ -15865,9 +15586,7 @@ return f1;
 END//
 SELECT fn75(999999999);
 fn75(999999999)
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0999999999
 DROP FUNCTION IF EXISTS fn76;
 CREATE FUNCTION fn76( f1 numeric zerofill) returns numeric zerofill
 BEGIN
@@ -15876,10 +15595,7 @@ return f1;
 END//
 SELECT fn76(-999999999);
 fn76(-999999999)
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0000000000
 DROP FUNCTION IF EXISTS fn77;
 CREATE FUNCTION fn77( f1 real) returns real
 BEGIN
@@ -15897,9 +15613,7 @@ return f1;
 END//
 SELECT fn78(1.1);
 fn78(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn79;
 CREATE FUNCTION fn79( f1 real unsigned zerofill) returns real unsigned zerofill
 BEGIN
@@ -15908,9 +15622,7 @@ return f1;
 END//
 SELECT fn79(1.1);
 fn79(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn80;
 CREATE FUNCTION fn80( f1 real zerofill) returns real zerofill
 BEGIN
@@ -15919,9 +15631,7 @@ return f1;
 END//
 SELECT fn80(1.1);
 fn80(1.1)
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.1
 DROP FUNCTION IF EXISTS fn81;
 CREATE FUNCTION fn81( f1 smallint) returns smallint
 BEGIN
@@ -15957,11 +15667,7 @@ return f1;
 END//
 SELECT fn84(-32601);
 fn84(-32601)
-65535
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn85;
 CREATE FUNCTION fn85( f1 tinyint) returns tinyint
 BEGIN
@@ -15997,11 +15703,7 @@ return f1;
 END//
 SELECT fn88(-101);
 fn88(-101)
-255
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+0
 DROP FUNCTION IF EXISTS fn89;
 CREATE FUNCTION fn89( f1 enum('1enum', '2enum')) returns enum('1enum', '2enum')
 BEGIN
@@ -16057,7 +15759,7 @@ return f1;
 END//
 SELECT fn92( '23:59:59.999999');
 fn92( '23:59:59.999999')
-25:59:59
+26:00:00
 DROP FUNCTION IF EXISTS fn93;
 CREATE FUNCTION fn93( f1 datetime) returns datetime
 BEGIN
@@ -16066,7 +15768,7 @@ return f1;
 END//
 SELECT fn93('1997-12-31 23:59:59.999999');
 fn93('1997-12-31 23:59:59.999999')
-1998-01-02 01:01:00
+1998-01-02 01:01:01
 DROP FUNCTION IF EXISTS fn94;
 CREATE FUNCTION fn94( f1 char) returns char
 BEGIN
@@ -16076,8 +15778,6 @@ END//
 SELECT fn94( 'h');
 fn94( 'h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn95;
 CREATE FUNCTION fn95( f1 char ascii) returns char ascii
 BEGIN
@@ -16087,8 +15787,6 @@ END//
 SELECT fn95('h');
 fn95('h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn96;
 CREATE FUNCTION fn96( f1 char binary) returns char binary
 BEGIN
@@ -16098,8 +15796,6 @@ END//
 SELECT fn96( 'h');
 fn96( 'h')
 a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 DROP FUNCTION IF EXISTS fn97;
 CREATE FUNCTION fn97( f1 longtext) returns longtext
 BEGIN
@@ -16221,7 +15917,7 @@ SELECT f1;
 END//
 CALL sp2(1.84e+19);
 f1
-18400000000000000000
+-9223372036854775808
 DROP PROCEDURE IF EXISTS sp3;
 CREATE PROCEDURE sp3( f1 bigint unsigned zerofill)
 BEGIN
@@ -16230,7 +15926,7 @@ SELECT f1;
 END//
 CALL sp3(1.84e+17);
 f1
-00184000000000000000
+184000000000000000
 DROP PROCEDURE IF EXISTS sp4;
 CREATE PROCEDURE sp4( f1 bigint zerofill)
 BEGIN
@@ -16239,9 +15935,7 @@ SELECT f1;
 END//
 CALL sp4(-9.22e+15);
 f1
-00000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-9220000000000000
 DROP PROCEDURE IF EXISTS sp5;
 CREATE PROCEDURE sp5( f1 decimal)
 BEGIN
@@ -16253,7 +15947,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: default (10) for DECIMAL not checked, decimal digits shown although not defined
 CALL sp5(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp6;
 CREATE PROCEDURE sp6( f1 decimal (0))
 BEGIN
@@ -16265,7 +15959,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp6(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp7;
 CREATE PROCEDURE sp7( f1 decimal (0) unsigned)
 BEGIN
@@ -16274,11 +15968,7 @@ SELECT f1;
 END//
 CALL sp7(99999999999);
 f1
-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+99999999999.000000000
 DROP PROCEDURE IF EXISTS sp8;
 CREATE PROCEDURE sp8( f1 decimal (0) unsigned zerofill)
 BEGIN
@@ -16287,9 +15977,7 @@ SELECT f1;
 END//
 CALL sp8(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp9;
 CREATE PROCEDURE sp9( f1 decimal (0) zerofill)
 BEGIN
@@ -16301,10 +15989,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp9(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp10;
 CREATE PROCEDURE sp10( f1 decimal (0, 0))
 BEGIN
@@ -16316,7 +16001,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp10(-1.00e+09);
 f1
--1000000000
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp11;
 CREATE PROCEDURE sp11( f1 decimal (0, 0) unsigned)
 BEGIN
@@ -16328,11 +16013,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp11(99999999999);
 f1
-9999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+99999999999.000000000
 DROP PROCEDURE IF EXISTS sp12;
 CREATE PROCEDURE sp12( f1 decimal (0, 0) unsigned zerofill)
 BEGIN
@@ -16344,9 +16025,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp12(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp13;
 CREATE PROCEDURE sp13( f1 decimal (0, 0) zerofill)
 BEGIN
@@ -16358,10 +16037,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp13(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp14;
 CREATE PROCEDURE sp14( f1 decimal (63, 30))
 BEGIN
@@ -16373,7 +16049,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp14(-1.00e+21);
 f1
--1000000000000000000000.000000000000000000000000000000
+-1000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp15;
 CREATE PROCEDURE sp15( f1 decimal (63, 30) unsigned)
 BEGIN
@@ -16385,7 +16061,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp15(1.00e+16);
 f1
-10000000000000000.000000000000000000000000000000
+10000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp16;
 CREATE PROCEDURE sp16( f1 decimal (63, 30) unsigned zerofill)
 BEGIN
@@ -16397,7 +16073,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp16(1.00e+16);
 f1
-000000000000000010000000000000000.000000000000000000000000000000
+10000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp17;
 CREATE PROCEDURE sp17( f1 decimal (63, 30) zerofill)
 BEGIN
@@ -16409,10 +16085,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: wrong number of decimal digits shown
 CALL sp17(-1.00e+21);
 f1
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp18_d;
 CREATE PROCEDURE sp18_d( f1 decimal (64))
 BEGIN
@@ -16421,7 +16094,7 @@ SELECT f1;
 END//
 CALL sp18_d( -1000000000000000000000000000000 );
 f1
--1000000000000000000000000000000
+-1000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp19_du;
 CREATE PROCEDURE sp19_du( f1 decimal (64) unsigned)
 BEGIN
@@ -16430,10 +16103,10 @@ SELECT f1;
 END//
 CALL sp19_du( 100000000000000000000 );
 f1
-100000000000000000000
+100000000000000000000.000000000
 CALL sp19_du( 1000000000000000000000000 );
 f1
-1000000000000000000000000
+1000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp20_duz;
 CREATE PROCEDURE sp20_duz( f1 decimal (64) unsigned zerofill)
 BEGIN
@@ -16445,10 +16118,10 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp20_duz( 100000000000000000000 );
 f1
-0000000000000000000000000000000000000000000100000000000000000000
+100000000000000000000.000000000
 CALL sp20_duz( 1000000000000000000000000 );
 f1
-0000000000000000000000000000000000000001000000000000000000000000
+1000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp21;
 CREATE PROCEDURE sp21( f1 decimal (64) zerofill)
 BEGIN
@@ -16460,10 +16133,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp21(1.00e+00);
 f1
-0000000000000000000000000000000000000000000000000000000000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp22;
 CREATE PROCEDURE sp22( f1 decimal unsigned)
 BEGIN
@@ -16475,10 +16145,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp22(1.00e+00);
 f1
-10
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp23;
 CREATE PROCEDURE sp23( f1 decimal unsigned zerofill)
 BEGIN
@@ -16490,10 +16157,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp23(1.00e+00);
 f1
-0000000010
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.000000000
 DROP PROCEDURE IF EXISTS sp24;
 CREATE PROCEDURE sp24( f1 decimal zerofill)
 BEGIN
@@ -16505,10 +16169,7 @@ FIXME: after WL#2984 has been completed:
 FIXME: decimal digits shown although not defined
 CALL sp24(-1.00e+09);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000.000000000
 DROP PROCEDURE IF EXISTS sp25;
 CREATE PROCEDURE sp25( f1 double)
 BEGIN
@@ -16526,9 +16187,7 @@ SELECT f1;
 END//
 CALL sp26(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp27;
 CREATE PROCEDURE sp27( f1 double unsigned zerofill)
 BEGIN
@@ -16537,9 +16196,7 @@ SELECT f1;
 END//
 CALL sp27(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp28;
 CREATE PROCEDURE sp28( f1 double zerofill)
 BEGIN
@@ -16548,9 +16205,7 @@ SELECT f1;
 END//
 CALL sp28(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp29;
 CREATE PROCEDURE sp29( f1 float)
 BEGIN
@@ -16568,9 +16223,7 @@ SELECT f1;
 END//
 CALL sp30(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp31;
 CREATE PROCEDURE sp31( f1 float unsigned zerofill)
 BEGIN
@@ -16579,9 +16232,7 @@ SELECT f1;
 END//
 CALL sp31(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp32;
 CREATE PROCEDURE sp32( f1 float zerofill)
 BEGIN
@@ -16590,9 +16241,7 @@ SELECT f1;
 END//
 CALL sp32(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp33;
 CREATE PROCEDURE sp33( f1 float(0))
 BEGIN
@@ -16610,9 +16259,7 @@ SELECT f1;
 END//
 CALL sp34(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp35;
 CREATE PROCEDURE sp35( f1 float(0) unsigned zerofill)
 BEGIN
@@ -16621,9 +16268,7 @@ SELECT f1;
 END//
 CALL sp35(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp36;
 CREATE PROCEDURE sp36( f1 float(0) zerofill)
 BEGIN
@@ -16632,9 +16277,7 @@ SELECT f1;
 END//
 CALL sp36(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp37;
 CREATE PROCEDURE sp37( f1 float(23))
 BEGIN
@@ -16652,9 +16295,7 @@ SELECT f1;
 END//
 CALL sp38(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp39;
 CREATE PROCEDURE sp39( f1 float(23) unsigned zerofill)
 BEGIN
@@ -16663,9 +16304,7 @@ SELECT f1;
 END//
 CALL sp39(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp40;
 CREATE PROCEDURE sp40( f1 float(23) zerofill)
 BEGIN
@@ -16674,9 +16313,7 @@ SELECT f1;
 END//
 CALL sp40(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp41;
 CREATE PROCEDURE sp41( f1 float(24))
 BEGIN
@@ -16694,9 +16331,7 @@ SELECT f1;
 END//
 CALL sp42(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp43;
 CREATE PROCEDURE sp43( f1 float(24) unsigned zerofill)
 BEGIN
@@ -16705,9 +16340,7 @@ SELECT f1;
 END//
 CALL sp43(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp44;
 CREATE PROCEDURE sp44( f1 float(24) zerofill)
 BEGIN
@@ -16716,9 +16349,7 @@ SELECT f1;
 END//
 CALL sp44(1.00e+00);
 f1
-000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp45;
 CREATE PROCEDURE sp45( f1 float(53))
 BEGIN
@@ -16736,9 +16367,7 @@ SELECT f1;
 END//
 CALL sp46(1.00e+00);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp47;
 CREATE PROCEDURE sp47( f1 float(53) unsigned zerofill)
 BEGIN
@@ -16747,9 +16376,7 @@ SELECT f1;
 END//
 CALL sp47(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp48;
 CREATE PROCEDURE sp48( f1 float(53) zerofill)
 BEGIN
@@ -16758,9 +16385,7 @@ SELECT f1;
 END//
 CALL sp48(1.00e+00);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1
 DROP PROCEDURE IF EXISTS sp49;
 CREATE PROCEDURE sp49( f1 int)
 BEGIN
@@ -16769,10 +16394,7 @@ SELECT f1;
 END//
 CALL sp49(-2.15e+09);
 f1
--2147483638
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-2150000000
 DROP PROCEDURE IF EXISTS sp50;
 CREATE PROCEDURE sp50( f1 int unsigned)
 BEGIN
@@ -16799,7 +16421,7 @@ SELECT f1;
 END//
 CALL sp52(2.15e+08);
 f1
-0215000000
+215000000
 DROP PROCEDURE IF EXISTS sp53;
 CREATE PROCEDURE sp53( f1 mediumint)
 BEGIN
@@ -16808,9 +16430,7 @@ SELECT f1;
 END//
 CALL sp53(-8388600);
 f1
--8388598
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388600
 DROP PROCEDURE IF EXISTS sp54;
 CREATE PROCEDURE sp54( f1 mediumint unsigned)
 BEGIN
@@ -16837,11 +16457,7 @@ SELECT f1;
 END//
 CALL sp56(-8388601);
 f1
-16777215
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-8388602
 DROP PROCEDURE IF EXISTS sp57;
 CREATE PROCEDURE sp57( f1 numeric)
 BEGIN
@@ -16850,9 +16466,7 @@ SELECT f1;
 END//
 CALL sp57(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp58;
 CREATE PROCEDURE sp58( f1 numeric (0))
 BEGIN
@@ -16861,9 +16475,7 @@ SELECT f1;
 END//
 CALL sp58(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp59;
 CREATE PROCEDURE sp59( f1 numeric (0) unsigned)
 BEGIN
@@ -16872,10 +16484,7 @@ SELECT f1;
 END//
 CALL sp59(9999999999);
 f1
-9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+9999999999.000000000
 DROP PROCEDURE IF EXISTS sp60;
 CREATE PROCEDURE sp60( f1 numeric (0) unsigned zerofill)
 BEGIN
@@ -16884,9 +16493,7 @@ SELECT f1;
 END//
 CALL sp60(99999999);
 f1
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+99999999.000000000
 DROP PROCEDURE IF EXISTS sp61;
 CREATE PROCEDURE sp61( f1 numeric (0) zerofill)
 BEGIN
@@ -16895,10 +16502,7 @@ SELECT f1;
 END//
 CALL sp61(-99999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-99999999.000000000
 DROP PROCEDURE IF EXISTS sp62;
 CREATE PROCEDURE sp62( f1 numeric (0, 0))
 BEGIN
@@ -16907,9 +16511,7 @@ SELECT f1;
 END//
 CALL sp62(-999999999);
 f1
--1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp63;
 CREATE PROCEDURE sp63( f1 numeric (0, 0) unsigned)
 BEGIN
@@ -16918,10 +16520,7 @@ SELECT f1;
 END//
 CALL sp63(9999999999);
 f1
-9999999999
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+9999999999.000000000
 DROP PROCEDURE IF EXISTS sp64;
 CREATE PROCEDURE sp64( f1 numeric (0, 0) unsigned zerofill)
 BEGIN
@@ -16930,9 +16529,7 @@ SELECT f1;
 END//
 CALL sp64(99999999);
 f1
-0100000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+99999999.000000000
 DROP PROCEDURE IF EXISTS sp65;
 CREATE PROCEDURE sp65( f1 numeric (0, 0) zerofill)
 BEGIN
@@ -16941,10 +16538,7 @@ SELECT f1;
 END//
 CALL sp65(-99999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-99999999.000000000
 DROP PROCEDURE IF EXISTS sp66_n;
 CREATE PROCEDURE sp66_n( f1 numeric (63, 30))
 BEGIN
@@ -16953,12 +16547,7 @@ SELECT f1;
 END//
 CALL sp66_n( -1000000000000000000000000000000000000 );
 f1
--999999999999999999999999999999989.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp67_nu;
 CREATE PROCEDURE sp67_nu( f1 numeric (63, 30) unsigned)
 BEGIN
@@ -16967,11 +16556,7 @@ SELECT f1;
 END//
 CALL sp67_nu( 1000000000000000000000000000000000000 );
 f1
-999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp68_nuz;
 CREATE PROCEDURE sp68_nuz( f1 numeric (63, 30) unsigned zerofill)
 BEGIN
@@ -16980,11 +16565,7 @@ SELECT f1;
 END//
 CALL sp68_nuz( 1000000000000000000000000000000000000 );
 f1
-999999999999999999999999999999999.999999999999999999999999999999
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Note	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp69_n_z;
 CREATE PROCEDURE sp69_n_z( f1 numeric (63, 30) zerofill)
 BEGIN
@@ -16993,10 +16574,7 @@ SELECT f1;
 END//
 CALL sp69_n_z( -1000000000000000000000000000000000000 );
 f1
-000000000000000000000000000000010.000000000000000000000000000000
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-1000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp70_n;
 CREATE PROCEDURE sp70_n( f1 numeric (64))
 BEGIN
@@ -17005,7 +16583,7 @@ SELECT f1;
 END//
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
--10000000000000000000000000000000000000000
+-10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp71_nu;
 CREATE PROCEDURE sp71_nu( f1 numeric (64) unsigned)
 BEGIN
@@ -17014,7 +16592,7 @@ SELECT f1;
 END//
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
-10000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp72_nuz;
 CREATE PROCEDURE sp72_nuz( f1 numeric (64) unsigned zerofill)
 BEGIN
@@ -17023,7 +16601,7 @@ SELECT f1;
 END//
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
-0000000000000000000000010000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp73_n_z;
 CREATE PROCEDURE sp73_n_z( f1 numeric (64) zerofill)
 BEGIN
@@ -17032,7 +16610,7 @@ SELECT f1;
 END//
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
-0000000000000000000000010000000000000000000000000000000000000000
+10000000000000000000000000000000000000000.000000000
 DROP PROCEDURE IF EXISTS sp74;
 CREATE PROCEDURE sp74( f1 numeric unsigned)
 BEGIN
@@ -17041,9 +16619,7 @@ SELECT f1;
 END//
 CALL sp74(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp75;
 CREATE PROCEDURE sp75( f1 numeric unsigned zerofill)
 BEGIN
@@ -17052,9 +16628,7 @@ SELECT f1;
 END//
 CALL sp75(999999999);
 f1
-1000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+999999999.000000000
 DROP PROCEDURE IF EXISTS sp76;
 CREATE PROCEDURE sp76( f1 numeric zerofill)
 BEGIN
@@ -17063,10 +16637,7 @@ SELECT f1;
 END//
 CALL sp76(-999999999);
 f1
-0000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-999999999.000000000
 DROP PROCEDURE IF EXISTS sp77;
 CREATE PROCEDURE sp77( f1 real)
 BEGIN
@@ -17075,7 +16646,7 @@ SELECT f1;
 END//
 CALL sp77(1.1);
 f1
-1.1
+1.10000
 DROP PROCEDURE IF EXISTS sp78;
 CREATE PROCEDURE sp78( f1 real unsigned)
 BEGIN
@@ -17084,9 +16655,7 @@ SELECT f1;
 END//
 CALL sp78(1.1);
 f1
-10
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp79;
 CREATE PROCEDURE sp79( f1 real unsigned zerofill)
 BEGIN
@@ -17095,9 +16664,7 @@ SELECT f1;
 END//
 CALL sp79(1.1);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp80;
 CREATE PROCEDURE sp80( f1 real zerofill)
 BEGIN
@@ -17106,9 +16673,7 @@ SELECT f1;
 END//
 CALL sp80(1.1);
 f1
-0000000000000000000010
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+1.10000
 DROP PROCEDURE IF EXISTS sp81;
 CREATE PROCEDURE sp81( f1 smallint)
 BEGIN
@@ -17144,11 +16709,7 @@ SELECT f1;
 END//
 CALL sp84(-32601);
 f1
-65535
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-32602
 DROP PROCEDURE IF EXISTS sp85;
 CREATE PROCEDURE sp85( f1 tinyint)
 BEGIN
@@ -17184,11 +16745,7 @@ SELECT f1;
 END//
 CALL sp88(-101);
 f1
-255
-Warnings:
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+-102
 DROP PROCEDURE IF EXISTS sp89;
 DROP PROCEDURE IF EXISTS sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -17208,7 +16765,7 @@ SELECT f1;
 END//
 CALL sp92( '23:59:59.999999');
 f1
-25:59:59
+26:00:00.999997
 DROP PROCEDURE IF EXISTS sp93;
 CREATE PROCEDURE sp93( f1 datetime)
 BEGIN
@@ -17217,7 +16774,7 @@ SELECT f1;
 END//
 CALL sp93('1997-12-31 23:59:59.999999');
 f1
-1998-01-02 01:01:00
+1998-01-02 01:01:01.000001
 DROP PROCEDURE IF EXISTS sp94;
 CREATE PROCEDURE sp94( f1 char)
 BEGIN
@@ -17226,9 +16783,7 @@ SELECT f1;
 END//
 CALL sp94( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp95;
 CREATE PROCEDURE sp95( f1 char ascii)
 BEGIN
@@ -17237,9 +16792,7 @@ SELECT f1;
 END//
 CALL sp95( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp96;
 CREATE PROCEDURE sp96( f1 char binary)
 BEGIN
@@ -17248,9 +16801,7 @@ SELECT f1;
 END//
 CALL sp96( 'h');
 f1
-a
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
+ah
 DROP PROCEDURE IF EXISTS sp97;
 CREATE PROCEDURE sp97( f1 longtext)
 BEGIN
@@ -17295,7 +16846,7 @@ SELECT f1;
 END//
 CALL sp101(51);
 f1
-2061
+61
 DROP PROCEDURE IF EXISTS sp102;
 CREATE PROCEDURE sp102( f1 year(4))
 BEGIN
@@ -17350,8 +16901,6 @@ END//
 CALL sp107(2.00e+13);
 f1
 returned
-Warnings:
-Warning	1265	Data truncated for column 'f1' at row 1
 USE db_storedproc;
 DROP DATABASE db1;
 DROP DATABASE IF EXISTS db1;
@@ -17388,9 +16937,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute01();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-2061	2061	2071	2061	2061	2071	2033	2033	2084	2033	2033	2084
+61	61	71	61	61	71	2033	2033	2084	2033	2033	2084
 var1	var2	var3	var4	var5	var6	var7	var8
-2061	2071	2061	2071	2033	2084	2033	2084
+61	71	61	71	2033	2084	2033	2084
 DROP PROCEDURE spexecute01;
 DROP PROCEDURE sp1;
 DROP PROCEDURE IF EXISTS sp2;
@@ -17461,9 +17010,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute03();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
+ah	ah	aah	ah	ah	aah	helloworld	helloworld	NULL	helloworld	helloworld	hellohelloworld
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	helloworld	NULL	helloworld	hellohelloworld
+ah	aah	ah	aah	helloworld	NULL	helloworld	hellohelloworld
 DROP PROCEDURE spexecute03;
 DROP PROCEDURE sp3;
 DROP PROCEDURE IF EXISTS sp4;
@@ -17606,7 +17155,7 @@ SELECT var7, var8;
 END//
 CALL spexecute07();
 var1	var2
-18400000000000000000	NULL
+9223372036854775807	NULL
 var3	var4
 -9220000000000000000	NULL
 var5	var6
@@ -17614,7 +17163,7 @@ var5	var6
 var7	var8
 -9220000000000000000	NULL
 f1	f2	f3
-18400000000000000000	18400000000000000000	NULL
+9223372036854775807	9223372036854775807	NULL
 f4	f5	f6
 -9220000000000000000	-9220000000000000000	NULL
 f7	f8	f9
@@ -17622,7 +17171,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	-9220000000000000000	NULL
 f1	f2	f3
-18353255926290448384	18353255926290448384	18353255926290448384
+-2	-2	-2
 f4	f5	f6
 -9220000000000000000	6744073709551616	6744073709551616
 f7	f8	f9
@@ -17630,7 +17179,7 @@ f7	f8	f9
 f10	f11	f12
 -9220000000000000000	6744073709551616	6744073709551616
 var1	var2
-18353255926290448384	18353255926290448384
+-2	-2
 var3	var4
 6744073709551616	6744073709551616
 var5	var6
@@ -17688,9 +17237,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute08();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-00368000000000000000	00368000000000000000	00368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+368000000000000000	368000000000000000	368000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-00368000000000000000	00368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+368000000000000000	368000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute08;
 DROP PROCEDURE sp8;
 DROP PROCEDURE IF EXISTS sp9;
@@ -17742,9 +17291,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute09();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-00000000000000000000	00000000000000000000	00000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-18440000000000000	-18440000000000000	-18439999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-00000000000000000000	00000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-18440000000000000	-18439999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute09;
 DROP PROCEDURE sp9;
 DROP PROCEDURE IF EXISTS sp10;
@@ -17788,9 +17337,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute10();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute10;
 DROP PROCEDURE sp10;
 DROP PROCEDURE IF EXISTS sp11;
@@ -17823,9 +17372,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute11();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1000000000.000000000	1000000000.000000000	1000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1000000000.000000000	1000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute11;
 DROP PROCEDURE sp11;
 DROP PROCEDURE IF EXISTS sp12;
@@ -17858,9 +17407,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute12();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999999.000000000	99999999999.000000000	100000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999999.000000000	100000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute12;
 DROP PROCEDURE sp12;
 DROP PROCEDURE IF EXISTS sp13;
@@ -17893,9 +17442,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute13();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute13;
 DROP PROCEDURE sp13;
 DROP PROCEDURE IF EXISTS sp14;
@@ -17928,9 +17477,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute14();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000000000000000.000000000000000000000000000000	-1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000000000000000.000000000000000000000000000000	-999999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute14;
 DROP PROCEDURE sp14;
 DROP PROCEDURE IF EXISTS sp15;
@@ -17996,9 +17545,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute16();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute16;
 DROP PROCEDURE sp16;
 DROP PROCEDURE IF EXISTS sp17;
@@ -18030,9 +17579,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute17();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute17;
 DROP PROCEDURE sp17;
 DROP PROCEDURE IF EXISTS sp18;
@@ -18064,9 +17613,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute18();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute18;
 DROP PROCEDURE sp18;
 DROP PROCEDURE IF EXISTS sp19;
@@ -18098,9 +17647,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute19();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute19;
 DROP PROCEDURE sp19;
 DROP PROCEDURE IF EXISTS sp20;
@@ -18132,9 +17681,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute20();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute20;
 DROP PROCEDURE sp20;
 DROP PROCEDURE IF EXISTS sp21;
@@ -18166,9 +17715,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute21();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute21;
 DROP PROCEDURE sp21;
 DROP PROCEDURE IF EXISTS sp22;
@@ -18234,9 +17783,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute23();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute23;
 DROP PROCEDURE sp23;
 DROP PROCEDURE IF EXISTS sp24;
@@ -18268,9 +17817,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute24();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.1	1.1	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.1	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute24;
 DROP PROCEDURE sp24;
 DROP PROCEDURE IF EXISTS sp25;
@@ -18302,9 +17851,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute25();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--32758	-32758	-32748	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-65402	-65402	-65392	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--32758	-32748	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-65402	-65392	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute25;
 DROP PROCEDURE sp25;
 DROP PROCEDURE IF EXISTS sp26;
@@ -18370,9 +17919,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute27();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-25:59:59	25:59:59	27:59:59	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+26:00:00.999997	26:00:00.999997	28:00:01.999995	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-25:59:59	27:59:59	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+26:00:00.999997	28:00:01.999995	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute27;
 DROP PROCEDURE sp27;
 DROP PROCEDURE IF EXISTS sp28;
@@ -18404,9 +17953,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute28();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1998-01-02 01:01:00	1998-01-02 01:01:00	1998-01-03 02:02:01	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1998-01-02 01:01:01.000001	1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1998-01-02 01:01:00	1998-01-03 02:02:01	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1998-01-02 01:01:01.000001	1998-01-03 02:02:02.000003	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute28;
 DROP PROCEDURE sp28;
 DROP PROCEDURE IF EXISTS sp29;
@@ -18438,9 +17987,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute29();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute29;
 DROP PROCEDURE sp29;
 DROP PROCEDURE IF EXISTS sp30;
@@ -18472,9 +18021,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute30();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute30;
 DROP PROCEDURE sp30;
 DROP PROCEDURE IF EXISTS sp31;
@@ -18540,9 +18089,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute32();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute32;
 DROP PROCEDURE sp32;
 DROP PROCEDURE IF EXISTS sp33;
@@ -18574,9 +18123,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute33();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute33;
 DROP PROCEDURE sp33;
 DROP PROCEDURE IF EXISTS sp34;
@@ -18642,9 +18191,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute35();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute35;
 DROP PROCEDURE sp35;
 DROP PROCEDURE IF EXISTS sp36;
@@ -18676,9 +18225,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute36();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute36;
 DROP PROCEDURE sp36;
 DROP PROCEDURE IF EXISTS sp37;
@@ -18744,9 +18293,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute38();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute38;
 DROP PROCEDURE sp38;
 DROP PROCEDURE IF EXISTS sp39;
@@ -18778,9 +18327,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute39();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute39;
 DROP PROCEDURE sp39;
 DROP PROCEDURE IF EXISTS sp40;
@@ -18812,9 +18361,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute40();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute40;
 DROP PROCEDURE sp40;
 DROP PROCEDURE IF EXISTS sp41;
@@ -18846,9 +18395,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute41();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute41;
 DROP PROCEDURE sp41;
 DROP PROCEDURE IF EXISTS sp42;
@@ -18880,9 +18429,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute42();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.10000	1.10000	11.10000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.10000	11.10000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute42;
 DROP PROCEDURE sp42;
 DROP PROCEDURE IF EXISTS sp43;
@@ -18914,9 +18463,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute43();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute43;
 DROP PROCEDURE sp43;
 DROP PROCEDURE IF EXISTS sp44;
@@ -18948,9 +18497,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute44();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute44;
 DROP PROCEDURE sp44;
 DROP PROCEDURE IF EXISTS sp45;
@@ -18982,9 +18531,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute45();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute45;
 DROP PROCEDURE sp45;
 DROP PROCEDURE IF EXISTS sp46;
@@ -19016,9 +18565,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute46();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--1000000000	-1000000000	-999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--1000000000	-999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute46;
 DROP PROCEDURE sp46;
 DROP PROCEDURE IF EXISTS sp47;
@@ -19050,9 +18599,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute47();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute47;
 DROP PROCEDURE sp47;
 DROP PROCEDURE IF EXISTS sp48;
@@ -19084,9 +18633,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute48();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute48;
 DROP PROCEDURE sp48;
 DROP PROCEDURE IF EXISTS sp49;
@@ -19118,9 +18667,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute49();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-999999999.000000000	-999999999.000000000	-999999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-999999999.000000000	-999999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute49;
 DROP PROCEDURE sp49;
 DROP PROCEDURE IF EXISTS sp50;
@@ -19152,9 +18701,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute50();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-9999999999	9999999999	9999999999	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+9999999999.000000000	9999999999.000000000	10000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-9999999999	9999999999	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+9999999999.000000000	10000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute50;
 DROP PROCEDURE sp50;
 DROP PROCEDURE IF EXISTS sp51;
@@ -19186,9 +18735,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute51();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-99999999.000000000	-99999999.000000000	-99999989.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-99999999.000000000	-99999989.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute51;
 DROP PROCEDURE sp51;
 DROP PROCEDURE IF EXISTS sp52;
@@ -19220,9 +18769,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute52();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000.000000000000000000000000000000	-10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000.000000000000000000000000000000	-99999999999999999990.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute52;
 DROP PROCEDURE sp52;
 DROP PROCEDURE IF EXISTS sp53;
@@ -19254,9 +18803,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute53();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute53;
 DROP PROCEDURE sp53;
 DROP PROCEDURE IF EXISTS sp54;
@@ -19288,9 +18837,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute54();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute54;
 DROP PROCEDURE sp54;
 DROP PROCEDURE IF EXISTS sp55;
@@ -19322,9 +18871,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute55();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute55;
 DROP PROCEDURE sp55;
 DROP PROCEDURE IF EXISTS sp56;
@@ -19356,9 +18905,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute56();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-2061	2061	2071	2061	2061	2071	2061	2061	2071	2061	2061	2071
+61	61	71	61	61	71	61	61	71	61	61	71
 var1	var2	var3	var4	var5	var6	var7	var8
-2061	2071	2061	2071	2061	2071	2061	2071
+61	71	61	71	61	71	61	71
 DROP PROCEDURE spexecute56;
 DROP PROCEDURE sp56;
 DROP PROCEDURE IF EXISTS sp57;
@@ -19492,9 +19041,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute60();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	a	a	a	a	a	a
+ah	ah	aah	ah	ah	aah	ah	ah	aah	ah	ah	aah
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	a	a	a	a
+ah	aah	ah	aah	ah	aah	ah	aah
 DROP PROCEDURE spexecute60;
 DROP PROCEDURE sp60;
 DROP PROCEDURE IF EXISTS sp61;
@@ -19526,9 +19075,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute61();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-a	a	a	a	a	a	a	a	NULL	a	a	a
+ah	ah	aah	ah	ah	aah	ah	ah	NULL	ah	ah	aah
 var1	var2	var3	var4	var5	var6	var7	var8
-a	a	a	a	a	NULL	a	a
+ah	aah	ah	aah	ah	NULL	ah	aah
 DROP PROCEDURE spexecute61;
 DROP PROCEDURE sp61;
 DROP PROCEDURE IF EXISTS sp62;
@@ -19628,9 +19177,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute64();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010	1000000000	1000000000	1000000010
+1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000000.000000000	1000000010.000000000
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	1000000000	1000000010	1000000000	1000000010	1000000000	1000000010
+1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000	1000000000.000000000	1000000010.000000000
 DROP PROCEDURE spexecute64;
 DROP PROCEDURE sp64;
 DROP PROCEDURE IF EXISTS sp65;
@@ -19662,9 +19211,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute65();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1000000000	1000000000	1000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+999999999.000000000	999999999.000000000	1000000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1000000000	1000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+999999999.000000000	1000000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute65;
 DROP PROCEDURE sp65;
 DROP PROCEDURE IF EXISTS sp66;
@@ -19696,9 +19245,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute66();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10000000000000000.000000000000000000000000000000	10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000.000000000000000000000000000000	10000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute66;
 DROP PROCEDURE sp66;
 DROP PROCEDURE IF EXISTS sp67;
@@ -19730,9 +19279,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute67();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000000.000000000	10000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000010000000000000000.000000000000000000000000000000	000000000000000010000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000.000000000	10000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute67;
 DROP PROCEDURE sp67;
 DROP PROCEDURE IF EXISTS sp68;
@@ -19764,9 +19313,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute68();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-1000000000000000000000.000000000	-999999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000000000000000.000000000	-999999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute68;
 DROP PROCEDURE sp68;
 DROP PROCEDURE IF EXISTS sp69;
@@ -19798,9 +19347,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute69();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--100000000000000000000	-10000000000000000000000	-99999999999999999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--10000000000000000000000	-99999999999999999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute69;
 DROP PROCEDURE sp69;
 DROP PROCEDURE IF EXISTS sp70;
@@ -19832,9 +19381,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute70();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000	10000000000000000000000	100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000	100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute70;
 DROP PROCEDURE sp70;
 DROP PROCEDURE IF EXISTS sp71;
@@ -19866,9 +19415,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute71();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute71;
 DROP PROCEDURE sp71;
 DROP PROCEDURE IF EXISTS sp72;
@@ -19900,9 +19449,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute72();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000000000000000000000000010	0000000000000000000000000000000000000000000000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute72;
 DROP PROCEDURE sp72;
 DROP PROCEDURE IF EXISTS sp73;
@@ -19934,9 +19483,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute73();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-10	10	20	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10	20	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute73;
 DROP PROCEDURE sp73;
 DROP PROCEDURE IF EXISTS sp74;
@@ -19968,9 +19517,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute74();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.000000000	1.000000000	11.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.000000000	11.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute74;
 DROP PROCEDURE sp74;
 DROP PROCEDURE IF EXISTS sp75;
@@ -20002,9 +19551,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute75();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000010	0000000010	0000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-1000000000.000000000	-1000000000.000000000	-999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000010	0000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-1000000000.000000000	-999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute75;
 DROP PROCEDURE sp75;
 DROP PROCEDURE IF EXISTS sp76;
@@ -20036,9 +19585,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute76();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute76;
 DROP PROCEDURE sp76;
 DROP PROCEDURE IF EXISTS sp77;
@@ -20070,9 +19619,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute77();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute77;
 DROP PROCEDURE sp77;
 DROP PROCEDURE IF EXISTS sp78;
@@ -20104,9 +19653,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute78();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000010	000000000010	000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010	000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute78;
 DROP PROCEDURE sp78;
 DROP PROCEDURE IF EXISTS sp79;
@@ -20138,9 +19687,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute79();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000010	0000000000000000000010	0000000000000000000020	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1	1	11	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000010	0000000000000000000020	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1	11	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute79;
 DROP PROCEDURE sp79;
 DROP PROCEDURE IF EXISTS sp80;
@@ -20172,9 +19721,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute80();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--2147483638	-2147483638	-2147483628	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-2150000000	-2150000000	-2149999990	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--2147483638	-2147483628	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-2150000000	-2149999990	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute80;
 DROP PROCEDURE sp80;
 DROP PROCEDURE IF EXISTS sp81;
@@ -20274,9 +19823,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute83();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0215000000	0215000000	0215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+215000000	215000000	215000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0215000000	0215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+215000000	215000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute83;
 DROP PROCEDURE sp83;
 DROP PROCEDURE IF EXISTS sp84;
@@ -20308,9 +19857,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute84();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
--8388598	-8388598	-8388588	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388600	-8388600	-8388590	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
--8388598	-8388588	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388600	-8388590	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute84;
 DROP PROCEDURE sp84;
 DROP PROCEDURE IF EXISTS sp85;
@@ -20376,9 +19925,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute86();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777210	16777210	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+16777210	16777210	16777220	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777210	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+16777210	16777220	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute86;
 DROP PROCEDURE sp86;
 DROP PROCEDURE IF EXISTS sp87;
@@ -20410,9 +19959,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute87();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-16777215	16777215	16777215	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-8388602	-8388602	-8388592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-16777215	16777215	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-8388602	-8388592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute87;
 DROP PROCEDURE sp87;
 DROP PROCEDURE IF EXISTS sp88;
@@ -20444,9 +19993,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute88();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute88;
 DROP PROCEDURE sp88;
 DROP PROCEDURE IF EXISTS sp89;
@@ -20478,9 +20027,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute89();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0100000000	0100000000	0100000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+99999999.000000000	99999999.000000000	100000009.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0100000000	0100000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+99999999.000000000	100000009.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute89;
 DROP PROCEDURE sp89;
 DROP PROCEDURE IF EXISTS sp90;
@@ -20512,9 +20061,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute90();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-100000000000000000000.000000000000000000000000000000	10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-10000000000000000000000.000000000000000000000000000000	100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute90;
 DROP PROCEDURE sp90;
 DROP PROCEDURE IF EXISTS sp91;
@@ -20546,9 +20095,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute91();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000100000000000000000000.000000000000000000000000000000	000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000010000000000000000000000.000000000000000000000000000000	000000000000100000000000000000010.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute91;
 DROP PROCEDURE sp91;
 DROP PROCEDURE IF EXISTS sp92;
@@ -20580,9 +20129,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute92();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-100000000000000000000.000000000	-10000000000000000000000.000000000	-99999999999999999990.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-000000000000000000000000000000010.000000000000000000000000000000	000000000000000000000000000000020.000000000000000000000000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-10000000000000000000000.000000000	-99999999999999999990.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute92;
 DROP PROCEDURE sp92;
 DROP PROCEDURE IF EXISTS sp93;
@@ -20614,9 +20163,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute93();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-0000000000000000000000000000000000000000000100000000000000000000	0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+100000000000000000000.000000000	10000000000000000000000.000000000	100000000000000000010.000000000	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-0000000000000000000000000000000000000000010000000000000000000000	0000000000000000000000000000000000000000000100000000000000000010	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+10000000000000000000000.000000000	100000000000000000010.000000000	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute93;
 DROP PROCEDURE sp93;
 DROP PROCEDURE IF EXISTS sp94;
@@ -20682,9 +20231,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute95();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute95;
 DROP PROCEDURE sp95;
 DROP PROCEDURE IF EXISTS sp96;
@@ -20716,9 +20265,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute96();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65532	65532	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+65532	65532	65542	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65532	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+65532	65542	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute96;
 DROP PROCEDURE sp96;
 DROP PROCEDURE IF EXISTS sp97;
@@ -20750,9 +20299,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute97();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-65535	65535	65535	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-32602	-32602	-32592	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-65535	65535	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-32602	-32592	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute97;
 DROP PROCEDURE sp97;
 DROP PROCEDURE IF EXISTS sp98;
@@ -20818,9 +20367,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute99();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-252	252	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+252	252	262	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-252	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+252	262	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute99;
 DROP PROCEDURE sp99;
 DROP PROCEDURE IF EXISTS sp100;
@@ -20886,9 +20435,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute101();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-255	255	255	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+-102	-102	-92	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-255	255	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+-102	-92	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute101;
 DROP PROCEDURE sp101;
 USE db_storedproc;
@@ -20914,7 +20463,7 @@ insert into temp_table values(a);
 END//
 show CREATE PROCEDURE sp2;
 Procedure	sql_mode	Create Procedure
-sp2	ALLOW_INVALID_DATES	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
+sp2	ALLOW_INVALID_DATES	CREATE PROCEDURE `sp2`()
 BEGIN
 declare a datetime;
 set a = '2005-03-14 01:01:02';
@@ -20950,7 +20499,7 @@ SELECT not 1 between a and b;
 END//
 show CREATE PROCEDURE sp3;
 Procedure	sql_mode	Create Procedure
-sp3	HIGH_NOT_PRECEDENCE	CREATE DEFINER=`root`@`localhost` PROCEDURE `sp3`()
+sp3	HIGH_NOT_PRECEDENCE	CREATE PROCEDURE `sp3`()
 BEGIN
 declare a int signed;
 declare b int unsigned;
@@ -20993,7 +20542,7 @@ show warnings;
 END//
 show CREATE PROCEDURE sp4;
 Procedure	sql_mode	Create Procedure
-sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE DEFINER="root"@"localhost" PROCEDURE "sp4"()
+sp4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,ERROR_FOR_DIVISION_BY_ZERO	CREATE PROCEDURE "sp4"()
 BEGIN
 declare a int;
 declare b int;
@@ -21041,14 +20590,14 @@ set @y=@x;
 END//
 show CREATE PROCEDURE sp6a;
 Procedure	sql_mode	Create Procedure
-sp6a		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
+sp6a		CREATE PROCEDURE `sp6a`(i1 longtext, out i2 mediumint , inout i3 longblob, in i4 year, out i5 real)
 BEGIN
 set @x=i1;
 set @y=@x;
 END
 show CREATE PROCEDURE sp6b;
 Procedure	sql_mode	Create Procedure
-sp6b		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
+sp6b		CREATE PROCEDURE `sp6b`(out i1 longtext, out i2 mediumint , out i3 longblob, out i4 year, out i5 real)
     DETERMINISTIC
 BEGIN
 set @x=i1;
@@ -21056,7 +20605,7 @@ set @y=@x;
 END
 show CREATE PROCEDURE sp6c;
 Procedure	sql_mode	Create Procedure
-sp6c		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
+sp6c		CREATE PROCEDURE `sp6c`(inout i1 longtext, inout  i2 mediumint , inout i3 longblob, inout  i4 year, inout  i5 real)
     COMMENT 'this is a comment'
 BEGIN
 set @x=i1;
@@ -21242,7 +20791,7 @@ END//
 alter function fn1 sql security invoker;
 show  create  function  fn1;
 Function	sql_mode	Create Function
-fn1		CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
+fn1		CREATE FUNCTION `fn1`(x int) RETURNS int(11)
     SQL SECURITY INVOKER
 BEGIN
 return x;
@@ -21274,7 +20823,7 @@ END//
 alter procedure sp6 comment 'this is simple';
 show CREATE PROCEDURE sp6;
 Procedure	sql_mode	Create Procedure
-sp6		CREATE DEFINER=`root`@`localhost` PROCEDURE `sp6`(i1 int , i2 int)
+sp6		CREATE PROCEDURE `sp6`(i1 int , i2 int)
     COMMENT 'this is simple'
 BEGIN
 set @x=i1;
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
index 7a16c10859b..b314b6c7f1a 100755
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
@@ -166,7 +166,7 @@ declare y integer default 1;
 set @x = x;
 set @y = y;
 set @z = 234;
-SELECT f1, f2 into @x, @y from t2 limit 1;
+SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
 SELECT @x, @y, @z, invar;
 BEGIN
 set @x = 2;
@@ -209,7 +209,7 @@ BEGIN
 declare x integer; declare y integer;
 set @x=x;
 set @y=y;
-SELECT f4, f3 into @x, @y from t2 limit 1;
+SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
 SELECT @x, @y;
 END//
 CALL sp1();
@@ -544,6 +544,9 @@ exit handler 2
 exit handler 2
 exit handler 1
 exit handler 1
+Warnings:
+Note	1051	Unknown table 'tqq'
+Note	1051	Unknown table 'tqq'
 create table res_t1(w char unique, x char);
 insert into res_t1 values ('a', 'b');
 CREATE PROCEDURE h1 ()
@@ -1084,7 +1087,8 @@ declare f2_value char(20);
 declare f5_value char(20);
 declare f4_value integer;
 declare f6_value integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
+where f4 >=-5000 order by f4 limit 3;
 open cur1;
 while proceed do
 SELECT count AS 'loop';
@@ -1167,7 +1171,7 @@ of a compound statement ends.
 DROP TABLE IF EXISTS temp1;
 DROP PROCEDURE IF EXISTS sp1;
 create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) );
-SELECT f1, f2, f4, f5 from t2;
+SELECT f1, f2, f4, f5 from t2 order by f4;
 f1	f2	f4	f5
 a`	a`	-5000	a`
 aaa	aaa	-4999	aaa
@@ -1187,21 +1191,21 @@ declare newf1 char(20);
 declare newf2 char(20);
 declare newf5 char(20);
 declare newf4 integer;
-declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
-declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
+declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
+declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
 open cur1;
 open cur2;
 BEGIN
-declare continue handler for sqlstate '02000' set count = 1;
+declare continue handler for sqlstate '02000' set count=1;
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-1-', count, newf1, newf2, newf4, newf5;
 insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
-set count = 4;
+set count= 4;
 BEGIN
-while count > 0 do
+while count> 0 do
 fetch cur1 into newf1, newf2, newf4, newf5;
 SELECT '-2-', count, newf1, newf2, newf4, newf5;
-set count = count - 1;
+set count = count- 1;
 END while;
 SELECT '-3-', count, newf1, newf2, newf4, newf4;
 END;
@@ -1270,8 +1274,10 @@ declare i_newf11 char(20);
 declare i_newf12 char(20);
 declare i_newf13 date;
 declare i_newf14 integer;
-declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
-declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
+declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 4;
+declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
+where f4>=-5000 order by f4 limit 3;
 declare continue handler for sqlstate '02000' set proceed=0;
 open cur1;
 open cur2;
@@ -1302,8 +1308,10 @@ DECLARE o_newf11 CHAR(20);
 DECLARE o_newf12 CHAR(20);
 DECLARE o_newf13 DATE;
 DECLARE o_newf14 INTEGER;
-DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
-DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
+DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
+DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
 DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
 OPEN cur1;
 OPEN cur2;
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
index 33a51a7edbe..f41d5d7d440 100755
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
@@ -80,7 +80,7 @@ connect(localhost,user_1,,db_storedproc,MYSQL_PORT,MYSQL_SOCK);
 user_1@localhost	db_storedproc
 CREATE PROCEDURE sp31102 () SQL SECURITY INVOKER
 BEGIN
-SELECT * FROM db_storedproc.t1 LIMIT 1;
+SELECT * FROM db_storedproc.t1 WHERE f4=-5000 LIMIT 1;
 END//
 CREATE FUNCTION fn31105(n INT) RETURNS INT
 BEGIN
@@ -209,7 +209,7 @@ CALL sp_ins_1();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -226,7 +226,7 @@ CALL sp_ins_3();
 SELECT row_count();
 row_count()
 1
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -246,7 +246,7 @@ CALL sp_upd();
 SELECT row_count();
 row_count()
 4
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
@@ -279,7 +279,7 @@ COUNT( f1 )	f1
 SELECT row_count();
 row_count()
 3
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 f1	f2	f3	f4	f5	f6
 a`	a`	1000-01-01	-5000	a`	-5000
 aaa	aaa	1000-01-02	-4999	aaa	-4999
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
index 4bbee8aa133..4d9a6c64947 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_0102.result
@@ -199,6 +199,9 @@ CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1
 for each row set new.f3 = '14';
 CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
 BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
+ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
+CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
+BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
 insert into t1 (f2) values ('insert 3.5.1.7');
 select * from t1;
 f1	f2	f3
@@ -207,12 +210,14 @@ update t1 set f2='update 3.5.1.7';
 select * from t1;
 f1	f2	f3
 NULL	update 3.5.1.7	42
-select trigger_name from information_schema.triggers;
+select trigger_name from information_schema.triggers order by trigger_name;
 trigger_name
 trg5_1
 trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
 drop trigger trg5_1;
 drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
+ERROR 42000: Identifier name 'trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ' is too long
+drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
 drop table t1;
 
 Testcase 3.5.1.8:
@@ -314,7 +319,7 @@ insert into trig_db3.t1 (f1,f2) values ('insert to db3 t1 from db1',4);
 select @test_var1, @test_var2, @test_var3;
 @test_var1	@test_var2	@test_var3
 trig1	trig2	trig3
-select * from t1;
+select * from t1 order by f2;
 f1	f2
 trig1	1
 trig1	2
@@ -324,7 +329,7 @@ trig2	3
 select * from trig_db3.t1;
 f1	f2
 trig3	4
-select * from t1;
+select * from t1 order by f2;
 f1	f2
 trig1	1
 trig1	2
@@ -349,10 +354,10 @@ for each row set @test_var2='trig1_a';
 create trigger trig_db2.trig2 before insert on trig_db2.t1 
 for each row set @test_var3='trig2';
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers;
+from information_schema.triggers order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-trig_db1	trig1_b	t1
 trig_db1	trig1_a	t1
+trig_db1	trig1_b	t1
 trig_db2	trig2	t1
 set @test_var1= '', @test_var2= '', @test_var3= '';
 insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_03.result b/mysql-test/suite/funcs_1/r/myisam_trig_03.result
index 3dbfa77b464..73befa606c9 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_03.result
@@ -82,16 +82,16 @@ Testcase 3.5.3.2/6:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
 grant ALL  on *.* to test_noprivs@localhost;
-revoke SUPER  on *.* from test_noprivs@localhost;
+revoke TRIGGER on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -104,10 +104,10 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+Got one of the listed errors
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 select current_user;
@@ -122,15 +122,12 @@ root@localhost
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
 ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for column 'f1' in table 't1'
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
-
-note: once 15166 is fixed a similar case for SELECT needs to be added
----------------------------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.2-yes');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -139,10 +136,10 @@ Testcase 3.5.3.6:
 -----------------
 use priv_db;
 drop trigger trg1_2;
-ERROR 42000: Access denied; you need the SUPER privilege for this operation
+Got one of the listed errors
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
 trig 3.5.3.2_2-yes
@@ -151,12 +148,12 @@ use priv_db;
 drop trigger trg1_2;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-no');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
 drop trigger trg1_2;
 
 Testcase 3.5.3.7a:
@@ -166,12 +163,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke UPDATE  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER, UPDATE on *.* to test_yesprivs@localhost;
+grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -180,24 +177,24 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-select f1 from t1;
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
+insert 3.5.3.6-no
 trig 3.5.3.2_2-yes
 trig 3.5.3.2_2-yes
-insert 3.5.3.6-no
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1a');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 drop trigger trg4a_1;
 use priv_db;
 select current_user;
@@ -205,236 +202,220 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT UPDATE, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg4a_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2a';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 drop trigger trg4a_2;
 
 Testcase 3.5.3.7b:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs;
+grant TRIGGER on *.* to test_noprivs;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke UPDATE  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
 GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
-trig 3.5.3.7-2a
 insert 3.5.3.7-1b
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
+trig 3.5.3.7-2a
 update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
 drop trigger trg4b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4b_2 before UPDATE  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2b';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on priv_db.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2b');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-2b
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
 update 3.5.3.7-1b
-insert 3.5.3.7-2b
 update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
+update 3.5.3.7-1b
 drop trigger trg4b_2;
 
 Testcase 3.5.3.7c
 -----------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke UPDATE  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1c');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-1c
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
+update 3.5.3.7-1b
 drop trigger trg4c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4c_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2c';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2c');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-1c
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
 trig 3.5.3.7-2c
+update 3.5.3.7-1b
 drop trigger trg4c_2;
 
 Testcase 3.5.3.7d:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant SELECT (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs;
 Grants for test_noprivs@%
-GRANT SUPER ON *.* TO 'test_noprivs'@'%'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8884
 ------------------------------------------------
 insert into t1 (f1) values ('insert 3.5.3.7-1d');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-1c
+insert 3.5.3.7-1d
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
 trig 3.5.3.7-2c
-insert 3.5.3.7-1d
+update 3.5.3.7-1b
 drop trigger trg4d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT UPDATE (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg4d_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 3.5.3.7-2d';
-
-SELECT priv added to bypass bug 15166
--------------------------------------
-grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.7-2d');
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 insert 3.5.3.2-no
-trig 3.5.3.2_2-yes
-trig 3.5.3.2_2-yes
 insert 3.5.3.6-no
 insert 3.5.3.7-1a
+insert 3.5.3.7-1c
+insert 3.5.3.7-1d
+trig 3.5.3.2_2-yes
+trig 3.5.3.2_2-yes
 trig 3.5.3.7-2a
-update 3.5.3.7-1b
 trig 3.5.3.7-2b
-insert 3.5.3.7-1c
 trig 3.5.3.7-2c
-insert 3.5.3.7-1d
 trig 3.5.3.7-2d
+update 3.5.3.7-1b
 drop trigger trg4d_2;
 
 Testcase 3.5.3.8a:
@@ -444,12 +425,12 @@ grant ALL  on *.* to test_noprivs@localhost;
 revoke SELECT  on *.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER, SELECT on *.* to test_yesprivs@localhost;
+grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 select current_user;
@@ -458,7 +439,7 @@ test_noprivs@localhost
 use priv_db;
 show grants;
 Grants for test_noprivs@localhost
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 
 Trigger create disabled - should fail - Bug 8887
 ------------------------------------------------
@@ -477,17 +458,13 @@ current_user
 test_yesprivs@localhost
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SELECT, SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 create trigger trg5a_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var= 'before trig 3.5.3.8-2a';
 select @test_var;
 @test_var
 before trig 3.5.3.8-2a
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on *.* to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2a');
 select @test_var;
 @test_var
@@ -497,26 +474,26 @@ drop trigger trg5a_2;
 Testcase: 3.5.3.8b
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.* to test_noprivs@localhost;
 revoke SELECT  on priv_db.* from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.* to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE ON `priv_db`.* TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -533,7 +510,7 @@ before trig 3.5.3.8-1b
 drop trigger trg5b_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5b_2 before UPDATE  on t1 for each row
@@ -543,10 +520,6 @@ insert into t1 (f1) values ('insert 3.5.3.8-2b');
 select @test_var;
 @test_var
 before trig 3.5.3.8-2b
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on priv_db.* to test_yesprivs@localhost;
 update t1 set  f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b';
 select @test_var;
 @test_var
@@ -556,26 +529,26 @@ drop trigger trg5b_2;
 Testcase 3.5.3.8c:
 ------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant ALL  on priv_db.t1 to test_noprivs@localhost;
 revoke SELECT  on priv_db.t1 from test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
-GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
 Trigger create disabled - should fail - Bug 8887
@@ -588,16 +561,12 @@ before trig 3.5.3.8-1c
 drop trigger trg5c_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5c_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2c';
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2c');
 select @test_var;
 @test_var
@@ -607,24 +576,24 @@ drop trigger trg5c_2;
 Testcase: 3.5.3.8d:
 -------------------
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-grant SUPER on *.* to test_noprivs@localhost;
+grant TRIGGER on *.* to test_noprivs@localhost;
 grant UPDATE (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 show grants for test_noprivs@localhost;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 connect(localhost,test_noprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
 show grants;
 Grants for test_noprivs@localhost
-GRANT SUPER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
 use priv_db;
 
@@ -638,16 +607,12 @@ before trig 3.5.3.8-1d
 drop trigger trg5d_1;
 show grants;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 use priv_db;
 create trigger trg5d_2 before INSERT  on t1 for each row
 set @test_var= new.f1;
 set @test_var='before trig 3.5.3.8-2d';
-
-UPDATE priv added to bypass bug 15166
--------------------------------------
-grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 insert into t1 (f1) values ('insert 3.5.3.8-2d');
 select @test_var;
 @test_var
@@ -662,12 +627,12 @@ drop table if exists t2;
 create table t1 (f1 int) engine= myisam;
 create table t2 (f2 int) engine= myisam;
 revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-grant SUPER on *.* to test_yesprivs@localhost;
+grant TRIGGER on *.* to test_yesprivs@localhost;
 grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 show grants for test_yesprivs@localhost;
 Grants for test_yesprivs@localhost
-GRANT SUPER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
+GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT ON `priv_db`.`t2` TO 'test_yesprivs'@'localhost'
 GRANT SELECT, UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
 connect(localhost,test_yesprivs,PWD,test,MASTER_MYPORT,MASTER_MYSOCK);
@@ -683,10 +648,10 @@ ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (4);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
 4
-select f2 from t2;
+select f2 from t2 order by f2;
 f2
 4
 use priv_db;
@@ -699,11 +664,11 @@ ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table
 revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (2);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
 2
-select f2 from t2;
+4
+select f2 from t2 order by f2;
 f2
 1
 use priv_db;
@@ -716,12 +681,12 @@ ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table
 revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
-2
 1
-select f2 from t2;
+2
+4
+select f2 from t2 order by f2;
 f2
 1
 select @aaa;
@@ -737,13 +702,13 @@ ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
-select f1 from t1;
+select f1 from t1 order by f1;
 f1
-4
-2
 1
 1
-select f2 from t2;
+2
+4
+select f2 from t2 order by f2;
 f2
 drop database if exists priv_db;
 drop user test_yesprivs@localhost;
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0407.result b/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
index 16d91726e30..e10b5fe919d 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
@@ -93,18 +93,18 @@ Create trigger trg1 BEFORE INSERT on t1
 for each row set new.f1='Trigger 3.5.4.1';
 Use db_drop;
 Insert into t1 values ('Insert error 3.5.4.1');
-Select * from t1;
+Select * from t1 order by f1;
 f1
 Trigger 3.5.4.1
 drop trigger trg1;
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers;
+from information_schema.triggers order by trigger_name;
 trigger_schema	trigger_name	event_object_table
 Insert into t1 values ('Insert no trigger 3.5.4.1');
-Select * from t1;
+Select * from t1 order by f1;
 f1
-Trigger 3.5.4.1
 Insert no trigger 3.5.4.1
+Trigger 3.5.4.1
 drop trigger trg1;
 drop database if exists db_drop;
 revoke ALL PRIVILEGES, GRANT OPTION FROM 'test_general'@'localhost';
@@ -258,7 +258,7 @@ use dbtest_one;
 Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4');
 Warnings:
 Warning	1265	Data truncated for column 'f1' at row 1
-Select * from dbtest_two.t2;
+Select * from dbtest_two.t2 order by f1;
 f1
 1st Insert 3.5.
 2nd Insert 3.5.
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_08.result b/mysql-test/suite/funcs_1/r/myisam_trig_08.result
index ec8e12ff32d..906aea070d9 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_08.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_08.result
@@ -139,10 +139,10 @@ values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
 f120	f122	f136	f144	f163
 1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i;
+select * from db_test.t1_i order by i120;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u;
+select * from db_test.t1_u order by u120;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
 b	00222	0000023456	1.050000000000000000000000000000
@@ -150,7 +150,7 @@ c	00333	0000099999	999.990000000000000000000000000000
 d	00222	0000023456	1.050000000000000000000000000000
 e	00222	0000023456	1.050000000000000000000000000000
 f	00333	0000099999	999.990000000000000000000000000000
-select * from db_test.t1_d;
+select * from db_test.t1_d order by d120;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -162,14 +162,22 @@ select @test_var;
 3.5.8.4 - single SQL - insert
 -----------------------------
 Create trigger trg2 BEFORE UPDATE on tb3 for each row
+BEGIN
 insert into db_test.t1_i 
 values (new.f120, new.f136, new.f144, new.f163);
+END//
+Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
+f120	f122	f136	f144	f163
+1	Test 3.5.8.4	00222	0000023456	1.050000000000000000000000000000
+select * from db_test.t1_i order by i120;
+i120	i136	i144	i163
+1	00222	0000023456	1.050000000000000000000000000000
 update tb3 set f120='I', f122='Test 3.5.8.4-Single Insert'
 		 where f122='Test 3.5.8.4';
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 I	Test 3.5.8.4-Single Insert	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_i;
+select * from db_test.t1_i order by i120;
 i120	i136	i144	i163
 1	00222	0000023456	1.050000000000000000000000000000
 I	00222	0000023456	1.050000000000000000000000000000
@@ -186,14 +194,14 @@ update tb3 set f120='U', f122='Test 3.5.8.4-Single Update'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 U	Test 3.5.8.4-Single Update	00222	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_u;
+select * from db_test.t1_u order by u120;
 u120	u136	u144	u163
 a	00111	0000099999	999.990000000000000000000000000000
-U	00222	0000023456	1.050000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
+f	00333	0000099999	999.990000000000000000000000000000
+U	00222	0000023456	1.050000000000000000000000000000
 U	00222	0000023456	1.050000000000000000000000000000
 U	00222	0000023456	1.050000000000000000000000000000
-f	00333	0000099999	999.990000000000000000000000000000
 
 3.5.8.3/4 - single SQL - delete
 -------------------------------
@@ -206,7 +214,7 @@ f122='Test 3.5.8.4-Single Delete'
 Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
 f120	f122	f136	f144	f163
 D	Test 3.5.8.4-Single Delete	00444	0000023456	1.050000000000000000000000000000
-select * from db_test.t1_d;
+select * from db_test.t1_d order by d120;
 d120	d136	d144	d163
 a	00111	0000099999	999.990000000000000000000000000000
 c	00333	0000099999	999.990000000000000000000000000000
@@ -253,29 +261,29 @@ END//
 set @test_var='Empty', @test_var2=0;
 Insert into tb3 (f120, f122, f136) values ('1', 'Test 3.5.8.5-if', 101);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	one	2nd else
 Insert into tb3 (f120, f122, f136) values ('2', 'Test 3.5.8.5-if', 102);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
 D	Test 3.5.8.5-if	00101	two	2nd else
 D	Test 3.5.8.5-if	00102	two	2nd else
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 10);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
+d	Test 3.5.8.5-if	00010	three	2nd if
 D	Test 3.5.8.5-if	00101	three	2nd if
 D	Test 3.5.8.5-if	00102	three	2nd if
-d	Test 3.5.8.5-if	00010	three	2nd if
 Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 103);
 select f120, f122, f136, @test_var, @test_var2 
-from tb3 where f122 = 'Test 3.5.8.5-if';
+from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 f120	f122	f136	@test_var	@test_var2
+d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00101	three	2nd else
 D	Test 3.5.8.5-if	00102	three	2nd else
-d	Test 3.5.8.5-if	00010	three	2nd else
 D	Test 3.5.8.5-if	00103	three	2nd else
 create trigger trg3 before update on tb3 for each row
 BEGIN
@@ -335,20 +343,20 @@ set @test_var='Empty';
 Insert into tb3 (f120, f122, f136, f144) 
 values ('a', 'Test 3.5.8.5-case', 5, 7);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	A*seven
 Insert into tb3 (f120, f122, f136, f144) 
 values ('b', 'Test 3.5.8.5-case', 71,16);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	B*0000000016
 B	Test 3.5.8.5-case	00191	0000000016	B*0000000016
 Insert into tb3 (f120, f122, f136, f144) 
 values ('c', 'Test 3.5.8.5-case', 80,1);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
 A	Test 3.5.8.5-case	00125	0000000007	C=one
 B	Test 3.5.8.5-case	00191	0000000016	C=one
@@ -358,34 +366,34 @@ values ('d', 'Test 3.5.8.5-case', 152);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 A	Test 3.5.8.5-case	00125	0000000007	1*0000099999
 B	Test 3.5.8.5-case	00191	0000000016	1*0000099999
 C	Test 3.5.8.5-case	00200	0000000001	1*0000099999
-1	Test 3.5.8.5-case	00152	0000099999	1*0000099999
 Insert into tb3 (f120, f122, f136, f144) 
 values ('e', 'Test 3.5.8.5-case', 200, 8);
 Warnings:
 Warning	1265	Data truncated for column 'f120' at row 1
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 Insert into tb3 (f120, f122, f136, f144) 
 values ('f', 'Test 3.5.8.5-case', 100, 8);
 select f120, f122, f136, f144, @test_var 
-from tb3 where f122 = 'Test 3.5.8.5-case';
+from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 f120	f122	f136	f144	@test_var
+1	Test 3.5.8.5-case	00152	0000099999	1=eight
+1	Test 3.5.8.5-case	00200	0000000008	1=eight
 A	Test 3.5.8.5-case	00125	0000000007	1=eight
 B	Test 3.5.8.5-case	00191	0000000016	1=eight
 C	Test 3.5.8.5-case	00200	0000000001	1=eight
-1	Test 3.5.8.5-case	00152	0000099999	1=eight
-1	Test 3.5.8.5-case	00200	0000000008	1=eight
 create trigger trg3a before update on tb3 for each row
 BEGIN
 CASE
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_09.result b/mysql-test/suite/funcs_1/r/myisam_trig_09.result
index 9643aa567e3..6a98e527244 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_09.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_09.result
@@ -120,7 +120,7 @@ set @tr_var_af_118=old.f118, @tr_var_af_121=old.f121,
 Insert into tb3 (f122, f136, f163) 
 values ('Test 3.5.9.3', 7, 123.17);
 Update tb3 Set f136=8 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
 a	NULL	Test 3.5.9.3	00008	123.170000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -136,7 +136,7 @@ a	NULL	Test 3.5.9.3	7	123.170000000000000000000000000000
 @tr_var_af_118	@tr_var_af_121	@tr_var_af_122	@tr_var_af_136	@tr_var_af_163
 0	0	0	0	0
 delete from tb3 where f122='Test 3.5.9.3';
-select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 f118	f121	f122	f136	f163
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 @tr_var_b4_136, @tr_var_b4_163;
@@ -176,7 +176,7 @@ set @tr_var_af_118=new.f118, @tr_var_af_121=new.f121,
 Insert into tb3 (f122, f136, f151, f163) 
 values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4%';
+where f122 like 'Test 3.5.9.4%' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4	00007	999	995.240000000000000000000000000000
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
@@ -194,9 +194,9 @@ a	NULL	Test 3.5.9.4	7	999	995.240000000000000000000000000000
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 Warnings:
-Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'f136' at row 11
+Warning	1048	Column 'f136' cannot be null
 select f118, f121, f122, f136, f151, f163 from tb3 
-where f122 like 'Test 3.5.9.4-trig';
+where f122 like 'Test 3.5.9.4-trig' order by f163;
 f118	f121	f122	f136	f151	f163
 a	NULL	Test 3.5.9.4-trig	00000	999	NULL
 select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result b/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
index 7867fc9f9e2..d1ab6daa423 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
@@ -87,7 +87,7 @@ Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 1);
 Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2);
 Insert into vw11 (f122, f151) values ('Not in View', 3);
 select f121, f122, f151, f163
-from tb3 where f122 like 'Test 3.5.10.1/2/3%';
+from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 NULL	Test 3.5.10.1/2/3	1	111.110000000000000000000000000000
 NULL	Test 3.5.10.1/2/3	2	111.110000000000000000000000000000
@@ -101,7 +101,7 @@ f121	f122	f151	f163
 NULL	Not in View	3	111.110000000000000000000000000000
 Update vw11 set f163=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	1	1.000000000000000000000000000000
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
@@ -115,7 +115,7 @@ before delete
 0
 delete from vw11 where f151=1;
 select f121, f122, f151, f163 from tb3
-where f122 like 'Test 3.5.10.1/2/3%';
+where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 f121	f122	f151	f163
 Y	Test 3.5.10.1/2/3-Update	2	1.000000000000000000000000000000
 select f121, f122, f151, f163 from vw11;
@@ -146,7 +146,7 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
 select @counter as 'Rows Loaded After';
 Rows Loaded After
 10
-Select * from tb_load limit 10;
+Select * from tb_load order by f1 limit 10;
 f1	f2	f3
 -5000	a`	1000
 -4999	aaa	999
@@ -241,7 +241,7 @@ insert into t3 (f1) values (new.f1+1000);
 create trigger tr2_4 after insert on t2_4 for each row
 insert into t3 (f1) values (new.f1+10000);
 insert into t1 values (1);
-select * from t3;
+select * from t3 order by f1;
 f1
 12
 102
@@ -276,17 +276,17 @@ create trigger tr4 after insert on t4
 for each row insert into t1 (f1) values (new.f4+1);
 insert into t1 values (1);
 ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
-select * from t1;
+select * from t1 order by f1;
 f1
 0
 1
-select * from t2;
+select * from t2 order by f2;
 f2
 2
-select * from t3;
+select * from t3 order by f3;
 f3
 3
-select * from t4;
+select * from t4 order by f4;
 f4
 4
 drop trigger tr1;
@@ -373,7 +373,7 @@ create table t4 (f4 tinyint) engine = myisam;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL
+  `f1` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values (1);
 create trigger tr1 after insert on t1
@@ -385,16 +385,16 @@ for each row insert into t4 (f4) values (new.f3+1000);
 set autocommit=0;
 start transaction;
 insert into t1 values (1);
-ERROR 22003: Out of range value adjusted for column 'f4' at row 1
+ERROR 22003: Out of range value for column 'f4' at row 1
 commit;
-select * from t1;
+select * from t1 order by f1;
 f1
 1
 1
-select * from t2;
+select * from t2 order by f2;
 f2
 2
-select * from t3;
+select * from t3 order by f3;
 f3
 3
 drop trigger tr1;
diff --git a/mysql-test/suite/funcs_1/r/myisam_views.result b/mysql-test/suite/funcs_1/r/myisam_views.result
index 3a76024cf80..a3620575c8b 100644
--- a/mysql-test/suite/funcs_1/r/myisam_views.result
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result
@@ -470,7 +470,8 @@ SET @x=0;
 CREATE or REPLACE VIEW v1 AS Select 1 INTO @x;
 ERROR HY000: View's SELECT contains a 'INTO' clause
 Select @x;
-ERROR HY000: View's SELECT contains a variable or parameter
+@x
+0
 CREATE or REPLACE VIEW v1 AS Select 1
 FROM (SELECT 1 FROM t1) my_table;
 ERROR HY000: View's SELECT contains a subquery in the FROM clause
@@ -607,7 +608,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 CREATE or REPLACE view v1 as Select f59, f60
 from tb2 by group f59  ;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'by group f59' at line 2
-ERROR HY000: View's SELECT contains a variable or parameter
+
+Testcase 3.3.1.5 
+--------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1 ;
 CREATE VIEW v1 SELECT * FROM tb2 limit 100 ;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT * FROM tb2 limit 100' at line 1
@@ -627,7 +630,9 @@ CREATE VIEW v1    SELECT 1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1' at line 1
 CREATE VIEW v1 AS         ;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
-ERROR HY000: View's SELECT contains a variable or parameter
+
+Testcase 3.3.1.6 
+--------------------------------------------------------------------------------
 DROP VIEW  IF EXISTS v1 ;
 CREATE or REPLACE                       VIEW v1
 as SELECT * from tb2 limit 100 ;
@@ -1812,7 +1817,9 @@ ERROR HY000: View's SELECT contains a subquery in the FROM clause
 SELECT * FROM test.v1      ;
 ERROR 42S02: Table 'test.v1' doesn't exist
 Drop view if exists test.v1 ;
-ERROR HY000: View's SELECT contains a variable or parameter
+
+Testcase 3.3.1.40 
+--------------------------------------------------------------------------------
 Drop view if exists test.v1 ;
 Set @var1 = 'ABC' ;
 Set @var2 = 'XYZ' ;
@@ -1821,7 +1828,9 @@ ERROR HY000: View's SELECT contains a variable or parameter
 CREATE VIEW test.v1 AS SELECT @@global.sort_buffer_size;
 ERROR HY000: View's SELECT contains a variable or parameter
 Drop view if exists test.v1 ;
-ERROR HY000: View's SELECT contains a variable or parameter
+
+Testcase 3.3.1.41 
+--------------------------------------------------------------------------------
 Drop view if exists test.v1 ;
 Drop procedure if exists sp1 ;
 Create procedure sp1() DETERMINISTIC
@@ -1838,7 +1847,9 @@ Warnings:
 Note	1051	Unknown table 'test.v1'
 Drop procedure sp1 ;
 ERROR 42000: PROCEDURE test.sp1 does not exist
-ERROR HY000: View's SELECT contains a variable or parameter
+
+Testcase 3.3.1.42 
+--------------------------------------------------------------------------------
 Drop VIEW if exists test.v1 ;
 CREATE TEMPORARY VIEW test.v1 AS
 SELECT * FROM test.tb2 limit 2 ;
@@ -1850,7 +1861,9 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 SELECT * FROM test.tb2 limit 2' at line 1
 Drop view if exists test.v1 ;
 Use test;
-ERROR HY000: View's SELECT contains a variable or parameter
+
+Testcase 3.3.1.43 
+--------------------------------------------------------------------------------
 Drop view if exists test.v1 ;
 CREATE VIEW test.v1 AS SELECT f59,f60 FROM test.tb2;
 INSERT INTO test.v1 values(122,432);
@@ -1935,7 +1948,7 @@ f1	f2
 2	two
 4	four
 INSERT INTO v1 VALUES(2,'two');
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
 INSERT INTO v1 VALUES(3,'three');
 affected rows: 1
 INSERT INTO v1 VALUES(6,'six');
@@ -1954,7 +1967,7 @@ f1	f2
 3	three
 4	four
 UPDATE v1 SET f1 = 2 WHERE f1 = 3;
-ERROR 23000: Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
 UPDATE v1 SET f2 = 'number' WHERE f1 = 3;
 affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
@@ -2001,12 +2014,12 @@ DROP VIEW  IF EXISTS test.v1;
 CREATE TABLE t1 (f1 ENUM('A', 'B', 'C') NOT NULL, f2 INTEGER)
 ENGINE = myisam;
 INSERT INTO t1 VALUES ('A', 1);
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 A	1
 CREATE VIEW  v1 AS SELECT * FROM t1 WHERE f2 BETWEEN 1 AND 2
 WITH CASCADED CHECK OPTION ;
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	1
 UPDATE v1 SET f2 = 2 WHERE f2 = 1;
@@ -2014,7 +2027,7 @@ affected rows: 1
 info: Rows matched: 1  Changed: 1  Warnings: 0
 INSERT INTO v1 VALUES('B',2);
 affected rows: 1
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	2
 B	2
@@ -2022,7 +2035,7 @@ UPDATE v1 SET f2 = 4;
 ERROR HY000: CHECK OPTION failed 'test.v1'
 INSERT INTO v1 VALUES('B',3);
 ERROR HY000: CHECK OPTION failed 'test.v1'
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 f1	f2
 A	2
 B	2
@@ -10562,7 +10575,7 @@ f1	f2	f3	f4
 DELETE FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 1
+ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10631,7 +10644,7 @@ DROP VIEW v1;
 CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
 INSERT INTO v1 SET f2 = 'ABC';
 INSERT INTO v1 SET f2 = 'ABC';
-ERROR 23000: Duplicate entry '0' for key 1
+ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
 SELECT * from t1;
 f1	f2	f3	f4
 0	ABC	NULL	NULL
@@ -10966,11 +10979,11 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(5)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -10990,12 +11003,12 @@ f4x	char(5)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4x	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 CHANGE COLUMN f4x f4 CHAR(5);
 ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(10);
@@ -11013,14 +11026,14 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(10)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
 0	NULL	ABC	t1 1
 2	NULL	<-- 10 -->	t1 2
 2	NULL	<-- 10 -->	v1 2
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11049,7 +11062,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	char(8)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11058,7 +11071,7 @@ f1	f2	f4	report
 2	NULL	<-- 10 -	v1 2
 3	NULL	<-- 10 -	t1 3
 3	NULL	<-- 10 -	v1 3
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11082,7 +11095,7 @@ f1	bigint(20)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11093,7 +11106,7 @@ f1	f2	f4	report
 3	NULL	<-- 10 -	v1 3
 4	NULL	<------ 20 -------->	t1 4
 4	NULL	<------ 20 -------->	v1 4
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11121,7 +11134,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11134,7 +11147,7 @@ f1	f2	f4	report
 4	NULL	<------ 20 -------->	v1 4
 <------------- 30 ----------->	NULL	<------ 20 -------->	t1 5
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11158,7 +11171,7 @@ f4	varchar(20)	YES		NULL
 report	char(10)	YES		NULL	
 DESCRIBE v1;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report
 -1	ABC	t1 0
 -1	ABC	v1 0
@@ -11172,7 +11185,7 @@ f1	f4	report
 <------------- 30 ----------->	<------ 20 -------->	t1 5
 <------------- 30 ----------->	<------ 20 -------->	v1 5
 ABC	<------ 20 -------->	t1 6
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
 ALTER TABLE t1 ADD COLUMN f2 DATE DEFAULT NULL;
 INSERT INTO t1 SET f1 = 'ABC', f2 = '1500-12-04',
@@ -11191,7 +11204,7 @@ f1	varchar(30)	YES		NULL
 f2	date	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11207,7 +11220,7 @@ f1	f4	report	f2
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	1500-12-04
 ABC	<------ 20 -------->	v1 7	1500-12-04
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11241,7 +11254,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2
 -1	ABC	t1 0	NULL
 -1	ABC	v1 0	NULL
@@ -11256,10 +11269,10 @@ f1	f4	report	f2
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL
 ABC	<------ 20 -------->	t1 6	NULL
 ABC	<------ 20 -------->	t1 7	NULL
-ABC	<------ 20 -------->	v1 7	NULL
 ABC	<------ 20 -------->	t1 8	-0.00033
+ABC	<------ 20 -------->	v1 7	NULL
 ABC	<------ 20 -------->	v1 8	-0.00033
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11274,8 +11287,8 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	t1 8
+ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	v1 8
 ALTER TABLE t1 ADD COLUMN f3 NUMERIC(7,2);
 INSERT INTO t1 SET f1 = 'ABC', f2 = -3.3E-4,
@@ -11298,7 +11311,7 @@ f1	varchar(30)	YES		NULL
 f2	float	YES		NULL	
 f4	varchar(20)	YES		NULL	
 report	char(10)	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 f1	f4	report	f2	f3
 -1	ABC	t1 0	NULL	NULL
 -1	ABC	v1 0	NULL	NULL
@@ -11313,12 +11326,12 @@ f1	f4	report	f2	f3
 <------------- 30 ----------->	<------ 20 -------->	v1 5	NULL	NULL
 ABC	<------ 20 -------->	t1 6	NULL	NULL
 ABC	<------ 20 -------->	t1 7	NULL	NULL
-ABC	<------ 20 -------->	v1 7	NULL	NULL
 ABC	<------ 20 -------->	t1 8	-0.00033	NULL
-ABC	<------ 20 -------->	v1 8	-0.00033	NULL
 ABC	<------ 20 -------->	t1 9	-0.00033	-2.20
+ABC	<------ 20 -------->	v1 7	NULL	NULL
+ABC	<------ 20 -------->	v1 8	-0.00033	NULL
 ABC	<------ 20 -------->	v1 9a	-0.00033	NULL
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 f1	f2	f4	report
 -1	NULL	ABC	t1 0
 -1	NULL	ABC	v1 0
@@ -11333,10 +11346,10 @@ f1	f2	f4	report
 <------------- 30 ----------->	NULL	<------ 20 -------->	v1 5
 ABC	NULL	<------ 20 -------->	t1 6
 ABC	NULL	<------ 20 -------->	t1 7
-ABC	NULL	<------ 20 -------->	v1 7
 ABC	-0.00033	<------ 20 -------->	t1 8
-ABC	-0.00033	<------ 20 -------->	v1 8
 ABC	-0.00033	<------ 20 -------->	t1 9
+ABC	NULL	<------ 20 -------->	v1 7
+ABC	-0.00033	<------ 20 -------->	v1 8
 ABC	-0.00033	<------ 20 -------->	v1 9a
 DROP TABLE t1;
 DROP VIEW  v1;
@@ -11351,10 +11364,10 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 ABC	3
-SELECT * FROM v1;
+SELECT * FROM v1 order by 2;
 f1	my_sqrt
 ABC	1.7320508075689
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
@@ -11367,21 +11380,21 @@ DESCRIBE v1;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 f1	f2
 ABC	3
 ABC	DEF
-SELECT * FROM v1;
+SELECT * FROM v1 order by 2;
 f1	my_sqrt
-ABC	1.7320508075689
 ABC	0
+ABC	1.7320508075689
 SELECT SQRT('DEF');
 SQRT('DEF')
 0
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 CREATE VIEW v2 AS SELECT SQRT('DEF');
-SELECT * FROM v2;
+SELECT * FROM v2 order by 1;
 SQRT('DEF')
 0
 Warnings:
@@ -11391,27 +11404,27 @@ DESCRIBE v2;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES		NULL	
 my_sqrt	double	YES		NULL	
-SELECT * FROM v2;
+SELECT * FROM v2 order by 2;
 f1	my_sqrt
-ABC	1.7320508075689
 ABC	0
+ABC	1.7320508075689
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
 ABC	0
+ABC	1.73205080756888
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
index a8d52fee0b5..2efc5a83663 100755
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
@@ -209,7 +209,7 @@ BEGIN
     set @x = x;
     set @y = y;
     set @z = 234;
-    SELECT f1, f2 into @x, @y from t2 limit 1;
+    SELECT f1, f2 into @x, @y from t2 where f1='a`' and f2='a`' limit 1;
     SELECT @x, @y, @z, invar;
     BEGIN
       set @x = 2;
@@ -257,7 +257,7 @@ BEGIN
    declare x integer; declare y integer;
    set @x=x;
    set @y=y;
-   SELECT f4, f3 into @x, @y from t2 limit 1;
+   SELECT f4, f3 into @x, @y from t2 where f4=-5000 and f3='1000-01-01' limit 1;
    SELECT @x, @y;
 END//
 delimiter ;//
@@ -1271,7 +1271,8 @@ BEGIN
    declare f5_value char(20);
    declare f4_value integer;
    declare f6_value integer;
-   declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2 limit 3;
+   declare cur1 cursor for SELECT f1, f2, f4, f5, f6 from t2
+                where f4 >=-5000 order by f4 limit 3;
    open cur1;
    while proceed do
       SELECT count AS 'loop';
@@ -1368,7 +1369,7 @@ create table temp1( f0 char(20), f1 char(20), f2 char(20), f3 int, f4 char(20) )
 
 #Error: 1329 SQLSTATE: 02000 (ER_SP_FETCH_NO_DATA) Message: No data to FETCH
 
-SELECT f1, f2, f4, f5 from t2;
+SELECT f1, f2, f4, f5 from t2 order by f4;
 
 delimiter //;
 CREATE PROCEDURE sp1( )
@@ -1379,21 +1380,21 @@ BEGIN
    declare newf2 char(20);
    declare newf5 char(20);
    declare newf4 integer;
-   declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
-   declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 limit 5;
+   declare cur1 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
+   declare cur2 cursor for SELECT f1, f2, f4, f5 from t2 where f4 >= -5000 order by f4 limit 5;
    open cur1;
    open cur2;
    BEGIN
-      declare continue handler for sqlstate '02000' set count = 1;
+      declare continue handler for sqlstate '02000' set count=1;
       fetch cur1 into newf1, newf2, newf4, newf5;
       SELECT '-1-', count, newf1, newf2, newf4, newf5;
       insert into temp1 values ('cur1_out', newf1, newf2, newf4, newf5);
-      set count = 4;
+      set count= 4;
       BEGIN
-         while count > 0 do
+         while count> 0 do
             fetch cur1 into newf1, newf2, newf4, newf5;
             SELECT '-2-', count, newf1, newf2, newf4, newf5;
-            set count = count - 1;
+            set count = count- 1;
          END while;
          SELECT '-3-', count, newf1, newf2, newf4, newf4;
       END;
@@ -1453,8 +1454,10 @@ BEGIN
    declare i_newf12 char(20);
    declare i_newf13 date;
    declare i_newf14 integer;
-   declare cur1 cursor for SELECT f1, f2, f3, f4 from t2 limit 4;
-   declare cur2 cursor for SELECT f1, f2, f3, f4 from t2 limit 3;
+   declare cur1 cursor for SELECT f1, f2, f3, f4 from t2
+                where f4>=-5000 order by f4 limit 4;
+   declare cur2 cursor for SELECT f1, f2, f3, f4 from t2
+                where f4>=-5000 order by f4 limit 3;
    declare continue handler for sqlstate '02000' set proceed=0;
    open cur1;
    open cur2;
@@ -1486,8 +1489,10 @@ BEGIN
    DECLARE o_newf12 CHAR(20);
    DECLARE o_newf13 DATE;
    DECLARE o_newf14 INTEGER;
-   DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
-   DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2 LIMIT 5;
+   DECLARE cur1 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+                WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
+   DECLARE cur2 CURSOR FOR SELECT f1, f2, f3, f4 FROM t2
+                WHERE f4>=-5000 ORDER BY f4 LIMIT 5;
    DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET proceed=0;
    OPEN cur1;
    OPEN cur2;
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
index d7b0a370a82..e69a95a724e 100755
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
@@ -54,7 +54,7 @@ connect (user2_1, localhost, user_1, , db_storedproc);
 delimiter //;
 CREATE PROCEDURE sp31102 () SQL SECURITY INVOKER
 BEGIN
-   SELECT * FROM db_storedproc.t1 LIMIT 1;
+   SELECT * FROM db_storedproc.t1 WHERE f4=-5000 LIMIT 1;
 END//
 delimiter ;//
 
@@ -244,21 +244,21 @@ delimiter ;//
 
 CALL sp_ins_1();
 SELECT row_count();
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 
 CALL sp_ins_3();
 #FIXME: check is 1 correct here? I expect 3 for 3 inserted rows inside the procedure
 SELECT row_count();
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 
 CALL sp_upd();
 SELECT row_count();
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 
 #FIXME: check is 3 correct here?  I expect 7 for 4 inserted and then 3 updated rows inside the procedure
 CALL sp_ins_upd();
 SELECT row_count();
-SELECT * FROM temp;
+SELECT * FROM temp ORDER BY f4;
 
 # cleanup
 DROP PROCEDURE sp_ins_1;
diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
index b88410b83f4..49bd5b98401 100644
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
@@ -6,19 +6,16 @@ let $message= .
               .                         IMPORTANT NOTICE:
               .                         -----------------
               .
-              .  FIXME: The <engine>_storedproc.result files are still NOT CHECKED
-              .         for correctness!
+              .  FIXME: The .result files are still NOT CHECKED for correctness!
               .
               .  FIXME: Several tests are affected by known problems around DECIMAL
-              .  FIXME: and NUMERIC that needs to be checked again after WL#2984
+              .  FIXME: and NUMERIC that will be checked again after WL#2984 once
               .  FIXME: has been completed. Some of them are marked in the result.
               .
-              .  This .result file has been checked OK with Linux 5.0.23-bk,
-              .  ChangeSet@1.2211, 2006-06-28 10:11:43-07:00.
-              .
-              . This file has been saved although it might contain failures / wrong
-              . results to be able to detect _new_ differences in the behaviour.
-              . Hopefully the remaining checks can be made soon.
+              . Currently (Dec 06, 2005) this .result file is checked OK for Linux
+              . with 5.0.17-bk (ChangeSet@1.1975.1.2, 2005-12-05 18:33:48+01:00).
+              . Using the available Windows version 5.0.16 there are differences
+              . that can be ignored (e.g. WL#2984).
               .;
 --source include/show_msg80.inc
 
@@ -914,7 +911,7 @@ SELECT * from t1 where f2 = f1;
 #/t'ql/mysql-test
 #t]# t@localhost t
 
-#FIXME check this is OK:--error 1064
+--error 0,1064
 CREATE PROCEDURE function()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE function;
@@ -1015,7 +1012,7 @@ CREATE PROCEDURE collate()
 CREATE PROCEDURE column()
    SELECT * from t1 where f2=f1;
 
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE PROCEDURE columns()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE columns;
@@ -1192,7 +1189,7 @@ CREATE PROCEDURE false()
 CREATE PROCEDURE fetch()
    SELECT * from t1 where f2=f1;
 
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE PROCEDURE fields()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE fields;
@@ -1213,7 +1210,7 @@ CREATE PROCEDURE force()
 CREATE PROCEDURE foreign()
    SELECT * from t1 where f2=f1;
 
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE PROCEDURE found()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE found;
@@ -1226,7 +1223,7 @@ CREATE PROCEDURE from()
 CREATE PROCEDURE fulltext()
    SELECT * from t1 where f2=f1;
 
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE PROCEDURE goto()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE goto;
@@ -1495,7 +1492,7 @@ CREATE PROCEDURE precision()
 CREATE PROCEDURE primary()
    SELECT * from t1 where f2=f1;
 
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE PROCEDURE privileges()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE privileges;
@@ -1656,7 +1653,7 @@ CREATE PROCEDURE straight_join()
 CREATE PROCEDURE table()
    SELECT * from t1 where f2=f1;
 
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE PROCEDURE tables()
    SELECT * from t1 where f2=f1;
 DROP PROCEDURE tables;
@@ -1837,7 +1834,7 @@ CREATE FUNCTION char ascii not null(f1 char ascii not null) returns char ascii n
 CREATE FUNCTION tinytext(f1 tinytext) returns tinytext
     return f1;
 
-#FIXME check this is OK:--error 1064
+--error 1064
 CREATE FUNCTION text(f1 text) returns text
     return f1;
   DROP FUNCTION text;
@@ -10128,7 +10125,7 @@ DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
 delimiter //;
---error 1064
+#FIXME check this is OK:--error 1064
 CREATE PROCEDURE sp1()
 BEGIN
     declare precision char;
@@ -10430,7 +10427,7 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 
 delimiter //;
---error 1064
+#FIXME check this is OK:--error 1064
 CREATE PROCEDURE sp1()
 BEGIN
     declare soname char;
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc b/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
index 26a5dab3370..af94041d245 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_0102.inc
@@ -214,21 +214,29 @@ let $message= Testcase 3.5.1.7: - need to fix;
 	eval create table t1 (f1 int, f2 char(25),f3 int) engine=$engine_type;
 	CREATE TRIGGER trg5_1 BEFORE INSERT on test.t1 
 		for each row set new.f3 = '14';
+# In 5.0 names to long (more than 64 chars) were trimed without an error
+# In 5.1 an error is returned. So adding a call with the expected error 
+# and one with a shorter name to validate proper execution
+	--error 1059
 	CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ
 		BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
+	CREATE TRIGGER trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX
+		BEFORE UPDATE on test.t1 for each row set new.f3 = '42';
 
 	insert into t1 (f2) values ('insert 3.5.1.7');
 	select * from t1;
 	update t1 set f2='update 3.5.1.7';
 	select * from t1;
-	select trigger_name from information_schema.triggers;
+	select trigger_name from information_schema.triggers order by trigger_name;
 
 #Cleanup
 	--disable_warnings 
 	--error 0, 1360
 	drop trigger trg5_1;
-	# The above trigger should be dropped since the name was trimmed.
+	# In 5.1 the long name should generate an error that is to long
+	--error 1059
 	drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ;
+	drop trigger trg_abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWX;
 	drop table t1;
 
 #Section 3.5.1.8
@@ -385,10 +393,10 @@ let $message= Testcase 3.5.1.11:;
 	insert into trig_db2.t2 (f1,f2) values ('insert to db2 t2 from db1',3);
 	insert into trig_db3.t1 (f1,f2) values ('insert to db3 t1 from db1',4);
 	select @test_var1, @test_var2, @test_var3;
-	select * from t1;
+	select * from t1 order by f2;
 	select * from trig_db2.t2;
 	select * from trig_db3.t1;
-	select * from t1;
+	select * from t1 order by f2;
 	use test;
 
 #Cleanup
@@ -434,7 +442,7 @@ let $message= Testcase 3.5.2.1/2/3:;
 	create trigger trig_db2.trig2 before insert on trig_db2.t1 
 		for each row set @test_var3='trig2';
 	select trigger_schema, trigger_name, event_object_table
-		from information_schema.triggers;
+		from information_schema.triggers order by trigger_name;
 
 	set @test_var1= '', @test_var2= '', @test_var3= '';
 	insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_03.inc b/mysql-test/suite/funcs_1/triggers/triggers_03.inc
index 764fccec734..4821b47099a 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_03.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_03.inc
@@ -29,23 +29,23 @@ let $message= Testcase 3.5.3:;
 	set password for test_yesprivs@localhost = password('PWD');
 
 #Section 3.5.3.1 / 3.5.3.2
-# Test case: Ensure SUPER privilege is required to create a trigger
+# Test case: Ensure TRIGGER privilege is required to create a trigger
 #Section 3.5.3.3 / 3.5.3.4
-# Test case: Ensure that root always has the SUPER privilege.
+# Test case: Ensure that root always has the TRIGGER privilege.
 # OMR - No need to test this since SUPER priv is an existing one and not related
 #       or added for triggers (TP 2005-06-06)
 #Section 3.5.3.5 / 3.5.3.6
-# Test case: Ensure that the SUPER privilege is required to drop a trigger.
+# Test case: Ensure that the TRIGGER privilege is required to drop a trigger.
 let $message= Testcase 3.5.3.2/6:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
 	grant ALL  on *.* to test_noprivs@localhost;
-	revoke SUPER  on *.* from test_noprivs@localhost;
+	revoke TRIGGER on *.* from test_noprivs@localhost;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 # Adding the minimal priv to be able to set to the db
 	grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
@@ -63,14 +63,15 @@ let $message= Testcase 3.5.3.2:;
         select current_user;
 	use priv_db;
 
-	--error 1227
+# error 1227 is better, as it says, that not the privilege
+	--error 1142,1227
 	create trigger trg1_1 before INSERT on t1 for each row
 		set new.f1 = 'trig 3.5.3.2_1-no';
 
 	connection default;
 	use priv_db;
 	insert into t1 (f1) values ('insert 3.5.3.2-no');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 
 	connection yes_privs;
         select current_user;
@@ -83,29 +84,27 @@ let $message= Testcase 3.5.3.2:;
         select current_user;
 	use priv_db;
 
-        # Added following the fix to bug 5861
-	--error 1143
+        --error 1143
 	insert into t1 (f1) values ('insert 3.5.3.2-yes');
-	select f1 from t1;
-	grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
-let $message= note: once 15166 is fixed a similar case for SELECT needs to be added;
---source include/show_msg.inc
+	select f1 from t1 order by f1;
+
+        grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
+        insert into t1 (f1) values ('insert 3.5.3.2-yes');
+        select f1 from t1 order by f1;
 
-	insert into t1 (f1) values ('insert 3.5.3.2-yes');
-	select f1 from t1;
 let $message= Testcase 3.5.3.6:;
 --source include/show_msg.inc
 
 	connection no_privs;
 	use priv_db;
 
-	--error 1227
+	--error 1142,1227
 	drop trigger trg1_2;
 
 	connection default;
 	use priv_db;
 	insert into t1 (f1) values ('insert 3.5.3.6-yes');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 
 	connection yes_privs;
 	use priv_db;
@@ -115,7 +114,7 @@ let $message= Testcase 3.5.3.6:;
 	connection default;
 	use priv_db;
 	insert into t1 (f1) values ('insert 3.5.3.6-no');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 
 # Cleanup
 	--disable_warnings
@@ -144,7 +143,7 @@ let $message=Testcase 3.5.3.7a:;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER, UPDATE on *.* to test_yesprivs@localhost;
+	grant TRIGGER, UPDATE on *.* to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
@@ -156,7 +155,7 @@ let $message=Testcase 3.5.3.7a:;
 	select current_user;
 	use priv_db;
 	show grants;
-	select f1 from t1;
+	select f1 from t1 order by f1;
 
 let $message= Trigger create disabled - should fail - Bug 8884;
 --source include/show_msg.inc
@@ -166,7 +165,7 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1a');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 	--error 0, 1360
 	drop trigger trg4a_1;
 
@@ -179,14 +178,8 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 
-
-        # Added to bypass bug 15166
-let $message= SELECT priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant SELECT on *.* to test_yesprivs@localhost;
-
 	insert into t1 (f1) values ('insert 3.5.3.7-2b');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 
 # Cleanup
 	--disable_warnings
@@ -200,13 +193,13 @@ let $message= Testcase 3.5.3.7b:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant SUPER on *.* to test_noprivs;
+	grant TRIGGER on *.* to test_noprivs;
 	grant ALL  on priv_db.* to test_noprivs@localhost;
 	revoke UPDATE  on priv_db.* from test_noprivs@localhost;
 	show grants for test_noprivs;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 	grant UPDATE on priv_db.* to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
@@ -228,9 +221,9 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1b');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 	update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';
-	select f1 from t1;
+	select f1 from t1 order by f1;
 	--error 0, 1360
 	drop trigger trg4b_1;
 
@@ -242,15 +235,10 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 
-        # Added to bypass bug 15166
-let $message= SELECT priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant SELECT on priv_db.* to test_yesprivs@localhost;
-
 	insert into t1 (f1) values ('insert 3.5.3.7-2b');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 	update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';
-	select f1 from t1;
+	select f1 from t1 order by f1;
 # Cleanup
 	--disable_warnings
 	drop trigger trg4b_2;
@@ -263,13 +251,13 @@ let $message= Testcase 3.5.3.7c;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant SUPER on *.* to test_noprivs@localhost;
+	grant TRIGGER on *.* to test_noprivs@localhost;
 	grant ALL  on priv_db.t1 to test_noprivs@localhost;
 	revoke UPDATE  on priv_db.t1 from test_noprivs@localhost;
 	show grants for test_noprivs;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 	grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
@@ -291,7 +279,7 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1c');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 	--error 0, 1360
 	drop trigger trg4c_1;
 
@@ -303,13 +291,8 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 
-        # Added to bypass bug 15166
-let $message= SELECT priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant SELECT on priv_db.t1 to test_yesprivs@localhost;
-
 	insert into t1 (f1) values ('insert 3.5.3.7-2c');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 
 # Cleanup
 	--disable_warnings
@@ -325,13 +308,13 @@ let $message= Testcase 3.5.3.7d:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant SUPER on *.* to test_noprivs@localhost;
+	grant TRIGGER on *.* to test_noprivs@localhost;
 # There is no ALL privs on the column level
 	grant SELECT (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 	show grants for test_noprivs;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 	grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_noprivs;
 
@@ -352,7 +335,7 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 	insert into t1 (f1) values ('insert 3.5.3.7-1d');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 	--error 0, 1360
 	drop trigger trg4d_1;
 
@@ -364,13 +347,8 @@ let $message= Trigger create disabled - should fail - Bug 8884;
 
 	connection default;
 
-        # Added to bypass bug 15166
-let $message= SELECT priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
-
 	insert into t1 (f1) values ('insert 3.5.3.7-2d');
-	select f1 from t1;
+	select f1 from t1 order by f1;
 
 # Cleanup
 	--disable_warnings
@@ -394,7 +372,7 @@ let $message= Testcase 3.5.3.8a:;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER, SELECT on *.* to test_yesprivs@localhost;
+	grant TRIGGER, SELECT on *.* to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
 	--replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
@@ -433,11 +411,6 @@ let $message= Trigger create disabled - should fail - Bug 8887;
         set @test_var= 'before trig 3.5.3.8-2a';
 	select @test_var;
 
-        # Added to bypass bug 15166
-let $message= UPDATE priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant UPDATE on *.* to test_yesprivs@localhost;
-
 	insert into t1 (f1) values ('insert 3.5.3.8-2a');
 	select @test_var;
 
@@ -453,13 +426,13 @@ let $message= Testcase: 3.5.3.8b;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant SUPER on *.* to test_noprivs@localhost;
+	grant TRIGGER on *.* to test_noprivs@localhost;
 	grant ALL  on priv_db.* to test_noprivs@localhost;
 	revoke SELECT  on priv_db.* from test_noprivs@localhost;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 	grant SELECT on priv_db.* to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
@@ -499,11 +472,6 @@ let $message= Trigger create disabled - should fail - Bug 8887;
 	insert into t1 (f1) values ('insert 3.5.3.8-2b');
 	select @test_var;
 
-        # Added to bypass bug 15166
-let $message= UPDATE priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant UPDATE on priv_db.* to test_yesprivs@localhost;
-
 	update t1 set  f1= 'update 3.5.3.8-2b' where f1 = 'insert 3.5.3.8-2b';
 	select @test_var;
 # Cleanup
@@ -518,13 +486,13 @@ let $message= Testcase 3.5.3.8c:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant SUPER on *.* to test_noprivs@localhost;
+	grant TRIGGER on *.* to test_noprivs@localhost;
 	grant ALL  on priv_db.t1 to test_noprivs@localhost;
 	revoke SELECT  on priv_db.t1 from test_noprivs@localhost;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 	grant SELECT on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
 
@@ -560,11 +528,6 @@ let $message= Trigger create disabled - should fail - Bug 8887;
 	connection default;
         set @test_var='before trig 3.5.3.8-2c';
 
-        # Added to bypass bug 15166
-let $message= UPDATE priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant UPDATE on priv_db.t1 to test_yesprivs@localhost;
-
 	insert into t1 (f1) values ('insert 3.5.3.8-2c');
 	select @test_var;
 # Cleanup
@@ -579,13 +542,13 @@ let $message=Testcase: 3.5.3.8d:;
 --source include/show_msg.inc
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_noprivs@localhost;
-	grant SUPER on *.* to test_noprivs@localhost;
+	grant TRIGGER on *.* to test_noprivs@localhost;
 # There is no ALL prov on the column level
 	grant UPDATE (f1), INSERT (f1) on priv_db.t1 to test_noprivs@localhost;
 	show grants for test_noprivs@localhost;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 	grant SELECT (f1) on priv_db.t1 to test_yesprivs@localhost;
 	show grants for test_noprivs@localhost;
 
@@ -620,11 +583,6 @@ let $message= Trigger create disabled - should fail - Bug 8887;
 	connection default;
         set @test_var='before trig 3.5.3.8-2d';
 
-        # Added to bypass bug 15166
-let $message= UPDATE priv added to bypass bug 15166;
---source include/show_msg.inc
-	grant UPDATE (f1) on priv_db.t1 to test_yesprivs@localhost;
-
 	insert into t1 (f1) values ('insert 3.5.3.8-2d');
 	select @test_var;
 
@@ -650,7 +608,7 @@ let $message=Testcase: 3.5.3.x:;
         eval create table t2 (f2 int) engine= $engine_type;
 
 	revoke ALL PRIVILEGES, GRANT OPTION FROM test_yesprivs@localhost;
-	grant SUPER on *.* to test_yesprivs@localhost;
+	grant TRIGGER on *.* to test_yesprivs@localhost;
 	grant SELECT, UPDATE on priv_db.t1 to test_yesprivs@localhost;
 	grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 	show grants for test_yesprivs@localhost;
@@ -671,8 +629,8 @@ let $message=Testcase: 3.5.3.x:;
 	revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 	grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 	insert into t1 (f1) values (4);
-	select f1 from t1;
-	select f2 from t2;
+	select f1 from t1 order by f1;
+	select f2 from t2 order by f2;
 
 	connection yes_353x;
 	use priv_db;
@@ -687,8 +645,8 @@ let $message=Testcase: 3.5.3.x:;
 	revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 	grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 	insert into t1 (f1) values (2);
-	select f1 from t1;
-	select f2 from t2;
+	select f1 from t1 order by f1;
+	select f2 from t2 order by f2;
 
 	connection yes_353x;
 	use priv_db;
@@ -703,8 +661,8 @@ let $message=Testcase: 3.5.3.x:;
 	revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 	grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 	insert into t1 (f1) values (1);
-	select f1 from t1;
-	select f2 from t2;
+	select f1 from t1 order by f1;
+	select f2 from t2 order by f2;
         select @aaa;
 
 	connection yes_353x;
@@ -720,8 +678,8 @@ let $message=Testcase: 3.5.3.x:;
 	revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 	grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 	insert into t1 (f1) values (1);
-	select f1 from t1;
-	select f2 from t2;
+	select f1 from t1 order by f1;
+	select f2 from t2 order by f2;
 
 
 
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_0407.inc b/mysql-test/suite/funcs_1/triggers/triggers_0407.inc
index 15c94ada975..ccfeb1aec99 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_0407.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_0407.inc
@@ -51,14 +51,14 @@ let $message= Testcase 3.5.4.1:;
 	connection con1_general;
 	Use db_drop;
 	Insert into t1 values ('Insert error 3.5.4.1');
-	Select * from t1;
+	Select * from t1 order by f1;
 	connection con1_super;
 	drop trigger trg1;
 	select trigger_schema, trigger_name, event_object_table
-		from information_schema.triggers;
+		from information_schema.triggers order by trigger_name;
 	connection con1_general;
 	Insert into t1 values ('Insert no trigger 3.5.4.1');
-	Select * from t1;
+	Select * from t1 order by f1;
 
 #Cleanup
 	--disable_warnings 
@@ -294,7 +294,7 @@ let $message= Testcase 3.5.5.4:;
 	Select * from t2;
 	use dbtest_one;
 	Insert into dbtest_two.t2 values ('2nd Insert 3.5.5.4');
-	Select * from dbtest_two.t2;
+	Select * from dbtest_two.t2 order by f1;
 
 #Cleanup
 	connection con1_super;
@@ -535,7 +535,7 @@ let $message= Testcase 3.5.7.13/14:;
 	Create trigger trg9_1 BEFORE DELETE 
 		on tb3 for each row set @test_var=@test_var+1;
 
-	--error ER_NOT_SUPPORTED_YET 
+	--error ER_NOT_SUPPORTED_YET
 	Create trigger trg9_2 BEFORE DELETE 
 		on tb3 for each row set @test_var=@test_var+10;
 
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_08.inc b/mysql-test/suite/funcs_1/triggers/triggers_08.inc
index 300080e455d..4a7ea486248 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_08.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_08.inc
@@ -111,9 +111,10 @@ let $message= 3.5.8.4 - multiple SQL;
 	Insert into tb3 (f120, f122, f136, f144, f163) 
 		values ('1', 'Test 3.5.8.4', 222, 23456, 1.05);
 	Select f120, f122, f136, f144, f163 from tb3 where f122= 'Test 3.5.8.4';
-	select * from db_test.t1_i;
-	select * from db_test.t1_u;
-	select * from db_test.t1_d;
+# error in ndb
+	select * from db_test.t1_i order by i120;
+	select * from db_test.t1_u order by u120;
+	select * from db_test.t1_d order by d120;
 	select @test_var;
 
 
@@ -121,16 +122,22 @@ let $message= 3.5.8.4 - single SQL - insert;
 --source include/show_msg.inc
 # Trigger definition - single SQL Insert
 	connection con2_super;
+        delimiter //;
 	Create trigger trg2 BEFORE UPDATE on tb3 for each row
+        BEGIN
 		insert into db_test.t1_i 
 			values (new.f120, new.f136, new.f144, new.f163);
+        END//
+        delimiter ;//
 
 # Trigger exeution - single SQL Insert
 	connection con2_general;
+        Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
+        select * from db_test.t1_i order by i120;
 	update tb3 set f120='I', f122='Test 3.5.8.4-Single Insert'
 		 where f122='Test 3.5.8.4';
 	Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
-	select * from db_test.t1_i;
+	select * from db_test.t1_i order by i120;
 
 
 let $message= 3.5.8.4 - single SQL - update;
@@ -148,7 +155,7 @@ let $message= 3.5.8.4 - single SQL - update;
 	update tb3 set f120='U', f122='Test 3.5.8.4-Single Update'
 		 where f122='Test 3.5.8.4-Single Insert';
 	Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
-	select * from db_test.t1_u;
+	select * from db_test.t1_u order by u120;
 
 
 let $message= 3.5.8.3/4 - single SQL - delete;
@@ -167,7 +174,7 @@ let $message= 3.5.8.3/4 - single SQL - delete;
 		 where f122='Test 3.5.8.4-Single Update';
 #unlock tables;
 	Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
-	select * from db_test.t1_d;
+	select * from db_test.t1_d order by d120;
 
 
 let $message= 3.5.8.3/4 - single SQL - select;
@@ -228,16 +235,16 @@ let $message= Testcase 3.5.8.5 (IF):;
 	set @test_var='Empty', @test_var2=0;
 	Insert into tb3 (f120, f122, f136) values ('1', 'Test 3.5.8.5-if', 101);
 	select f120, f122, f136, @test_var, @test_var2 
-		from tb3 where f122 = 'Test 3.5.8.5-if';
+		from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 	Insert into tb3 (f120, f122, f136) values ('2', 'Test 3.5.8.5-if', 102);
 	select f120, f122, f136, @test_var, @test_var2 
-		from tb3 where f122 = 'Test 3.5.8.5-if';
+		from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 	Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 10);
 	select f120, f122, f136, @test_var, @test_var2 
-		from tb3 where f122 = 'Test 3.5.8.5-if';
+		from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 	Insert into tb3 (f120, f122, f136) values ('3', 'Test 3.5.8.5-if', 103);
 	select f120, f122, f136, @test_var, @test_var2 
-		from tb3 where f122 = 'Test 3.5.8.5-if';
+		from tb3 where f122 = 'Test 3.5.8.5-if' order by f136;
 
 	delimiter //;
 	--error 1064
@@ -313,28 +320,28 @@ let $message= Testcase 3.5.8.5-case:;
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('a', 'Test 3.5.8.5-case', 5, 7);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case';
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('b', 'Test 3.5.8.5-case', 71,16);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case';
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('c', 'Test 3.5.8.5-case', 80,1);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case';
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 	Insert into tb3 (f120, f122, f136) 
 		values ('d', 'Test 3.5.8.5-case', 152);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case';
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('e', 'Test 3.5.8.5-case', 200, 8);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case';
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 	--error 0, 1339
 	Insert into tb3 (f120, f122, f136, f144) 
 		values ('f', 'Test 3.5.8.5-case', 100, 8);
 	select f120, f122, f136, f144, @test_var 
-		from tb3 where f122 = 'Test 3.5.8.5-case';
+		from tb3 where f122 = 'Test 3.5.8.5-case' order by f120;
 
 	delimiter //;
 	--error 1064
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_09.inc b/mysql-test/suite/funcs_1/triggers/triggers_09.inc
index 4eaaf3e35e2..912c5f50b21 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_09.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_09.inc
@@ -85,7 +85,7 @@ let $message= Testcase 3.5.9.3:;
 		values ('Test 3.5.9.3', 7, 123.17);
 	Update tb3 Set f136=8 where f122='Test 3.5.9.3';
 
-	select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+	select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 	select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 		@tr_var_b4_136, @tr_var_b4_163;
 	select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
@@ -104,7 +104,7 @@ let $message= Testcase 3.5.9.3:;
 
 	delete from tb3 where f122='Test 3.5.9.3';
 
-	select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3';
+	select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
 	select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 		@tr_var_b4_136, @tr_var_b4_163;
 	select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
@@ -159,7 +159,7 @@ let $message= Testcase 3.5.9.4:;
 		values ('Test 3.5.9.4', 7, DEFAULT, 995.24);
 
 	select f118, f121, f122, f136, f151, f163 from tb3 
-		where f122 like 'Test 3.5.9.4%';
+		where f122 like 'Test 3.5.9.4%' order by f163;
 	select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 		@tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163;
 	select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
@@ -180,7 +180,7 @@ let $message= Testcase 3.5.9.4:;
 		 where f122='Test 3.5.9.4';
 
 	select f118, f121, f122, f136, f151, f163 from tb3 
-		where f122 like 'Test 3.5.9.4-trig';
+		where f122 like 'Test 3.5.9.4-trig' order by f163;
 	select  @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122, 
 		@tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163;
 	select  @tr_var_af_118, @tr_var_af_121, @tr_var_af_122, 
diff --git a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
index 534c4efaa86..1b7505260f7 100644
--- a/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
+++ b/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
@@ -48,7 +48,7 @@ let $message= Testcase 3.5.10.1/2/3:;
 	Insert into vw11 (f122, f151) values ('Test 3.5.10.1/2/3', 2);
 	Insert into vw11 (f122, f151) values ('Not in View', 3);
 	select f121, f122, f151, f163
-		from tb3 where f122 like 'Test 3.5.10.1/2/3%';
+		from tb3 where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 	select f121, f122, f151, f163 from vw11;
 	select f121, f122, f151, f163
 		from tb3 where f122 like 'Not in View';
@@ -56,7 +56,7 @@ let $message= Testcase 3.5.10.1/2/3:;
 #Section 3.5.10.2
 	Update vw11 set f163=1;
 	select f121, f122, f151, f163 from tb3
-		where f122 like 'Test 3.5.10.1/2/3%';
+		where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 	select f121, f122, f151, f163 from vw11;
 
 #Section 3.5.10.3
@@ -64,7 +64,7 @@ let $message= Testcase 3.5.10.1/2/3:;
 	Select @test_var as 'before delete';
 	delete from vw11 where f151=1;
 	select f121, f122, f151, f163 from tb3
-		where f122 like 'Test 3.5.10.1/2/3%';
+		where f122 like 'Test 3.5.10.1/2/3%' order by f151;
 	select f121, f122, f151, f163 from vw11;
 	Select @test_var as 'after delete';
 
@@ -98,7 +98,7 @@ let $message= Testcase 3.5.10.4:;
 	eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/t9.txt' into table tb_load;
 
 	select @counter as 'Rows Loaded After';
-	Select * from tb_load limit 10;
+	Select * from tb_load order by f1 limit 10;
 
 #Cleanup
 	--disable_warnings
@@ -233,7 +233,7 @@ let $message= Testcase y.y.y.2: Check for triggers starting triggers;
 #lock tables t1 write, t2_1 write, t2_2 write, t2_3 write, t2_4 write, t3 write;
 	insert into t1 values (1);
 #unlock tables;
-	select * from t3;
+	select * from t3 order by f1;
 
 #Cleanup
 	--disable_warnings
@@ -274,10 +274,10 @@ let $message= Testcase y.y.y.3: Circular trigger reference;
 	# OBN See bug 11896
 	--error 1442
 	insert into t1 values (1);
-	select * from t1;
-	select * from t2;
-	select * from t3;
-	select * from t4;
+	select * from t1 order by f1;
+	select * from t2 order by f2;
+	select * from t3 order by f3;
+	select * from t4 order by f4;
 
 #Cleanup
 	--disable_warnings
@@ -384,9 +384,9 @@ let $message= Testcase y.y.y.5: Roleback of nested trigger references;
 	--error 1264
 	insert into t1 values (1);
 	commit;
-	select * from t1;
-	select * from t2;
-	select * from t3;
+	select * from t1 order by f1;
+	select * from t2 order by f2;
+	select * from t3 order by f3;
 #unlock tables;
 #Cleanup
 	--disable_warnings
diff --git a/mysql-test/suite/funcs_1/views/func_view.inc b/mysql-test/suite/funcs_1/views/func_view.inc
index 4479db22e70..3bf9e96b332 100644
--- a/mysql-test/suite/funcs_1/views/func_view.inc
+++ b/mysql-test/suite/funcs_1/views/func_view.inc
@@ -3,7 +3,8 @@
 #  Functions within VIEWs                         #
 #                                                 #
 ###################################################
-# 14.09.2005 ML
+# 2006-12-08 ML   Maintenance + refinements
+# 2005-09-14 ML   Create this test
 
 let $message= ! Attention: The file with the expected results suffers from
 Bug#10713: mysqldump includes database in create view and referenced tables;
@@ -68,7 +69,7 @@ Bug#10713: mysqldump includes database in create view and referenced tables;
 #         But there will be a special messages within the protocol files.
 #         Example:
 #            "Attention: CAST --> SIGNED INTEGER
-#            The file with expected results suffers from Bug 5083 5913 9809";
+#            The file with expected results suffers from Bug 5913";
 #            means, the file with expected results contains result sets which
 #            are known to be wrong.
 #            "Attention: The last <whatever> failed" 
@@ -187,6 +188,7 @@ CREATE TABLE t1_modes
 --enable_query_log
 
 # The table to be used in the FROM parts of the SELECTs
+--replace_result $type <engine_to_be_tested>
 eval CREATE TABLE t1_values
 (
    id BIGINT AUTO_INCREMENT,
@@ -416,8 +418,8 @@ eval INSERT INTO t1_values SET select_id = @select_id,
             $col_type = -25;
 # SELECT * FROM t1_values;
 
-# 1.     Cast Functions and Operators
-# 1.1.   CAST
+# 1.    Cast Functions and Operators
+# 1.1   CAST
 #
 # Note(ML): I guess the CAST routines are used in many other functions.
 #           Therefore check also nearly all "ugly" variants like 
@@ -587,15 +589,10 @@ let $col_type= my_bigint;
 eval INSERT INTO t1_values SET select_id = @select_id,
             $col_type = 1758;
 let $col_type= my_double;
-let $message= some statements disabled because of
-Bug#12440: CAST(data type DOUBLE AS TIME) strange results;
---source include/show_msg80.inc
-if (0)
-{
+# Bug#12440: CAST(data type DOUBLE AS TIME) strange results;
 --source suite/funcs_1/views/fv_cast.inc
 eval INSERT INTO t1_values SET select_id = @select_id,
             $col_type = +1.758E+3;
-}
 let $col_type= my_datetime;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_date;
@@ -631,16 +628,11 @@ let $col_type= my_bigint;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_decimal;
 --source suite/funcs_1/views/fv_cast.inc
-let $message= some statements disabled because of
-Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian;
---source include/show_msg80.inc
-if (0)
-{
+# Bug#13349: CAST(1.0E+300 TO DECIMAL) returns wrong result + diff little/big endian;
 let $col_type= my_double;
 --source suite/funcs_1/views/fv_cast.inc
 eval INSERT INTO t1_values SET select_id = @select_id,
             $col_type = -0.33333333E+4;
-}
 let $col_type= my_datetime;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_date;
@@ -658,11 +650,8 @@ let $target_type= SIGNED INTEGER;
 #
 let $message= 
 "Attention: CAST --> SIGNED INTEGER
-            The file with expected results suffers from
-            Bug#5083 Big integer values are inserted as negative into 
-                     decimal/string columns
             Bug#5913 Traditional mode: BIGINT range not correctly delimited
-            Both have the status: To be fixed later";
+            Status: To be fixed later";
 --source include/show_msg80.inc
 let $col_type= my_char_30;
 --source suite/funcs_1/views/fv_cast.inc
@@ -676,14 +665,9 @@ let $col_type= my_bigint;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_decimal;
 --source suite/funcs_1/views/fv_cast.inc
-let $message= some statements disabled because of
-Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result;
---source include/show_msg80.inc
-if (0)
-{
+# Bug #13344: CAST(1E+300 TO signed int) on little endian CPU, wrong result;
 let $col_type= my_double;
 --source suite/funcs_1/views/fv_cast.inc
-}
 let $col_type= my_datetime;
 --source suite/funcs_1/views/fv_cast.inc
 let $col_type= my_date;
@@ -701,7 +685,7 @@ let $target_type= UNSIGNED INTEGER;
 #
 let $message= 
 "Attention: CAST --> UNSIGNED INTEGER
-            The file with expected results suffers from Bug 5083 5913 9809";
+            The file with expected results suffers from Bug 5913";
 --source include/show_msg80.inc
 let $col_type= my_char_30;
 --source suite/funcs_1/views/fv_cast.inc
@@ -716,10 +700,11 @@ let $col_type= my_bigint;
 let $col_type= my_decimal;
 --source suite/funcs_1/views/fv_cast.inc
 let $message= some statements disabled because of
-Bugs#8663: cant use bgint unsigned as input to cast;
+Bug#5913 Traditional mode: BIGINT range not correctly delimited;
 --source include/show_msg80.inc
 if (0)
 {
+# Bugs#8663: cant use bgint unsigned as input to cast
 let $col_type= my_double;
 --source suite/funcs_1/views/fv_cast.inc
 }
@@ -847,11 +832,6 @@ let $col_type= my_year;
 #           select if(isnull(`test`.`t1`.`f1`),_latin1'IS     NULL',
 #                  _latin1'IS NOT NULL'),...
 #
-let $message=
-"Attention: IF($col_type IS NULL, ...
-            The file with expected results suffers from 
-            Bug#11689. successful CREATE VIEW but SELECT on view fails.";
---source include/show_msg80.inc
 # Bug#11689 success on Create view .. IF(col1 IS NULL,...), col2 ; but SELECT fails
 let $col_type= my_char_30;
 --source suite/funcs_1/views/fv_if2.inc
@@ -1030,7 +1010,7 @@ eval SET @my_select =
 #
 let $message= 
 "Attention: LEFT(''AaBbCcDdEeFfGgHhIiJjÄäÜüÖö'', <numeric column>)
-            The file with expected results suffers from Bug 10963 11728"
+            The file with expected results suffers from Bug 10963"
             and the testcases with length = BIGINT or DOUBLE column are deactivated,
             because there are 32/64 Bit differences;
 --source include/show_msg80.inc
@@ -1084,8 +1064,10 @@ $col_type, id FROM t1_values';
 #            If the file doesn't exist or cannot be read ... ,
 #            the function returns NULL.
 # SELECT LOADFILE
+#        Prepare a file:
+SELECT 'äÄ@' INTO OUTFILE '../tmp/func_view.dat';
 eval SET @my_select = 
-'SELECT LOAD_FILE(''../log/current_test''), id FROM t1_values';
+'SELECT LOAD_FILE(''../tmp/func_view.dat''), id FROM t1_values';
 --source suite/funcs_1/views/fv1.inc
 
 
@@ -1309,14 +1291,13 @@ while ($select_id)
        --disable_query_log
        eval set @got_errno= $mysql_errno ;
        let $run0= `SELECT @got_errno = 0`;
-       let $print_warning= `SELECT @got_errno`;
-       if ($print_warning)
+       --enable_query_log
+       if (!$run0)
        {
-          SELECT 'Attention: The last CREATE VIEW failed ' AS ""
-           UNION
-          SELECT '' ;
+          --echo
+          --echo Attention: The last CREATE VIEW failed
+          --echo
        }
-       --enable_query_log
     }
 
     # FIXME           The loop over the modes will start here.
@@ -1330,21 +1311,17 @@ while ($select_id)
           --disable_result_log
        }
        eval $my_select
-            WHERE select_id = $select_id OR select_id IS NULL;
+            WHERE select_id = $select_id OR select_id IS NULL order by id;
        if ($run_no_result)
        {
           --enable_result_log
        }
-       --disable_query_log
-       eval set @got_errno= $mysql_errno ;
-       let $print_warning= `SELECT @got_errno`;
-       if ($print_warning)
+       if ($mysql_errno)
        {
-          SELECT 'Attention: The last SELECT on the base table failed' AS ""
-           UNION
-          SELECT '' ;
+          --echo
+          --echo Attention: The last SELECT on the base table failed
+          --echo
        }
-       --enable_query_log
     }
 
     # $run0 is 1, if CREATE VIEW was successful.
@@ -1353,16 +1330,12 @@ while ($select_id)
     {
        # Check the CREATE VIEW statement
        SHOW CREATE VIEW v1;
-       --disable_query_log
-       eval set @got_errno= $mysql_errno ;
-       let $print_warning= `SELECT @got_errno`;
-       if ($print_warning)
+       if ($mysql_errno)
        {
-          SELECT 'Attention: The last SHOW CREATE VIEW failed' AS ""
-           UNION
-          SELECT '' ;
+          --echo
+          --echo Attention: The last SHOW CREATE VIEW failed
+          --echo
        }
-       --enable_query_log
 
        # Maybe a Join is faster
        if ($run_no_result)
@@ -1371,21 +1344,17 @@ while ($select_id)
        }
        eval SELECT v1.* FROM v1
             WHERE v1.id IN (SELECT id FROM t1_values
-                            WHERE select_id = $select_id OR select_id IS NULL);
+                            WHERE select_id = $select_id OR select_id IS NULL) order by id;
        if ($run_no_result)
        {
           --enable_result_log
        }
-       --disable_query_log
-       eval set @got_errno= $mysql_errno ;
-       let $print_warning= `SELECT @got_errno`;
-       if ($print_warning)
+       if ($mysql_errno)
        {
-          SELECT 'Attention: The last SELECT from VIEW failed' AS ""
-           UNION
-          SELECT '' ;
+          --echo
+          --echo Attention: The last SELECT from VIEW failed
+          --echo
        }
-       --enable_query_log
 
        DROP VIEW v1;
     }
@@ -1394,11 +1363,11 @@ while ($select_id)
 
     # Produce two empty lines as separator between different SELECTS
     # to be tested.
-    --disable_query_log
-    SELECT '' AS "";
-    --enable_query_log
+    --echo
+    --echo
 
     dec $select_id ;
 }
 
 DROP TABLE t1_selects, t1_modes, t1_values;
+--exec rm $MYSQLTEST_VARDIR/tmp/func_view.dat
diff --git a/mysql-test/suite/funcs_1/views/views_master.inc b/mysql-test/suite/funcs_1/views/views_master.inc
index b06873af159..0e3371bdb18 100644
--- a/mysql-test/suite/funcs_1/views/views_master.inc
+++ b/mysql-test/suite/funcs_1/views/views_master.inc
@@ -1772,7 +1772,7 @@ SELECT * FROM v1 ORDER BY f1;
 --enable_info
 # 1.   The record to be inserted will be within the scope of the view.
 #      But there is already a record with the PRIMARY KEY f1 = 2 .
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO v1 VALUES(2,'two');
 # 2.   The record to be inserted will be within the scope of the view.
 #      There is no already existing record with the PRIMARY KEY f1 = 3 .
@@ -1789,7 +1789,7 @@ SELECT * FROM v1 ORDER BY f1;
 # 1.   The record to be updated is within the scope of the view
 #      and will stay inside the scope.
 #      But there is already a record with the PRIMARY KEY f1 = 2 .
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 UPDATE v1 SET f1 = 2 WHERE f1 = 3;
 # 2.   The record to be updated is within the scope of the view
 #      and will stay inside the scope.
@@ -1873,11 +1873,11 @@ DROP VIEW  IF EXISTS test.v1;
 eval CREATE TABLE t1 (f1 ENUM('A', 'B', 'C') NOT NULL, f2 INTEGER)
      ENGINE = $engine_type;
 INSERT INTO t1 VALUES ('A', 1);
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, f2;
 
 CREATE VIEW  v1 AS SELECT * FROM t1 WHERE f2 BETWEEN 1 AND 2
 WITH CASCADED CHECK OPTION ;
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 --enable_info
 # positive cases
 UPDATE v1 SET f2 = 2 WHERE f2 = 1;
@@ -1885,7 +1885,7 @@ INSERT INTO v1 VALUES('B',2);
 --disable_info
 # Bug#11771: View over InnoDB table, wrong result SELECT on VIEW,
 #            field->query_id wrong
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 # negative cases
 --enable_info
 --error 1369
@@ -1895,7 +1895,7 @@ INSERT INTO v1 VALUES('B',3);
 --disable_info
 # Bug#11771: View over InnoDB table, wrong result SELECT on VIEW,
 #            field->query_id wrong
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, f2;
 
 
 let $message= Testcase 3.3.1.49 ;
@@ -3287,7 +3287,7 @@ DELETE FROM t1;
 #           f1 gets the default 0, because we are in the native sql_mode
 INSERT INTO v1 SET f2 = 'ABC';
 #           f1 gets the default 0, but this value is already exists
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO v1 SET f2 = 'ABC';
 SELECT * from t1;
 DELETE FROM t1;
@@ -3375,7 +3375,7 @@ CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
 #           f1 gets the default 0, because we are in the native sql_mode
 INSERT INTO v1 SET f2 = 'ABC';
 #           f1 gets the default 0 and this value is already exists
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO v1 SET f2 = 'ABC';
 SELECT * from t1;
 DELETE FROM t1;
@@ -3838,8 +3838,8 @@ INSERT INTO v1 SET f1 = -1, f4 = 'ABC', report = 'v1 0';
 # 0. Initial state
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 1. Name of one base table column is altered
 ALTER TABLE t1 CHANGE COLUMN f4 f4x CHAR(5);
@@ -3854,9 +3854,9 @@ DESCRIBE t1;
 # Bug#12533 crash on DESCRIBE <view> after renaming base table column;
 --error 1356
 DESCRIBE v1;
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 --error 1356
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 ALTER TABLE t1 CHANGE COLUMN f4x f4 CHAR(5);
 #
 # 2. Length of one base table column is increased
@@ -3865,8 +3865,8 @@ INSERT INTO t1 SET f1 = 2, f4 = '<-- 10 -->', report = 't1 2';
 INSERT INTO v1 SET f1 = 2, f4 = '<-- 10 -->', report = 'v1 2';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 3. Length of one base table column is reduced
 ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(8);
@@ -3874,8 +3874,8 @@ INSERT INTO t1 SET f1 = 3, f4 = '<-- 10 -->', report = 't1 3';
 INSERT INTO v1 SET f1 = 3, f4 = '<-- 10 -->', report = 'v1 3';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 4. Type of one base table column is altered   string -> string
 ALTER TABLE t1 CHANGE COLUMN f4 f4 VARCHAR(20);
@@ -3883,8 +3883,8 @@ INSERT INTO t1 SET f1 = 4, f4 = '<------ 20 -------->', report = 't1 4';
 INSERT INTO v1 SET f1 = 4, f4 = '<------ 20 -------->', report = 'v1 4';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 5. Type of one base table column altered   numeric -> string 
 ALTER TABLE t1 CHANGE COLUMN f1 f1 VARCHAR(30);
@@ -3894,8 +3894,8 @@ INSERT INTO v1 SET f1 = '<------------- 30 ----------->',
                    f4 = '<------ 20 -------->', report = 'v1 5';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 6. DROP of one base table column
 ALTER TABLE t1 DROP COLUMN f2;
@@ -3905,9 +3905,9 @@ INSERT INTO v1 SET f1 = 'ABC', f4 = '<------ 20 -------->', report = 'v1 6';
 DESCRIBE t1;
 --error 1356
 DESCRIBE v1;
-SELECT * FROM t1;
+SELECT * FROM t1 order by f1, report;
 --error 1356
-SELECT * FROM v1;
+SELECT * FROM v1 order by f1, report;
 #
 # 7. Recreation of dropped base table column with the same data type like before
 ALTER TABLE t1 ADD COLUMN f2 DATE DEFAULT NULL;
@@ -3917,8 +3917,8 @@ INSERT INTO v1 SET f1 = 'ABC', f2 = '1500-12-04',
                    f4 = '<------ 20 -------->', report = 'v1 7';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 8. Recreation of dropped base table column with a different data type
 #    like before
@@ -3930,8 +3930,8 @@ INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
                    f4 = '<------ 20 -------->', report = 'v1 8';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 9. Add a column to the base table
 ALTER TABLE t1 ADD COLUMN f3 NUMERIC(7,2);
@@ -3944,8 +3944,8 @@ INSERT INTO v1 SET f1 = 'ABC', f2 = -3.3E-4,
                    f4 = '<------ 20 -------->', report = 'v1 9a';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, report;
+SELECT * FROM v1 order by f1, report;
 #
 # 10. VIEW with numeric function is "victim" of data type change
 DROP TABLE t1;
@@ -3955,32 +3955,32 @@ INSERT INTO t1   SET f1 = 'ABC', f2 = 3;
 CREATE VIEW v1 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, f2;
+SELECT * FROM v1 order by 2;
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
 INSERT INTO t1   SET f1 = 'ABC', f2 = 'DEF';
 DESCRIBE t1;
 DESCRIBE v1;
-SELECT * FROM t1;
-SELECT * FROM v1;
+SELECT * FROM t1 order by f1, f2;
+SELECT * FROM v1 order by 2;
 # Some statements for comparison
 # - the ugly SQRT('DEF) as constant
 SELECT SQRT('DEF');
 # - Will a VIEW based on the same definition show the same result ?
 CREATE VIEW v2 AS SELECT SQRT('DEF');
-SELECT * FROM v2;
+SELECT * FROM v2 order by 1;
 # - Will a VIEW v2 created after the base table column recreation show the same
 #   result set like v1 ?
 CREATE OR REPLACE VIEW v2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
 DESCRIBE v2;
-SELECT * FROM v2;
+SELECT * FROM v2 order by 2;
 # - What will be the content of base table created with AS SELECT ?
 CREATE TABLE t2 AS SELECT f1, SQRT(f2) my_sqrt FROM t1;
 if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 --enable_ps_protocol
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
@@ -3988,7 +3988,7 @@ if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 --enable_ps_protocol
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
@@ -3996,7 +3996,7 @@ if ($have_bug_11589)
 {
 --disable_ps_protocol
 }
-SELECT * FROM t2;
+SELECT * FROM t2 order by 2;
 --enable_ps_protocol
 #
 DROP TABLE t1;
author	unknown <joerg@debian.(none)>	2007-07-27 15:41:27 +0200
committer	unknown <joerg@debian.(none)>	2007-07-27 15:41:27 +0200
commit	39f3cda7c7fa75c0208d58495e42b5dc0cc6a061 (patch)
tree	751dc890f01720274fd385de97ca90d4167603ad /mysql-test/suite
parent	072db2f2e4f187dd06c6f637acadddedca00e940 (diff)
download	mariadb-git-39f3cda7c7fa75c0208d58495e42b5dc0cc6a061.tar.gz