Merge branch '10.3' into 10.4

1 files changed, 38 insertions, 38 deletions

diff --git a/mysql-test/suite/funcs_1/r/is_statistics.result b/mysql-test/suite/funcs_1/r/is_statistics.result
index ad9af516fde..09d5dcaa264 100644
--- a/mysql-test/suite/funcs_1/r/is_statistics.result
+++ b/mysql-test/suite/funcs_1/r/is_statistics.result
@@ -28,60 +28,60 @@ DROP FUNCTION test.f1;
 #########################################################################
 DESCRIBE          information_schema.STATISTICS;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-NON_UNIQUE	bigint(1)	NO		0	
-INDEX_SCHEMA	varchar(64)	NO			
-INDEX_NAME	varchar(64)	NO			
-SEQ_IN_INDEX	bigint(2)	NO		0	
-COLUMN_NAME	varchar(64)	NO			
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+NON_UNIQUE	bigint(1)	NO		NULL	
+INDEX_SCHEMA	varchar(64)	NO		NULL	
+INDEX_NAME	varchar(64)	NO		NULL	
+SEQ_IN_INDEX	bigint(2)	NO		NULL	
+COLUMN_NAME	varchar(64)	NO		NULL	
 COLLATION	varchar(1)	YES		NULL	
 CARDINALITY	bigint(21)	YES		NULL	
 SUB_PART	bigint(3)	YES		NULL	
 PACKED	varchar(10)	YES		NULL	
-NULLABLE	varchar(3)	NO			
-INDEX_TYPE	varchar(16)	NO			
+NULLABLE	varchar(3)	NO		NULL	
+INDEX_TYPE	varchar(16)	NO		NULL	
 COMMENT	varchar(16)	YES		NULL	
-INDEX_COMMENT	varchar(1024)	NO			
+INDEX_COMMENT	varchar(1024)	NO		NULL	
 SHOW CREATE TABLE information_schema.STATISTICS;
 Table	Create Table
 STATISTICS	CREATE TEMPORARY TABLE `STATISTICS` (
-  `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
-  `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,
-  `INDEX_COMMENT` varchar(1024) NOT NULL DEFAULT ''
+  `TABLE_CATALOG` varchar(512) NOT NULL,
+  `TABLE_SCHEMA` varchar(64) NOT NULL,
+  `TABLE_NAME` varchar(64) NOT NULL,
+  `NON_UNIQUE` bigint(1) NOT NULL,
+  `INDEX_SCHEMA` varchar(64) NOT NULL,
+  `INDEX_NAME` varchar(64) NOT NULL,
+  `SEQ_IN_INDEX` bigint(2) NOT NULL,
+  `COLUMN_NAME` varchar(64) NOT NULL,
+  `COLLATION` varchar(1),
+  `CARDINALITY` bigint(21),
+  `SUB_PART` bigint(3),
+  `PACKED` varchar(10),
+  `NULLABLE` varchar(3) NOT NULL,
+  `INDEX_TYPE` varchar(16) NOT NULL,
+  `COMMENT` varchar(16),
+  `INDEX_COMMENT` varchar(1024) NOT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 SHOW COLUMNS FROM information_schema.STATISTICS;
 Field	Type	Null	Key	Default	Extra
-TABLE_CATALOG	varchar(512)	NO			
-TABLE_SCHEMA	varchar(64)	NO			
-TABLE_NAME	varchar(64)	NO			
-NON_UNIQUE	bigint(1)	NO		0	
-INDEX_SCHEMA	varchar(64)	NO			
-INDEX_NAME	varchar(64)	NO			
-SEQ_IN_INDEX	bigint(2)	NO		0	
-COLUMN_NAME	varchar(64)	NO			
+TABLE_CATALOG	varchar(512)	NO		NULL	
+TABLE_SCHEMA	varchar(64)	NO		NULL	
+TABLE_NAME	varchar(64)	NO		NULL	
+NON_UNIQUE	bigint(1)	NO		NULL	
+INDEX_SCHEMA	varchar(64)	NO		NULL	
+INDEX_NAME	varchar(64)	NO		NULL	
+SEQ_IN_INDEX	bigint(2)	NO		NULL	
+COLUMN_NAME	varchar(64)	NO		NULL	
 COLLATION	varchar(1)	YES		NULL	
 CARDINALITY	bigint(21)	YES		NULL	
 SUB_PART	bigint(3)	YES		NULL	
 PACKED	varchar(10)	YES		NULL	
-NULLABLE	varchar(3)	NO			
-INDEX_TYPE	varchar(16)	NO			
+NULLABLE	varchar(3)	NO		NULL	
+INDEX_TYPE	varchar(16)	NO		NULL	
 COMMENT	varchar(16)	YES		NULL	
-INDEX_COMMENT	varchar(1024)	NO			
+INDEX_COMMENT	varchar(1024)	NO		NULL	
 SELECT table_catalog, table_schema, table_name, index_schema, index_name
 FROM information_schema.statistics WHERE table_catalog IS NOT NULL
 ORDER BY table_schema, table_name, index_schema, index_name;