MDEV-18918 SQL mode EMPTY_STRING_IS_NULL breaks RBR upon CREATE TABLE .. SELECT

The 10.5 version of the patch.

Removing DEFAULT from INFORMATION_SCHEMA columns.
DEFAULT in read-only tables is rather meaningless.
Upgrade should go smoothly.

Also fixes:
 MDEV-20254 Problems with EMPTY_STRING_IS_NULL and I_S tables

32 files changed, 266 insertions, 266 deletions

diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_page.result b/mysql-test/suite/innodb_i_s/innodb_buffer_page.result
index 9d4c43b1a8f..e19d4d696bc 100644
--- a/mysql-test/suite/innodb_i_s/innodb_buffer_page.result
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_page.result
@@ -1,26 +1,26 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE;
 Table	Create Table
 INNODB_BUFFER_PAGE	CREATE TEMPORARY TABLE `INNODB_BUFFER_PAGE` (
-  `POOL_ID` int(11) unsigned NOT NULL DEFAULT 0,
-  `BLOCK_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `SPACE` int(11) unsigned NOT NULL DEFAULT 0,
-  `PAGE_NUMBER` int(11) unsigned NOT NULL DEFAULT 0,
-  `PAGE_TYPE` varchar(64) DEFAULT NULL,
-  `FLUSH_TYPE` int(11) unsigned NOT NULL DEFAULT 0,
-  `FIX_COUNT` int(11) unsigned NOT NULL DEFAULT 0,
-  `IS_HASHED` int(1) NOT NULL DEFAULT 0,
-  `NEWEST_MODIFICATION` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `OLDEST_MODIFICATION` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `ACCESS_TIME` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `TABLE_NAME` varchar(1024) DEFAULT NULL,
-  `INDEX_NAME` varchar(64) DEFAULT NULL,
-  `NUMBER_RECORDS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `DATA_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `COMPRESSED_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
+  `POOL_ID` int(11) unsigned NOT NULL,
+  `BLOCK_ID` bigint(21) unsigned NOT NULL,
+  `SPACE` int(11) unsigned NOT NULL,
+  `PAGE_NUMBER` int(11) unsigned NOT NULL,
+  `PAGE_TYPE` varchar(64),
+  `FLUSH_TYPE` int(11) unsigned NOT NULL,
+  `FIX_COUNT` int(11) unsigned NOT NULL,
+  `IS_HASHED` int(1) NOT NULL,
+  `NEWEST_MODIFICATION` bigint(21) unsigned NOT NULL,
+  `OLDEST_MODIFICATION` bigint(21) unsigned NOT NULL,
+  `ACCESS_TIME` bigint(21) unsigned NOT NULL,
+  `TABLE_NAME` varchar(1024),
+  `INDEX_NAME` varchar(64),
+  `NUMBER_RECORDS` bigint(21) unsigned NOT NULL,
+  `DATA_SIZE` bigint(21) unsigned NOT NULL,
+  `COMPRESSED_SIZE` bigint(21) unsigned NOT NULL,
   `PAGE_STATE` enum('NOT_USED','MEMORY','REMOVE_HASH','FILE_PAGE') NOT NULL,
   `IO_FIX` enum('IO_NONE','IO_READ','IO_WRITE','IO_PIN') NOT NULL,
-  `IS_OLD` int(1) NOT NULL DEFAULT 0,
-  `FREE_PAGE_CLOCK` bigint(21) unsigned NOT NULL DEFAULT 0
+  `IS_OLD` int(1) NOT NULL,
+  `FREE_PAGE_CLOCK` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE;
 DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result b/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result
index 42d33fdbeac..6bc19319f9d 100644
--- a/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_page_lru.result
@@ -1,26 +1,26 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE_LRU;
 Table	Create Table
 INNODB_BUFFER_PAGE_LRU	CREATE TEMPORARY TABLE `INNODB_BUFFER_PAGE_LRU` (
-  `POOL_ID` int(11) unsigned NOT NULL DEFAULT 0,
-  `LRU_POSITION` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `SPACE` int(11) unsigned NOT NULL DEFAULT 0,
-  `PAGE_NUMBER` int(11) unsigned NOT NULL DEFAULT 0,
-  `PAGE_TYPE` varchar(64) DEFAULT NULL,
-  `FLUSH_TYPE` int(11) unsigned NOT NULL DEFAULT 0,
-  `FIX_COUNT` int(11) unsigned NOT NULL DEFAULT 0,
-  `IS_HASHED` int(1) NOT NULL DEFAULT 0,
-  `NEWEST_MODIFICATION` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `OLDEST_MODIFICATION` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `ACCESS_TIME` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `TABLE_NAME` varchar(1024) DEFAULT NULL,
-  `INDEX_NAME` varchar(64) DEFAULT NULL,
-  `NUMBER_RECORDS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `DATA_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `COMPRESSED_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `COMPRESSED` int(1) NOT NULL DEFAULT 0,
+  `POOL_ID` int(11) unsigned NOT NULL,
+  `LRU_POSITION` bigint(21) unsigned NOT NULL,
+  `SPACE` int(11) unsigned NOT NULL,
+  `PAGE_NUMBER` int(11) unsigned NOT NULL,
+  `PAGE_TYPE` varchar(64),
+  `FLUSH_TYPE` int(11) unsigned NOT NULL,
+  `FIX_COUNT` int(11) unsigned NOT NULL,
+  `IS_HASHED` int(1) NOT NULL,
+  `NEWEST_MODIFICATION` bigint(21) unsigned NOT NULL,
+  `OLDEST_MODIFICATION` bigint(21) unsigned NOT NULL,
+  `ACCESS_TIME` bigint(21) unsigned NOT NULL,
+  `TABLE_NAME` varchar(1024),
+  `INDEX_NAME` varchar(64),
+  `NUMBER_RECORDS` bigint(21) unsigned NOT NULL,
+  `DATA_SIZE` bigint(21) unsigned NOT NULL,
+  `COMPRESSED_SIZE` bigint(21) unsigned NOT NULL,
+  `COMPRESSED` int(1) NOT NULL,
   `IO_FIX` enum('IO_NONE','IO_READ','IO_WRITE','IO_PIN') NOT NULL,
-  `IS_OLD` int(1) DEFAULT NULL,
-  `FREE_PAGE_CLOCK` bigint(21) unsigned NOT NULL DEFAULT 0
+  `IS_OLD` int(1),
+  `FREE_PAGE_CLOCK` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_BUFFER_PAGE_LRU;
 DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result b/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result
index be5c31a6b57..55be76a9f07 100644
--- a/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result
+++ b/mysql-test/suite/innodb_i_s/innodb_buffer_pool_stats.result
@@ -1,36 +1,36 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_BUFFER_POOL_STATS;
 Table	Create Table
 INNODB_BUFFER_POOL_STATS	CREATE TEMPORARY TABLE `INNODB_BUFFER_POOL_STATS` (
-  `POOL_ID` int(11) unsigned NOT NULL DEFAULT 0,
-  `POOL_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `FREE_BUFFERS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `DATABASE_PAGES` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `OLD_DATABASE_PAGES` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `MODIFIED_DATABASE_PAGES` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PENDING_DECOMPRESS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PENDING_READS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PENDING_FLUSH_LRU` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PENDING_FLUSH_LIST` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PAGES_MADE_YOUNG` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PAGES_NOT_MADE_YOUNG` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PAGES_MADE_YOUNG_RATE` float NOT NULL DEFAULT 0,
-  `PAGES_MADE_NOT_YOUNG_RATE` float NOT NULL DEFAULT 0,
-  `NUMBER_PAGES_READ` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NUMBER_PAGES_CREATED` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NUMBER_PAGES_WRITTEN` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `PAGES_READ_RATE` float NOT NULL DEFAULT 0,
-  `PAGES_CREATE_RATE` float NOT NULL DEFAULT 0,
-  `PAGES_WRITTEN_RATE` float NOT NULL DEFAULT 0,
-  `NUMBER_PAGES_GET` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `HIT_RATE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `YOUNG_MAKE_PER_THOUSAND_GETS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NOT_YOUNG_MAKE_PER_THOUSAND_GETS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NUMBER_PAGES_READ_AHEAD` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NUMBER_READ_AHEAD_EVICTED` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `READ_AHEAD_RATE` float NOT NULL DEFAULT 0,
-  `READ_AHEAD_EVICTED_RATE` float NOT NULL DEFAULT 0,
-  `LRU_IO_TOTAL` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `LRU_IO_CURRENT` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `UNCOMPRESS_TOTAL` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `UNCOMPRESS_CURRENT` bigint(21) unsigned NOT NULL DEFAULT 0
+  `POOL_ID` int(11) unsigned NOT NULL,
+  `POOL_SIZE` bigint(21) unsigned NOT NULL,
+  `FREE_BUFFERS` bigint(21) unsigned NOT NULL,
+  `DATABASE_PAGES` bigint(21) unsigned NOT NULL,
+  `OLD_DATABASE_PAGES` bigint(21) unsigned NOT NULL,
+  `MODIFIED_DATABASE_PAGES` bigint(21) unsigned NOT NULL,
+  `PENDING_DECOMPRESS` bigint(21) unsigned NOT NULL,
+  `PENDING_READS` bigint(21) unsigned NOT NULL,
+  `PENDING_FLUSH_LRU` bigint(21) unsigned NOT NULL,
+  `PENDING_FLUSH_LIST` bigint(21) unsigned NOT NULL,
+  `PAGES_MADE_YOUNG` bigint(21) unsigned NOT NULL,
+  `PAGES_NOT_MADE_YOUNG` bigint(21) unsigned NOT NULL,
+  `PAGES_MADE_YOUNG_RATE` float NOT NULL,
+  `PAGES_MADE_NOT_YOUNG_RATE` float NOT NULL,
+  `NUMBER_PAGES_READ` bigint(21) unsigned NOT NULL,
+  `NUMBER_PAGES_CREATED` bigint(21) unsigned NOT NULL,
+  `NUMBER_PAGES_WRITTEN` bigint(21) unsigned NOT NULL,
+  `PAGES_READ_RATE` float NOT NULL,
+  `PAGES_CREATE_RATE` float NOT NULL,
+  `PAGES_WRITTEN_RATE` float NOT NULL,
+  `NUMBER_PAGES_GET` bigint(21) unsigned NOT NULL,
+  `HIT_RATE` bigint(21) unsigned NOT NULL,
+  `YOUNG_MAKE_PER_THOUSAND_GETS` bigint(21) unsigned NOT NULL,
+  `NOT_YOUNG_MAKE_PER_THOUSAND_GETS` bigint(21) unsigned NOT NULL,
+  `NUMBER_PAGES_READ_AHEAD` bigint(21) unsigned NOT NULL,
+  `NUMBER_READ_AHEAD_EVICTED` bigint(21) unsigned NOT NULL,
+  `READ_AHEAD_RATE` float NOT NULL,
+  `READ_AHEAD_EVICTED_RATE` float NOT NULL,
+  `LRU_IO_TOTAL` bigint(21) unsigned NOT NULL,
+  `LRU_IO_CURRENT` bigint(21) unsigned NOT NULL,
+  `UNCOMPRESS_TOTAL` bigint(21) unsigned NOT NULL,
+  `UNCOMPRESS_CURRENT` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp.result b/mysql-test/suite/innodb_i_s/innodb_cmp.result
index 47a92e42e59..a9f03234e5b 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmp.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp.result
@@ -1,10 +1,10 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP;
 Table	Create Table
 INNODB_CMP	CREATE TEMPORARY TABLE `INNODB_CMP` (
-  `page_size` int(5) NOT NULL DEFAULT 0,
-  `compress_ops` int(11) NOT NULL DEFAULT 0,
-  `compress_ops_ok` int(11) NOT NULL DEFAULT 0,
-  `compress_time` int(11) NOT NULL DEFAULT 0,
-  `uncompress_ops` int(11) NOT NULL DEFAULT 0,
-  `uncompress_time` int(11) NOT NULL DEFAULT 0
+  `page_size` int(5) NOT NULL,
+  `compress_ops` int(11) NOT NULL,
+  `compress_ops_ok` int(11) NOT NULL,
+  `compress_time` int(11) NOT NULL,
+  `uncompress_ops` int(11) NOT NULL,
+  `uncompress_time` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.result b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.result
index bcde9a2e9dd..a2a444f54ee 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index.result
@@ -1,12 +1,12 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP_PER_INDEX;
 Table	Create Table
 INNODB_CMP_PER_INDEX	CREATE TEMPORARY TABLE `INNODB_CMP_PER_INDEX` (
-  `database_name` varchar(64) NOT NULL DEFAULT '',
-  `table_name` varchar(64) NOT NULL DEFAULT '',
-  `index_name` varchar(64) NOT NULL DEFAULT '',
-  `compress_ops` int(11) NOT NULL DEFAULT 0,
-  `compress_ops_ok` int(11) NOT NULL DEFAULT 0,
-  `compress_time` int(11) NOT NULL DEFAULT 0,
-  `uncompress_ops` int(11) NOT NULL DEFAULT 0,
-  `uncompress_time` int(11) NOT NULL DEFAULT 0
+  `database_name` varchar(64) NOT NULL,
+  `table_name` varchar(64) NOT NULL,
+  `index_name` varchar(64) NOT NULL,
+  `compress_ops` int(11) NOT NULL,
+  `compress_ops_ok` int(11) NOT NULL,
+  `compress_time` int(11) NOT NULL,
+  `uncompress_ops` int(11) NOT NULL,
+  `uncompress_time` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.result b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.result
index 97ba44ec641..d8f9e1a05a7 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_per_index_reset.result
@@ -1,12 +1,12 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP_PER_INDEX_RESET;
 Table	Create Table
 INNODB_CMP_PER_INDEX_RESET	CREATE TEMPORARY TABLE `INNODB_CMP_PER_INDEX_RESET` (
-  `database_name` varchar(64) NOT NULL DEFAULT '',
-  `table_name` varchar(64) NOT NULL DEFAULT '',
-  `index_name` varchar(64) NOT NULL DEFAULT '',
-  `compress_ops` int(11) NOT NULL DEFAULT 0,
-  `compress_ops_ok` int(11) NOT NULL DEFAULT 0,
-  `compress_time` int(11) NOT NULL DEFAULT 0,
-  `uncompress_ops` int(11) NOT NULL DEFAULT 0,
-  `uncompress_time` int(11) NOT NULL DEFAULT 0
+  `database_name` varchar(64) NOT NULL,
+  `table_name` varchar(64) NOT NULL,
+  `index_name` varchar(64) NOT NULL,
+  `compress_ops` int(11) NOT NULL,
+  `compress_ops_ok` int(11) NOT NULL,
+  `compress_time` int(11) NOT NULL,
+  `uncompress_ops` int(11) NOT NULL,
+  `uncompress_time` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result b/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result
index 3d247f2cbc1..6557416fba8 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmp_reset.result
@@ -1,10 +1,10 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMP_RESET;
 Table	Create Table
 INNODB_CMP_RESET	CREATE TEMPORARY TABLE `INNODB_CMP_RESET` (
-  `page_size` int(5) NOT NULL DEFAULT 0,
-  `compress_ops` int(11) NOT NULL DEFAULT 0,
-  `compress_ops_ok` int(11) NOT NULL DEFAULT 0,
-  `compress_time` int(11) NOT NULL DEFAULT 0,
-  `uncompress_ops` int(11) NOT NULL DEFAULT 0,
-  `uncompress_time` int(11) NOT NULL DEFAULT 0
+  `page_size` int(5) NOT NULL,
+  `compress_ops` int(11) NOT NULL,
+  `compress_ops_ok` int(11) NOT NULL,
+  `compress_time` int(11) NOT NULL,
+  `uncompress_ops` int(11) NOT NULL,
+  `uncompress_time` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmpmem.result b/mysql-test/suite/innodb_i_s/innodb_cmpmem.result
index e1dd5d0a314..deceecda12f 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmpmem.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmpmem.result
@@ -1,10 +1,10 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMPMEM;
 Table	Create Table
 INNODB_CMPMEM	CREATE TEMPORARY TABLE `INNODB_CMPMEM` (
-  `page_size` int(5) NOT NULL DEFAULT 0,
-  `buffer_pool_instance` int(11) NOT NULL DEFAULT 0,
-  `pages_used` int(11) NOT NULL DEFAULT 0,
-  `pages_free` int(11) NOT NULL DEFAULT 0,
-  `relocation_ops` bigint(21) NOT NULL DEFAULT 0,
-  `relocation_time` int(11) NOT NULL DEFAULT 0
+  `page_size` int(5) NOT NULL,
+  `buffer_pool_instance` int(11) NOT NULL,
+  `pages_used` int(11) NOT NULL,
+  `pages_free` int(11) NOT NULL,
+  `relocation_ops` bigint(21) NOT NULL,
+  `relocation_time` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result b/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result
index 178cd244f9a..cf8b137f984 100644
--- a/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result
+++ b/mysql-test/suite/innodb_i_s/innodb_cmpmem_reset.result
@@ -1,10 +1,10 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_CMPMEM_RESET;
 Table	Create Table
 INNODB_CMPMEM_RESET	CREATE TEMPORARY TABLE `INNODB_CMPMEM_RESET` (
-  `page_size` int(5) NOT NULL DEFAULT 0,
-  `buffer_pool_instance` int(11) NOT NULL DEFAULT 0,
-  `pages_used` int(11) NOT NULL DEFAULT 0,
-  `pages_free` int(11) NOT NULL DEFAULT 0,
-  `relocation_ops` bigint(21) NOT NULL DEFAULT 0,
-  `relocation_time` int(11) NOT NULL DEFAULT 0
+  `page_size` int(5) NOT NULL,
+  `buffer_pool_instance` int(11) NOT NULL,
+  `pages_used` int(11) NOT NULL,
+  `pages_free` int(11) NOT NULL,
+  `relocation_ops` bigint(21) NOT NULL,
+  `relocation_time` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.result b/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.result
index 920ec782ac5..540f2426dc2 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_being_deleted.result
@@ -1,5 +1,5 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_BEING_DELETED;
 Table	Create Table
 INNODB_FT_BEING_DELETED	CREATE TEMPORARY TABLE `INNODB_FT_BEING_DELETED` (
-  `DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0
+  `DOC_ID` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_config.result b/mysql-test/suite/innodb_i_s/innodb_ft_config.result
index dcb11b1805c..3467791e8eb 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_config.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_config.result
@@ -1,6 +1,6 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_CONFIG;
 Table	Create Table
 INNODB_FT_CONFIG	CREATE TEMPORARY TABLE `INNODB_FT_CONFIG` (
-  `KEY` varchar(193) NOT NULL DEFAULT '',
-  `VALUE` varchar(193) NOT NULL DEFAULT ''
+  `KEY` varchar(193) NOT NULL,
+  `VALUE` varchar(193) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.result b/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.result
index c680665a256..5c8b695948c 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_default_stopword.result
@@ -1,5 +1,5 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_DEFAULT_STOPWORD;
 Table	Create Table
 INNODB_FT_DEFAULT_STOPWORD	CREATE TEMPORARY TABLE `INNODB_FT_DEFAULT_STOPWORD` (
-  `value` varchar(18) NOT NULL DEFAULT ''
+  `value` varchar(18) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result b/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result
index ab1a816eee8..e2dd8242b39 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_deleted.result
@@ -1,5 +1,5 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_DELETED;
 Table	Create Table
 INNODB_FT_DELETED	CREATE TEMPORARY TABLE `INNODB_FT_DELETED` (
-  `DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0
+  `DOC_ID` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.result b/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.result
index b95cb1ddf28..b65f0611459 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_index_cache.result
@@ -1,10 +1,10 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHE;
 Table	Create Table
 INNODB_FT_INDEX_CACHE	CREATE TEMPORARY TABLE `INNODB_FT_INDEX_CACHE` (
-  `WORD` varchar(337) NOT NULL DEFAULT '',
-  `FIRST_DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `LAST_DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `DOC_COUNT` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `POSITION` bigint(21) unsigned NOT NULL DEFAULT 0
+  `WORD` varchar(337) NOT NULL,
+  `FIRST_DOC_ID` bigint(21) unsigned NOT NULL,
+  `LAST_DOC_ID` bigint(21) unsigned NOT NULL,
+  `DOC_COUNT` bigint(21) unsigned NOT NULL,
+  `DOC_ID` bigint(21) unsigned NOT NULL,
+  `POSITION` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_ft_index_table.result b/mysql-test/suite/innodb_i_s/innodb_ft_index_table.result
index 0003e7d6741..805435a21e4 100644
--- a/mysql-test/suite/innodb_i_s/innodb_ft_index_table.result
+++ b/mysql-test/suite/innodb_i_s/innodb_ft_index_table.result
@@ -1,10 +1,10 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE;
 Table	Create Table
 INNODB_FT_INDEX_TABLE	CREATE TEMPORARY TABLE `INNODB_FT_INDEX_TABLE` (
-  `WORD` varchar(337) NOT NULL DEFAULT '',
-  `FIRST_DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `LAST_DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `DOC_COUNT` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `DOC_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `POSITION` bigint(21) unsigned NOT NULL DEFAULT 0
+  `WORD` varchar(337) NOT NULL,
+  `FIRST_DOC_ID` bigint(21) unsigned NOT NULL,
+  `LAST_DOC_ID` bigint(21) unsigned NOT NULL,
+  `DOC_COUNT` bigint(21) unsigned NOT NULL,
+  `DOC_ID` bigint(21) unsigned NOT NULL,
+  `POSITION` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_lock_waits.result b/mysql-test/suite/innodb_i_s/innodb_lock_waits.result
index 4142f142d3b..6332d99a5b9 100644
--- a/mysql-test/suite/innodb_i_s/innodb_lock_waits.result
+++ b/mysql-test/suite/innodb_i_s/innodb_lock_waits.result
@@ -1,8 +1,8 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_LOCK_WAITS;
 Table	Create Table
 INNODB_LOCK_WAITS	CREATE TEMPORARY TABLE `INNODB_LOCK_WAITS` (
-  `requesting_trx_id` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `requested_lock_id` varchar(81) NOT NULL DEFAULT '',
-  `blocking_trx_id` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `blocking_lock_id` varchar(81) NOT NULL DEFAULT ''
+  `requesting_trx_id` bigint(21) unsigned NOT NULL,
+  `requested_lock_id` varchar(81) NOT NULL,
+  `blocking_trx_id` bigint(21) unsigned NOT NULL,
+  `blocking_lock_id` varchar(81) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_locks.result b/mysql-test/suite/innodb_i_s/innodb_locks.result
index 6811a968869..83edf9e4f4d 100644
--- a/mysql-test/suite/innodb_i_s/innodb_locks.result
+++ b/mysql-test/suite/innodb_i_s/innodb_locks.result
@@ -1,16 +1,16 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_LOCKS;
 Table	Create Table
 INNODB_LOCKS	CREATE TEMPORARY TABLE `INNODB_LOCKS` (
-  `lock_id` varchar(81) NOT NULL DEFAULT '',
-  `lock_trx_id` bigint(21) unsigned NOT NULL DEFAULT 0,
+  `lock_id` varchar(81) NOT NULL,
+  `lock_trx_id` bigint(21) unsigned NOT NULL,
   `lock_mode` enum('S','S,GAP','X','X,GAP','IS','IS,GAP','IX','IX,GAP','AUTO_INC') NOT NULL,
   `lock_type` enum('RECORD','TABLE') NOT NULL,
-  `lock_table` varchar(1024) NOT NULL DEFAULT '',
-  `lock_index` varchar(1024) DEFAULT NULL,
-  `lock_space` int(11) unsigned DEFAULT NULL,
-  `lock_page` int(11) unsigned DEFAULT NULL,
-  `lock_rec` int(11) unsigned DEFAULT NULL,
-  `lock_data` varchar(8192) DEFAULT NULL
+  `lock_table` varchar(1024) NOT NULL,
+  `lock_index` varchar(1024),
+  `lock_space` int(11) unsigned,
+  `lock_page` int(11) unsigned,
+  `lock_rec` int(11) unsigned,
+  `lock_data` varchar(8192)
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_LOCKS;
 DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_metrics.result b/mysql-test/suite/innodb_i_s/innodb_metrics.result
index c6e0c7ac1d1..9df9cc73336 100644
--- a/mysql-test/suite/innodb_i_s/innodb_metrics.result
+++ b/mysql-test/suite/innodb_i_s/innodb_metrics.result
@@ -1,23 +1,23 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_METRICS;
 Table	Create Table
 INNODB_METRICS	CREATE TEMPORARY TABLE `INNODB_METRICS` (
-  `NAME` varchar(193) NOT NULL DEFAULT '',
-  `SUBSYSTEM` varchar(193) NOT NULL DEFAULT '',
-  `COUNT` bigint(21) NOT NULL DEFAULT 0,
-  `MAX_COUNT` bigint(21) DEFAULT NULL,
-  `MIN_COUNT` bigint(21) DEFAULT NULL,
-  `AVG_COUNT` float DEFAULT NULL,
-  `COUNT_RESET` bigint(21) NOT NULL DEFAULT 0,
-  `MAX_COUNT_RESET` bigint(21) DEFAULT NULL,
-  `MIN_COUNT_RESET` bigint(21) DEFAULT NULL,
-  `AVG_COUNT_RESET` float DEFAULT NULL,
-  `TIME_ENABLED` datetime DEFAULT NULL,
-  `TIME_DISABLED` datetime DEFAULT NULL,
-  `TIME_ELAPSED` bigint(21) DEFAULT NULL,
-  `TIME_RESET` datetime DEFAULT NULL,
-  `ENABLED` int(1) NOT NULL DEFAULT 0,
+  `NAME` varchar(193) NOT NULL,
+  `SUBSYSTEM` varchar(193) NOT NULL,
+  `COUNT` bigint(21) NOT NULL,
+  `MAX_COUNT` bigint(21),
+  `MIN_COUNT` bigint(21),
+  `AVG_COUNT` float,
+  `COUNT_RESET` bigint(21) NOT NULL,
+  `MAX_COUNT_RESET` bigint(21),
+  `MIN_COUNT_RESET` bigint(21),
+  `AVG_COUNT_RESET` float,
+  `TIME_ENABLED` datetime,
+  `TIME_DISABLED` datetime,
+  `TIME_ELAPSED` bigint(21),
+  `TIME_RESET` datetime,
+  `ENABLED` int(1) NOT NULL,
   `TYPE` enum('value','status_counter','set_owner','set_member','counter') NOT NULL,
-  `COMMENT` varchar(193) NOT NULL DEFAULT ''
+  `COMMENT` varchar(193) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_METRICS;
 DROP TEMPORARY TABLE t1;
diff --git a/mysql-test/suite/innodb_i_s/innodb_mutexes.result b/mysql-test/suite/innodb_i_s/innodb_mutexes.result
index e00b68d39fc..d40b677cafa 100644
--- a/mysql-test/suite/innodb_i_s/innodb_mutexes.result
+++ b/mysql-test/suite/innodb_i_s/innodb_mutexes.result
@@ -1,8 +1,8 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_MUTEXES;
 Table	Create Table
 INNODB_MUTEXES	CREATE TEMPORARY TABLE `INNODB_MUTEXES` (
-  `NAME` varchar(4000) NOT NULL DEFAULT '',
-  `CREATE_FILE` varchar(4000) NOT NULL DEFAULT '',
-  `CREATE_LINE` int(11) unsigned NOT NULL DEFAULT 0,
-  `OS_WAITS` bigint(21) unsigned NOT NULL DEFAULT 0
+  `NAME` varchar(4000) NOT NULL,
+  `CREATE_FILE` varchar(4000) NOT NULL,
+  `CREATE_LINE` int(11) unsigned NOT NULL,
+  `OS_WAITS` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_columns.result b/mysql-test/suite/innodb_i_s/innodb_sys_columns.result
index fbce9faac99..e36d1ac8a50 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_columns.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_columns.result
@@ -1,10 +1,10 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_COLUMNS;
 Table	Create Table
 INNODB_SYS_COLUMNS	CREATE TEMPORARY TABLE `INNODB_SYS_COLUMNS` (
-  `TABLE_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NAME` varchar(64) NOT NULL DEFAULT '',
-  `POS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `MTYPE` int(11) NOT NULL DEFAULT 0,
-  `PRTYPE` int(11) NOT NULL DEFAULT 0,
-  `LEN` int(11) NOT NULL DEFAULT 0
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(64) NOT NULL,
+  `POS` bigint(21) unsigned NOT NULL,
+  `MTYPE` int(11) NOT NULL,
+  `PRTYPE` int(11) NOT NULL,
+  `LEN` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.result b/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.result
index eb2dd8b71ad..ead31541098 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.result
@@ -1,6 +1,6 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_DATAFILES;
 Table	Create Table
 INNODB_SYS_DATAFILES	CREATE TEMPORARY TABLE `INNODB_SYS_DATAFILES` (
-  `SPACE` int(11) unsigned NOT NULL DEFAULT 0,
-  `PATH` varchar(4000) NOT NULL DEFAULT ''
+  `SPACE` int(11) unsigned NOT NULL,
+  `PATH` varchar(4000) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_fields.result b/mysql-test/suite/innodb_i_s/innodb_sys_fields.result
index 9c5437ff64e..26a242c8370 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_fields.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_fields.result
@@ -1,7 +1,7 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_FIELDS;
 Table	Create Table
 INNODB_SYS_FIELDS	CREATE TEMPORARY TABLE `INNODB_SYS_FIELDS` (
-  `INDEX_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NAME` varchar(64) NOT NULL DEFAULT '',
-  `POS` int(11) unsigned NOT NULL DEFAULT 0
+  `INDEX_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(64) NOT NULL,
+  `POS` int(11) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result b/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result
index 8dc7cbb2c53..d028b7487ef 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result
@@ -1,9 +1,9 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_FOREIGN;
 Table	Create Table
 INNODB_SYS_FOREIGN	CREATE TEMPORARY TABLE `INNODB_SYS_FOREIGN` (
-  `ID` varchar(193) NOT NULL DEFAULT '',
-  `FOR_NAME` varchar(193) NOT NULL DEFAULT '',
-  `REF_NAME` varchar(193) NOT NULL DEFAULT '',
-  `N_COLS` int(11) unsigned NOT NULL DEFAULT 0,
-  `TYPE` int(11) unsigned NOT NULL DEFAULT 0
+  `ID` varchar(193) NOT NULL,
+  `FOR_NAME` varchar(193) NOT NULL,
+  `REF_NAME` varchar(193) NOT NULL,
+  `N_COLS` int(11) unsigned NOT NULL,
+  `TYPE` int(11) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result b/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result
index 8f1134fb36d..a7a0e64a99c 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result
@@ -1,8 +1,8 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS;
 Table	Create Table
 INNODB_SYS_FOREIGN_COLS	CREATE TEMPORARY TABLE `INNODB_SYS_FOREIGN_COLS` (
-  `ID` varchar(193) NOT NULL DEFAULT '',
-  `FOR_COL_NAME` varchar(64) NOT NULL DEFAULT '',
-  `REF_COL_NAME` varchar(64) NOT NULL DEFAULT '',
-  `POS` int(11) unsigned NOT NULL DEFAULT 0
+  `ID` varchar(193) NOT NULL,
+  `FOR_COL_NAME` varchar(64) NOT NULL,
+  `REF_COL_NAME` varchar(64) NOT NULL,
+  `POS` int(11) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result b/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result
index 6e76ea887cc..01626717371 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result
@@ -1,12 +1,12 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_INDEXES;
 Table	Create Table
 INNODB_SYS_INDEXES	CREATE TEMPORARY TABLE `INNODB_SYS_INDEXES` (
-  `INDEX_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NAME` varchar(64) NOT NULL DEFAULT '',
-  `TABLE_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `TYPE` int(11) NOT NULL DEFAULT 0,
-  `N_FIELDS` int(11) NOT NULL DEFAULT 0,
-  `PAGE_NO` int(11) NOT NULL DEFAULT 0,
-  `SPACE` int(11) NOT NULL DEFAULT 0,
-  `MERGE_THRESHOLD` int(11) NOT NULL DEFAULT 0
+  `INDEX_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(64) NOT NULL,
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `TYPE` int(11) NOT NULL,
+  `N_FIELDS` int(11) NOT NULL,
+  `PAGE_NO` int(11) NOT NULL,
+  `SPACE` int(11) NOT NULL,
+  `MERGE_THRESHOLD` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.result b/mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.result
index ee1e3fade1e..05169366566 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.result
@@ -1,24 +1,24 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_SEMAPHORE_WAITS;
 Table	Create Table
 INNODB_SYS_SEMAPHORE_WAITS	CREATE TEMPORARY TABLE `INNODB_SYS_SEMAPHORE_WAITS` (
-  `THREAD_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `OBJECT_NAME` varchar(4000) DEFAULT NULL,
-  `FILE` varchar(4000) DEFAULT NULL,
-  `LINE` int(11) unsigned NOT NULL DEFAULT 0,
-  `WAIT_TIME` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `WAIT_OBJECT` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `WAIT_TYPE` varchar(16) DEFAULT NULL,
-  `HOLDER_THREAD_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `HOLDER_FILE` varchar(4000) DEFAULT NULL,
-  `HOLDER_LINE` int(11) unsigned NOT NULL DEFAULT 0,
-  `CREATED_FILE` varchar(4000) DEFAULT NULL,
-  `CREATED_LINE` int(11) unsigned NOT NULL DEFAULT 0,
-  `WRITER_THREAD` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `RESERVATION_MODE` varchar(16) DEFAULT NULL,
-  `READERS` int(11) unsigned NOT NULL DEFAULT 0,
-  `WAITERS_FLAG` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `LOCK_WORD` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `LAST_WRITER_FILE` varchar(4000) DEFAULT NULL,
-  `LAST_WRITER_LINE` int(11) unsigned NOT NULL DEFAULT 0,
-  `OS_WAIT_COUNT` int(11) unsigned NOT NULL DEFAULT 0
+  `THREAD_ID` bigint(21) unsigned NOT NULL,
+  `OBJECT_NAME` varchar(4000),
+  `FILE` varchar(4000),
+  `LINE` int(11) unsigned NOT NULL,
+  `WAIT_TIME` bigint(21) unsigned NOT NULL,
+  `WAIT_OBJECT` bigint(21) unsigned NOT NULL,
+  `WAIT_TYPE` varchar(16),
+  `HOLDER_THREAD_ID` bigint(21) unsigned NOT NULL,
+  `HOLDER_FILE` varchar(4000),
+  `HOLDER_LINE` int(11) unsigned NOT NULL,
+  `CREATED_FILE` varchar(4000),
+  `CREATED_LINE` int(11) unsigned NOT NULL,
+  `WRITER_THREAD` bigint(21) unsigned NOT NULL,
+  `RESERVATION_MODE` varchar(16),
+  `READERS` int(11) unsigned NOT NULL,
+  `WAITERS_FLAG` bigint(21) unsigned NOT NULL,
+  `LOCK_WORD` bigint(21) unsigned NOT NULL,
+  `LAST_WRITER_FILE` varchar(4000),
+  `LAST_WRITER_LINE` int(11) unsigned NOT NULL,
+  `OS_WAIT_COUNT` int(11) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tables.result b/mysql-test/suite/innodb_i_s/innodb_sys_tables.result
index 82c6c480587..4c476bff510 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_tables.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tables.result
@@ -1,12 +1,12 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_TABLES;
 Table	Create Table
 INNODB_SYS_TABLES	CREATE TEMPORARY TABLE `INNODB_SYS_TABLES` (
-  `TABLE_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NAME` varchar(655) NOT NULL DEFAULT '',
-  `FLAG` int(11) NOT NULL DEFAULT 0,
-  `N_COLS` int(11) unsigned NOT NULL DEFAULT 0,
-  `SPACE` int(11) unsigned NOT NULL DEFAULT 0,
-  `ROW_FORMAT` enum('Redundant','Compact','Compressed','Dynamic') DEFAULT NULL,
-  `ZIP_PAGE_SIZE` int(11) unsigned NOT NULL DEFAULT 0,
-  `SPACE_TYPE` enum('Single','System') DEFAULT NULL
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(655) NOT NULL,
+  `FLAG` int(11) NOT NULL,
+  `N_COLS` int(11) unsigned NOT NULL,
+  `SPACE` int(11) unsigned NOT NULL,
+  `ROW_FORMAT` enum('Redundant','Compact','Compressed','Dynamic'),
+  `ZIP_PAGE_SIZE` int(11) unsigned NOT NULL,
+  `SPACE_TYPE` enum('Single','System')
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result
index 40e337f49f3..1a5cba030d4 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.result
@@ -1,13 +1,13 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES;
 Table	Create Table
 INNODB_SYS_TABLESPACES	CREATE TEMPORARY TABLE `INNODB_SYS_TABLESPACES` (
-  `SPACE` int(11) unsigned NOT NULL DEFAULT 0,
-  `NAME` varchar(655) NOT NULL DEFAULT '',
-  `FLAG` int(11) unsigned NOT NULL DEFAULT 0,
-  `ROW_FORMAT` varchar(22) DEFAULT NULL,
-  `PAGE_SIZE` int(11) unsigned NOT NULL DEFAULT 0,
-  `ZIP_PAGE_SIZE` int(11) unsigned NOT NULL DEFAULT 0,
-  `FS_BLOCK_SIZE` int(11) unsigned NOT NULL DEFAULT 0,
-  `FILE_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `ALLOCATED_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0
+  `SPACE` int(11) unsigned NOT NULL,
+  `NAME` varchar(655) NOT NULL,
+  `FLAG` int(11) unsigned NOT NULL,
+  `ROW_FORMAT` varchar(22),
+  `PAGE_SIZE` int(11) unsigned NOT NULL,
+  `ZIP_PAGE_SIZE` int(11) unsigned NOT NULL,
+  `FS_BLOCK_SIZE` int(11) unsigned NOT NULL,
+  `FILE_SIZE` bigint(21) unsigned NOT NULL,
+  `ALLOCATED_SIZE` bigint(21) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result b/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result
index ccc8a034e00..dbbce4961fc 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_tablestats.result
@@ -1,13 +1,13 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS;
 Table	Create Table
 INNODB_SYS_TABLESTATS	CREATE TEMPORARY TABLE `INNODB_SYS_TABLESTATS` (
-  `TABLE_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `NAME` varchar(64) NOT NULL DEFAULT '',
-  `STATS_INITIALIZED` int(1) NOT NULL DEFAULT 0,
-  `NUM_ROWS` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `CLUST_INDEX_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `OTHER_INDEX_SIZE` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `MODIFIED_COUNTER` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `AUTOINC` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `REF_COUNT` int(11) NOT NULL DEFAULT 0
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `NAME` varchar(64) NOT NULL,
+  `STATS_INITIALIZED` int(1) NOT NULL,
+  `NUM_ROWS` bigint(21) unsigned NOT NULL,
+  `CLUST_INDEX_SIZE` bigint(21) unsigned NOT NULL,
+  `OTHER_INDEX_SIZE` bigint(21) unsigned NOT NULL,
+  `MODIFIED_COUNTER` bigint(21) unsigned NOT NULL,
+  `AUTOINC` bigint(21) unsigned NOT NULL,
+  `REF_COUNT` int(11) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result b/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result
index 0d324a13bc6..67a24b95e05 100644
--- a/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result
+++ b/mysql-test/suite/innodb_i_s/innodb_sys_virtual.result
@@ -1,7 +1,7 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_SYS_VIRTUAL;
 Table	Create Table
 INNODB_SYS_VIRTUAL	CREATE TEMPORARY TABLE `INNODB_SYS_VIRTUAL` (
-  `TABLE_ID` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `POS` int(11) unsigned NOT NULL DEFAULT 0,
-  `BASE_POS` int(11) unsigned NOT NULL DEFAULT 0
+  `TABLE_ID` bigint(21) unsigned NOT NULL,
+  `POS` int(11) unsigned NOT NULL,
+  `BASE_POS` int(11) unsigned NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result b/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result
index e824366632a..35f334362ae 100644
--- a/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result
+++ b/mysql-test/suite/innodb_i_s/innodb_tablespaces_encryption.result
@@ -1,14 +1,14 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION;
 Table	Create Table
 INNODB_TABLESPACES_ENCRYPTION	CREATE TEMPORARY TABLE `INNODB_TABLESPACES_ENCRYPTION` (
-  `SPACE` int(11) unsigned NOT NULL DEFAULT 0,
-  `NAME` varchar(655) DEFAULT NULL,
-  `ENCRYPTION_SCHEME` int(11) unsigned NOT NULL DEFAULT 0,
-  `KEYSERVER_REQUESTS` int(11) unsigned NOT NULL DEFAULT 0,
-  `MIN_KEY_VERSION` int(11) unsigned NOT NULL DEFAULT 0,
-  `CURRENT_KEY_VERSION` int(11) unsigned NOT NULL DEFAULT 0,
-  `KEY_ROTATION_PAGE_NUMBER` bigint(21) unsigned DEFAULT NULL,
-  `KEY_ROTATION_MAX_PAGE_NUMBER` bigint(21) unsigned DEFAULT NULL,
-  `CURRENT_KEY_ID` int(11) unsigned NOT NULL DEFAULT 0,
-  `ROTATING_OR_FLUSHING` int(1) NOT NULL DEFAULT 0
+  `SPACE` int(11) unsigned NOT NULL,
+  `NAME` varchar(655),
+  `ENCRYPTION_SCHEME` int(11) unsigned NOT NULL,
+  `KEYSERVER_REQUESTS` int(11) unsigned NOT NULL,
+  `MIN_KEY_VERSION` int(11) unsigned NOT NULL,
+  `CURRENT_KEY_VERSION` int(11) unsigned NOT NULL,
+  `KEY_ROTATION_PAGE_NUMBER` bigint(21) unsigned,
+  `KEY_ROTATION_MAX_PAGE_NUMBER` bigint(21) unsigned,
+  `CURRENT_KEY_ID` int(11) unsigned NOT NULL,
+  `ROTATING_OR_FLUSHING` int(1) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
diff --git a/mysql-test/suite/innodb_i_s/innodb_trx.result b/mysql-test/suite/innodb_i_s/innodb_trx.result
index 297899650c2..b9e0b05297d 100644
--- a/mysql-test/suite/innodb_i_s/innodb_trx.result
+++ b/mysql-test/suite/innodb_i_s/innodb_trx.result
@@ -1,28 +1,28 @@
 SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_TRX;
 Table	Create Table
 INNODB_TRX	CREATE TEMPORARY TABLE `INNODB_TRX` (
-  `trx_id` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_state` varchar(13) NOT NULL DEFAULT '',
-  `trx_started` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `trx_requested_lock_id` varchar(81) DEFAULT NULL,
-  `trx_wait_started` datetime DEFAULT NULL,
-  `trx_weight` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_mysql_thread_id` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_query` varchar(1024) DEFAULT NULL,
-  `trx_operation_state` varchar(64) DEFAULT NULL,
-  `trx_tables_in_use` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_tables_locked` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_lock_structs` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_lock_memory_bytes` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_rows_locked` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_rows_modified` bigint(21) unsigned NOT NULL DEFAULT 0,
-  `trx_concurrency_tickets` bigint(21) unsigned NOT NULL DEFAULT 0,
+  `trx_id` bigint(21) unsigned NOT NULL,
+  `trx_state` varchar(13) NOT NULL,
+  `trx_started` datetime NOT NULL,
+  `trx_requested_lock_id` varchar(81),
+  `trx_wait_started` datetime,
+  `trx_weight` bigint(21) unsigned NOT NULL,
+  `trx_mysql_thread_id` bigint(21) unsigned NOT NULL,
+  `trx_query` varchar(1024),
+  `trx_operation_state` varchar(64),
+  `trx_tables_in_use` bigint(21) unsigned NOT NULL,
+  `trx_tables_locked` bigint(21) unsigned NOT NULL,
+  `trx_lock_structs` bigint(21) unsigned NOT NULL,
+  `trx_lock_memory_bytes` bigint(21) unsigned NOT NULL,
+  `trx_rows_locked` bigint(21) unsigned NOT NULL,
+  `trx_rows_modified` bigint(21) unsigned NOT NULL,
+  `trx_concurrency_tickets` bigint(21) unsigned NOT NULL,
   `trx_isolation_level` enum('READ UNCOMMITTED','READ COMMITTED','REPEATABLE READ','SERIALIZABLE') NOT NULL,
-  `trx_unique_checks` int(1) NOT NULL DEFAULT 0,
-  `trx_foreign_key_checks` int(1) NOT NULL DEFAULT 0,
-  `trx_last_foreign_key_error` varchar(256) DEFAULT NULL,
-  `trx_is_read_only` int(1) NOT NULL DEFAULT 0,
-  `trx_autocommit_non_locking` int(1) NOT NULL DEFAULT 0
+  `trx_unique_checks` int(1) NOT NULL,
+  `trx_foreign_key_checks` int(1) NOT NULL,
+  `trx_last_foreign_key_error` varchar(256),
+  `trx_is_read_only` int(1) NOT NULL,
+  `trx_autocommit_non_locking` int(1) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_TRX;
 DROP TEMPORARY TABLE t1;