Part of MDEV-10134 Add full support for DEFAULT

Print default values for BLOB's.
This is a part commit for automatic changes to make the real commit smaller.
All changes here are related to that we now print DEFAULT NULL for blob and
text fields, like we do for all other fields.

mysql-test/r/alter_table.result

@@ -393,15 +393,15 @@ default charset latin1 collate latin1_general_cs;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `myblob` longblob,
+  `myblob` longblob DEFAULT NULL,
-  `mytext` longtext COLLATE latin1_general_cs
+  `mytext` longtext COLLATE latin1_general_cs DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs
 alter table t1 character set latin2;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `myblob` longblob,
+  `myblob` longblob DEFAULT NULL,
-  `mytext` longtext CHARACTER SET latin1 COLLATE latin1_general_cs
+  `mytext` longtext CHARACTER SET latin1 COLLATE latin1_general_cs DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin2
 drop table t1;
 CREATE TABLE t1 (a int PRIMARY KEY, b INT UNIQUE);
@@ -900,7 +900,7 @@ alter table t1 convert to character set utf8;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` text
+  `a` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 drop table t1;
 create table t1 (a mediumtext character set latin1);
@@ -908,7 +908,7 @@ alter table t1 convert to character set utf8;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` longtext
+  `a` longtext DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 drop table t1;
 End of 5.0 tests

mysql-test/r/create.result

@@ -1140,7 +1140,7 @@ t1	CREATE TABLE `t1` (
   `COMMAND` varchar(16) NOT NULL DEFAULT '',
   `TIME` int(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext,
+  `INFO` longtext DEFAULT NULL,
   `TIME_MS` decimal(22,3) NOT NULL DEFAULT '0.000',
   `STAGE` tinyint(2) NOT NULL DEFAULT '0',
   `MAX_STAGE` tinyint(2) NOT NULL DEFAULT '0',
@@ -1148,7 +1148,7 @@ t1	CREATE TABLE `t1` (
   `MEMORY_USED` bigint(7) NOT NULL DEFAULT '0',
   `EXAMINED_ROWS` int(7) NOT NULL DEFAULT '0',
   `QUERY_ID` bigint(4) NOT NULL DEFAULT '0',
-  `INFO_BINARY` blob,
+  `INFO_BINARY` blob DEFAULT NULL,
   `TID` bigint(4) NOT NULL DEFAULT '0'
 )  DEFAULT CHARSET=utf8
 drop table t1;
@@ -1163,7 +1163,7 @@ t1	CREATE TEMPORARY TABLE `t1` (
   `COMMAND` varchar(16) NOT NULL DEFAULT '',
   `TIME` int(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext,
+  `INFO` longtext DEFAULT NULL,
   `TIME_MS` decimal(22,3) NOT NULL DEFAULT '0.000',
   `STAGE` tinyint(2) NOT NULL DEFAULT '0',
   `MAX_STAGE` tinyint(2) NOT NULL DEFAULT '0',
@@ -1171,7 +1171,7 @@ t1	CREATE TEMPORARY TABLE `t1` (
   `MEMORY_USED` bigint(7) NOT NULL DEFAULT '0',
   `EXAMINED_ROWS` int(7) NOT NULL DEFAULT '0',
   `QUERY_ID` bigint(4) NOT NULL DEFAULT '0',
-  `INFO_BINARY` blob,
+  `INFO_BINARY` blob DEFAULT NULL,
   `TID` bigint(4) NOT NULL DEFAULT '0'
 )  DEFAULT CHARSET=utf8
 drop table t1;
@@ -1870,7 +1870,7 @@ t1	CREATE TABLE `t1` (
   `cl` char(32) AS (COLUMN_GET(COLUMN_ADD(COLUMN_CREATE(1 , 'blue' as char), 2, 'ttt'), i as char)) PERSISTENT,
   `item_name` varchar(32) NOT NULL,
   `i` int(11) DEFAULT NULL,
-  `dynamic_cols` blob,
+  `dynamic_cols` blob DEFAULT NULL,
   PRIMARY KEY (`item_name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;

mysql-test/r/ctype_binary.result

@@ -658,7 +658,7 @@ create table t1 as select group_concat(1,2,3) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` blob
+  `c1` blob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select 1 as c1 union select 'a';
@@ -1264,7 +1264,7 @@ create table t1 as select concat(AsText(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(period_add(200902, 2)));

mysql-test/r/ctype_cp1251.result

@@ -1067,7 +1067,7 @@ create table t1 as select group_concat(1,2,3) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` text CHARACTER SET cp1251
+  `c1` text CHARACTER SET cp1251 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select 1 as c1 union select 'a';
@@ -1673,7 +1673,7 @@ create table t1 as select concat(AsText(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longtext CHARACTER SET cp1251
+  `c1` longtext CHARACTER SET cp1251 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(period_add(200902, 2)));

mysql-test/r/ctype_latin1.result

@@ -1364,7 +1364,7 @@ create table t1 as select group_concat(1,2,3) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` text
+  `c1` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select 1 as c1 union select 'a';
@@ -1970,7 +1970,7 @@ create table t1 as select concat(AsText(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longtext
+  `c1` longtext DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(period_add(200902, 2)));

mysql-test/r/ctype_recoding.result

@@ -30,7 +30,7 @@ CREATE TABLE t2 (a TEXT CHARACTER SET utf8);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` text CHARACTER SET cp1251
+  `a` text CHARACTER SET cp1251 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT HEX(a) FROM t1;
 HEX(a)

mysql-test/r/ctype_tis620.result

@@ -121,7 +121,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `recid` int(11) NOT NULL AUTO_INCREMENT,
-  `dyninfo` text,
+  `dyninfo` text DEFAULT NULL,
   PRIMARY KEY (`recid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=tis620
 INSERT INTO t1 VALUES (1,'color=\"STB,NPG\"\r\nengine=\"J30A13\"\r\nframe=\"MRHCG1640YP4\"\r\ngrade=\"V6\"\r\nmodel=\"ACCORD\"\r\nmodelcode=\"CG164YEN\"\r\ntype=\"VT6\"\r\n');

mysql-test/r/ctype_ucs.result

@@ -2873,7 +2873,7 @@ create table t1 as select concat(AsText(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longtext CHARACTER SET ucs2
+  `c1` longtext CHARACTER SET ucs2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(period_add(200902, 2)));

mysql-test/r/ctype_utf16.result

@@ -1280,7 +1280,7 @@ Note	1246	Converting column 'a' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` mediumtext CHARACTER SET utf16
+  `a` mediumtext CHARACTER SET utf16 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (a varchar(250) character set utf16 primary key);

mysql-test/r/ctype_utf16le.result

@@ -1541,7 +1541,7 @@ Note	1246	Converting column 'a' from VARCHAR to TEXT
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` mediumtext CHARACTER SET utf16le
+  `a` mediumtext CHARACTER SET utf16le DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 #

mysql-test/r/ctype_utf32.result

@@ -1278,7 +1278,7 @@ Note	1246	Converting column 'a' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` mediumtext CHARACTER SET utf32
+  `a` mediumtext CHARACTER SET utf32 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (a varchar(250) character set utf32 primary key);

mysql-test/r/ctype_utf8.result

@@ -2276,7 +2276,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `clipid` int(11) NOT NULL,
   `mos` tinyint(4) DEFAULT '0',
-  `Tape` tinytext,
+  `Tape` tinytext DEFAULT NULL,
   PRIMARY KEY (`clipid`),
   KEY `tape` (`Tape`(255))
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
@@ -3109,7 +3109,7 @@ create table t1 as select group_concat(1,2,3) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` text CHARACTER SET utf8
+  `c1` text CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 as select 1 as c1 union select 'a';
@@ -3715,7 +3715,7 @@ create table t1 as select concat(AsText(GeomFromText('Point(1 2)'))) as c1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longtext CHARACTER SET utf8
+  `c1` longtext CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select hex(concat(period_add(200902, 2)));

mysql-test/r/ctype_utf8mb4.result

@@ -2388,7 +2388,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `clipid` int(11) NOT NULL,
   `mos` tinyint(4) DEFAULT '0',
-  `Tape` tinytext,
+  `Tape` tinytext DEFAULT NULL,
   PRIMARY KEY (`clipid`),
   KEY `tape` (`Tape`(250))
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4

mysql-test/r/ctype_utf8mb4_innodb.result

@@ -2348,7 +2348,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `clipid` int(11) NOT NULL,
   `mos` tinyint(4) DEFAULT '0',
-  `Tape` tinytext,
+  `Tape` tinytext DEFAULT NULL,
   PRIMARY KEY (`clipid`),
   KEY `tape` (`Tape`(191))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4

mysql-test/r/ctype_utf8mb4_myisam.result

@@ -2348,7 +2348,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `clipid` int(11) NOT NULL,
   `mos` tinyint(4) DEFAULT '0',
-  `Tape` tinytext,
+  `Tape` tinytext DEFAULT NULL,
   PRIMARY KEY (`clipid`),
   KEY `tape` (`Tape`(250))
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4

mysql-test/r/default.result

@@ -72,31 +72,31 @@ t2	CREATE TABLE `t2` (
   `a` varchar(30) COLLATE latin1_bin NOT NULL DEFAULT ' ',
   `b` varchar(1) COLLATE latin1_bin NOT NULL DEFAULT ' ',
   `c` varchar(4) COLLATE latin1_bin NOT NULL DEFAULT '0000',
-  `d` tinyblob,
+  `d` tinyblob DEFAULT NULL,
-  `e` tinyblob,
+  `e` tinyblob DEFAULT NULL,
-  `f` tinyblob,
+  `f` tinyblob DEFAULT NULL,
-  `g` tinyblob,
+  `g` tinyblob DEFAULT NULL,
-  `h` tinyblob,
+  `h` tinyblob DEFAULT NULL,
-  `i` tinyblob,
+  `i` tinyblob DEFAULT NULL,
-  `j` tinyblob,
+  `j` tinyblob DEFAULT NULL,
-  `k` tinyblob,
+  `k` tinyblob DEFAULT NULL,
-  `l` tinyblob,
+  `l` tinyblob DEFAULT NULL,
-  `m` tinyblob,
+  `m` tinyblob DEFAULT NULL,
-  `n` tinyblob,
+  `n` tinyblob DEFAULT NULL,
-  `o` tinyblob,
+  `o` tinyblob DEFAULT NULL,
-  `p` tinyblob,
+  `p` tinyblob DEFAULT NULL,
   `q` varchar(30) COLLATE latin1_bin NOT NULL DEFAULT ' ',
   `r` varchar(30) COLLATE latin1_bin NOT NULL DEFAULT ' ',
-  `s` tinyblob,
+  `s` tinyblob DEFAULT NULL,
   `t` varchar(4) COLLATE latin1_bin NOT NULL DEFAULT ' ',
   `u` varchar(1) COLLATE latin1_bin NOT NULL DEFAULT ' ',
   `v` varchar(30) COLLATE latin1_bin NOT NULL DEFAULT ' ',
   `w` varchar(30) COLLATE latin1_bin NOT NULL DEFAULT ' ',
-  `x` tinyblob,
+  `x` tinyblob DEFAULT NULL,
   `y` varchar(5) COLLATE latin1_bin NOT NULL DEFAULT ' ',
   `z` varchar(20) COLLATE latin1_bin NOT NULL DEFAULT ' ',
   `a1` varchar(30) COLLATE latin1_bin NOT NULL DEFAULT ' ',
-  `b1` tinyblob
+  `b1` tinyblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin
 INSERT into t2 (b) values ('1');
 SHOW WARNINGS;

mysql-test/r/fulltext.result

@@ -249,7 +249,7 @@ show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `ticket` int(11) DEFAULT NULL,
-  `inhalt` text,
+  `inhalt` text DEFAULT NULL,
   KEY `tig` (`ticket`),
   FULLTEXT KEY `tix` (`inhalt`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1

mysql-test/r/func_gconcat.result

@@ -1154,14 +1154,14 @@ CREATE TABLE t2 SELECT GROUP_CONCAT(f1 order by f2) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `GROUP_CONCAT(f1 order by f2)` mediumtext
+  `GROUP_CONCAT(f1 order by f2)` mediumtext DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 SELECT GROUP_CONCAT(UPPER(f1) ORDER BY f2) FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `GROUP_CONCAT(UPPER(f1) ORDER BY f2)` mediumtext
+  `GROUP_CONCAT(UPPER(f1) ORDER BY f2)` mediumtext DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SET group_concat_max_len= DEFAULT;

mysql-test/r/func_hybrid_type.result

@@ -3073,9 +3073,9 @@ SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `c1` varbinary(255) DEFAULT NULL,
-  `c2` mediumblob,
+  `c2` mediumblob DEFAULT NULL,
-  `c3` blob,
+  `c3` blob DEFAULT NULL,
-  `c4` longblob
+  `c4` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT
 MAX(COALESCE(c1)) AS c1,
@@ -3150,7 +3150,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `c1` varchar(1) DEFAULT NULL,
   `c2` varchar(255) DEFAULT NULL,
-  `c3` text
+  `c3` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT
 MAX(COALESCE(c1)) AS c1,
@@ -3177,7 +3177,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL,
   `c2` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
-  `c3` text CHARACTER SET utf8
+  `c3` text CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT
 MAX(COALESCE(c1)) AS c1,
@@ -3245,9 +3245,9 @@ SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `c1` varbinary(255) DEFAULT NULL,
-  `c2` blob,
+  `c2` blob DEFAULT NULL,
-  `c3` mediumblob,
+  `c3` mediumblob DEFAULT NULL,
-  `c4` longblob
+  `c4` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT
 @c1:=c1 AS c1,
@@ -3319,7 +3319,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `c1` varchar(1) DEFAULT NULL,
   `c2` varchar(255) DEFAULT NULL,
-  `c3` text
+  `c3` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT
 @c:=c1 AS c1,
@@ -3345,7 +3345,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `c1` varchar(1) CHARACTER SET utf8 DEFAULT NULL,
   `c2` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
-  `c3` text CHARACTER SET utf8
+  `c3` text CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT
 @c:=c1 AS c1,

mysql-test/r/func_weight_string.result

@@ -57,7 +57,7 @@ create table t1 select weight_string(repeat('t',66000)) as w;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `w` longblob
+  `w` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select weight_string(NULL);

mysql-test/r/information_schema_parameters.result

@@ -17,7 +17,7 @@ PARAMETERS	CREATE TEMPORARY TABLE `PARAMETERS` (
   `DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL,
   `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
   `COLLATION_NAME` varchar(64) DEFAULT NULL,
-  `DTD_IDENTIFIER` longtext NOT NULL,
+  `DTD_IDENTIFIER` longtext NOT NULL DEFAULT '',
   `ROUTINE_TYPE` varchar(9) NOT NULL DEFAULT ''
 )  DEFAULT CHARSET=utf8
 SELECT * FROM information_schema.columns
@@ -309,7 +309,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	PARAMETERS
 COLUMN_NAME	DTD_IDENTIFIER
 ORDINAL_POSITION	15
-COLUMN_DEFAULT	NULL
+COLUMN_DEFAULT	
 IS_NULLABLE	NO
 DATA_TYPE	longtext
 CHARACTER_MAXIMUM_LENGTH	4294967295
@@ -360,7 +360,7 @@ NUMERIC_SCALE	int(21)	YES		NULL
 DATETIME_PRECISION	bigint(21) unsigned	YES		NULL	
 CHARACTER_SET_NAME	varchar(64)	YES		NULL	
 COLLATION_NAME	varchar(64)	YES		NULL	
-DTD_IDENTIFIER	longtext	NO		NULL	
+DTD_IDENTIFIER	longtext	NO			
 ROUTINE_TYPE	varchar(9)	NO			
 # ========== parameters.2 ==========
 DROP DATABASE IF EXISTS i_s_parameters_test;

mysql-test/r/information_schema_routines.result

@@ -18,9 +18,9 @@ ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
   `DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL,
   `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
   `COLLATION_NAME` varchar(64) DEFAULT NULL,
-  `DTD_IDENTIFIER` longtext,
+  `DTD_IDENTIFIER` longtext DEFAULT NULL,
   `ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '',
-  `ROUTINE_DEFINITION` longtext,
+  `ROUTINE_DEFINITION` longtext DEFAULT NULL,
   `EXTERNAL_NAME` varchar(64) DEFAULT NULL,
   `EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL,
   `PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '',
@@ -31,7 +31,7 @@ ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
   `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` varchar(8192) NOT NULL DEFAULT '',
-  `ROUTINE_COMMENT` longtext NOT NULL,
+  `ROUTINE_COMMENT` longtext NOT NULL DEFAULT '',
   `DEFINER` varchar(189) NOT NULL DEFAULT '',
   `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
   `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
@@ -566,7 +566,7 @@ TABLE_SCHEMA	information_schema
 TABLE_NAME	ROUTINES
 COLUMN_NAME	ROUTINE_COMMENT
 ORDINAL_POSITION	27
-COLUMN_DEFAULT	NULL
+COLUMN_DEFAULT	
 IS_NULLABLE	NO
 DATA_TYPE	longtext
 CHARACTER_MAXIMUM_LENGTH	4294967295
@@ -689,7 +689,7 @@ SECURITY_TYPE	varchar(7)	NO
 CREATED	datetime	NO		0000-00-00 00:00:00	
 LAST_ALTERED	datetime	NO		0000-00-00 00:00:00	
 SQL_MODE	varchar(8192)	NO			
-ROUTINE_COMMENT	longtext	NO		NULL	
+ROUTINE_COMMENT	longtext	NO			
 DEFINER	varchar(189)	NO			
 CHARACTER_SET_CLIENT	varchar(32)	NO			
 COLLATION_CONNECTION	varchar(32)	NO			

mysql-test/r/key.result

@@ -243,7 +243,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c` varchar(30) CHARACTER SET utf8 DEFAULT NULL,
-  `t` text CHARACTER SET utf8,
+  `t` text CHARACTER SET utf8 DEFAULT NULL,
   UNIQUE KEY `c` (`c`(2)),
   UNIQUE KEY `t` (`t`(3))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1

mysql-test/r/mix2_myisam.result

@@ -1428,7 +1428,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t2 like t1;
 show create table t2;
@@ -1436,7 +1436,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t3 select * from t1;
 show create table t3;
@@ -1444,7 +1444,7 @@ Table	Create Table
 t3	CREATE TABLE `t3` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify c varchar(10);
 show create table t1;
@@ -1452,7 +1452,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify v char(10);
 show create table t1;
@@ -1460,7 +1460,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` char(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify t varchar(10);
 Warnings:
@@ -1483,7 +1483,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `v` (`v`),
   KEY `c` (`c`),
   KEY `t` (`t`(10))
@@ -1704,7 +1704,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(300) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`)
@@ -1784,7 +1784,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(300) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`(30))
@@ -1864,7 +1864,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(600) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`)
@@ -1942,7 +1942,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
   KEY `t` (`t`(5))
@@ -1993,7 +1993,7 @@ Note	1246	Converting column 'v' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` mediumtext
+  `v` mediumtext DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (v varchar(65530) character set utf8);
@@ -2002,7 +2002,7 @@ Note	1246	Converting column 'v' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` mediumtext CHARACTER SET utf8
+  `v` mediumtext CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 set storage_engine=MEMORY;

mysql-test/r/mrr_icp_extra.result

@@ -229,7 +229,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t2 like t1;
 show create table t2;
@@ -237,7 +237,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t3 select * from t1;
 show create table t3;
@@ -245,7 +245,7 @@ Table	Create Table
 t3	CREATE TABLE `t3` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify c varchar(10);
 show create table t1;
@@ -253,7 +253,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify v char(10);
 show create table t1;
@@ -261,7 +261,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` char(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify t varchar(10);
 Warnings:
@@ -284,7 +284,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `v` (`v`),
   KEY `c` (`c`),
   KEY `t` (`t`(10))
@@ -505,7 +505,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(300) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`)
@@ -585,7 +585,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(300) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`(30))
@@ -665,7 +665,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(600) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`)
@@ -743,7 +743,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
   KEY `t` (`t`(5))

mysql-test/r/myisam.result

@@ -1132,7 +1132,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t2 like t1;
 show create table t2;
@@ -1140,7 +1140,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t3 select * from t1;
 show create table t3;
@@ -1148,7 +1148,7 @@ Table	Create Table
 t3	CREATE TABLE `t3` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify c varchar(10);
 show create table t1;
@@ -1156,7 +1156,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify v char(10);
 show create table t1;
@@ -1164,7 +1164,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` char(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify t varchar(10);
 Warnings:
@@ -1187,7 +1187,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `v` (`v`),
   KEY `c` (`c`),
   KEY `t` (`t`(10))
@@ -1408,7 +1408,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(300) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`)
@@ -1488,7 +1488,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(300) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`(30))
@@ -1568,7 +1568,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(600) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`)
@@ -1646,7 +1646,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
   KEY `t` (`t`(5))
@@ -1697,7 +1697,7 @@ Note	1246	Converting column 'v' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` mediumtext
+  `v` mediumtext DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (v varchar(65530) character set utf8);
@@ -1706,7 +1706,7 @@ Note	1246	Converting column 'v' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` mediumtext CHARACTER SET utf8
+  `v` mediumtext CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (v varchar(65535));

mysql-test/r/mysql5613mysql.result

@@ -72,7 +72,7 @@ event	CREATE TABLE `event` (
   `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `body_utf8` longblob,
+  `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'
 SELECT * FROM event LIMIT 0;
@@ -112,7 +112,7 @@ proc	CREATE TABLE `proc` (
   `is_deterministic` enum('YES','NO') NOT NULL DEFAULT 'NO',
   `security_type` enum('INVOKER','DEFINER') NOT NULL DEFAULT 'DEFINER',
   `param_list` blob NOT NULL,
-  `returns` longblob NOT NULL,
+  `returns` longblob NOT NULL DEFAULT '',
   `body` longblob NOT NULL,
   `definer` char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
   `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
@@ -122,7 +122,7 @@ proc	CREATE TABLE `proc` (
   `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `body_utf8` longblob,
+  `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`,`type`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Stored Procedures'
 SELECT * FROM proc LIMIT 0;
@@ -293,7 +293,7 @@ user	CREATE TABLE `user` (
   `max_connections` int(11) unsigned NOT NULL DEFAULT '0',
   `max_user_connections` int(11) unsigned NOT NULL DEFAULT '0',
   `plugin` char(64) COLLATE utf8_bin DEFAULT '',
-  `authentication_string` text COLLATE utf8_bin,
+  `authentication_string` text COLLATE utf8_bin DEFAULT NULL,
   `password_expired` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
   PRIMARY KEY (`Host`,`User`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'

mysql-test/r/mysqldump.result

@@ -691,7 +691,7 @@ DROP TABLE IF EXISTS `t1`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
-  `b` blob
+  `b` blob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1785,8 +1785,8 @@ CREATE TABLE `t2` (
   `a` int(10) DEFAULT NULL,
   `b` varchar(30) DEFAULT NULL,
   `c` datetime DEFAULT NULL,
-  `d` blob,
+  `d` blob DEFAULT NULL,
-  `e` text,
+  `e` text DEFAULT NULL,
   PRIMARY KEY (`pk`)
 ) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3287,7 +3287,7 @@ DROP TABLE IF EXISTS `t1`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` binary(1) DEFAULT NULL,
-  `b` blob
+  `b` blob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -3322,7 +3322,7 @@ DROP TABLE IF EXISTS `t1`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `a` binary(1) DEFAULT NULL,
-  `b` blob
+  `b` blob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -3885,7 +3885,7 @@ INSERT INTO t1 SET c1=11, c2=REPEAT('q',509);
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
-  `c2` longblob
+  `c2` longblob DEFAULT NULL
 );
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES (11,0x7171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171717171);

mysql-test/r/mysqltest_ps.result

@@ -4,8 +4,6 @@ select 1 + "2 a";
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: '2 a'
 create table t (a int primary key, b blob default '');
-Warnings:
-Warning	1101	BLOB/TEXT column 'b' can't have a default value
 select a, (2*a) AS a from t group by a;
 a	a
 Warnings:
@@ -17,8 +15,6 @@ select 1 + "2 a";
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: '2 a'
 create table t (a int primary key, b blob default '');
-Warnings:
-Warning	1101	BLOB/TEXT column 'b' can't have a default value
 select a, (2*a) AS a from t group by a;
 a	a
 Warnings:
@@ -31,8 +27,6 @@ select 1 + "2 a";
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: '2 a'
 create table t (a int primary key, b blob default '');
-Warnings:
-Warning	1101	BLOB/TEXT column 'b' can't have a default value
 select a, (2*a) AS a from t group by a;
 a	a
 Warnings:

mysql-test/r/null.result

@@ -906,22 +906,22 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `NULLIF(c_text,  1)` longtext,
+  `NULLIF(c_text,  1)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_smallint)` longtext,
+  `NULLIF(c_text,  c_smallint)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_tinyint)` longtext,
+  `NULLIF(c_text,  c_tinyint)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_int)` longtext,
+  `NULLIF(c_text,  c_int)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_bigint)` longtext,
+  `NULLIF(c_text,  c_bigint)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_float)` longtext,
+  `NULLIF(c_text,  c_float)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_double)` longtext,
+  `NULLIF(c_text,  c_double)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_decimal103)` longtext,
+  `NULLIF(c_text,  c_decimal103)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_varchar10)` longtext,
+  `NULLIF(c_text,  c_varchar10)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_text)` longtext,
+  `NULLIF(c_text,  c_text)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_blob)` longtext,
+  `NULLIF(c_text,  c_blob)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_enum)` longtext,
+  `NULLIF(c_text,  c_enum)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_datetime3)` longtext,
+  `NULLIF(c_text,  c_datetime3)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_timestamp3)` longtext,
+  `NULLIF(c_text,  c_timestamp3)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_date)` longtext,
+  `NULLIF(c_text,  c_date)` longtext DEFAULT NULL,
-  `NULLIF(c_text,  c_time)` longtext
+  `NULLIF(c_text,  c_time)` longtext DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
@@ -945,22 +945,22 @@ FROM t1;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `NULLIF(c_blob,  1)` longblob,
+  `NULLIF(c_blob,  1)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_smallint)` longblob,
+  `NULLIF(c_blob,  c_smallint)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_tinyint)` longblob,
+  `NULLIF(c_blob,  c_tinyint)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_int)` longblob,
+  `NULLIF(c_blob,  c_int)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_bigint)` longblob,
+  `NULLIF(c_blob,  c_bigint)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_float)` longblob,
+  `NULLIF(c_blob,  c_float)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_double)` longblob,
+  `NULLIF(c_blob,  c_double)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_decimal103)` longblob,
+  `NULLIF(c_blob,  c_decimal103)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_varchar10)` longblob,
+  `NULLIF(c_blob,  c_varchar10)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_text)` longblob,
+  `NULLIF(c_blob,  c_text)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_blob)` longblob,
+  `NULLIF(c_blob,  c_blob)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_enum)` longblob,
+  `NULLIF(c_blob,  c_enum)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_datetime3)` longblob,
+  `NULLIF(c_blob,  c_datetime3)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_timestamp3)` longblob,
+  `NULLIF(c_blob,  c_timestamp3)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_date)` longblob,
+  `NULLIF(c_blob,  c_date)` longblob DEFAULT NULL,
-  `NULLIF(c_blob,  c_time)` longblob
+  `NULLIF(c_blob,  c_time)` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT

mysql-test/r/ps.result

@@ -3397,7 +3397,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = '2007-11-18 15:01:02';
 @a	@a = '2007-11-18 15:01:02'
@@ -3415,7 +3415,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = '1234-11-12 12:34:59';
 @a	@a = '1234-11-12 12:34:59'
@@ -3433,7 +3433,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = '123:45:01';
 @a	@a = '123:45:01'
@@ -3451,7 +3451,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = '1234-11-12';
 @a	@a = '1234-11-12'
@@ -3541,7 +3541,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = REPEAT('a', 16);
 @a	@a = REPEAT('a', 16)
@@ -3559,7 +3559,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = REPEAT('b', 16);
 @a	@a = REPEAT('b', 16)
@@ -3577,7 +3577,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = REPEAT('c', 16);
 @a	@a = REPEAT('c', 16)
@@ -3595,7 +3595,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = REPEAT('d', 16);
 @a	@a = REPEAT('d', 16)
@@ -3613,7 +3613,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = REPEAT('e', 16);
 @a	@a = REPEAT('e', 16)
@@ -3631,7 +3631,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = REPEAT('f', 16);
 @a	@a = REPEAT('f', 16)
@@ -3649,7 +3649,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = REPEAT('g', 32);
 @a	@a = REPEAT('g', 32)
@@ -3667,7 +3667,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = REPEAT('h', 16);
 @a	@a = REPEAT('h', 16)
@@ -3685,7 +3685,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = REPEAT('i', 16);
 @a	@a = REPEAT('i', 16)
@@ -3703,7 +3703,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = REPEAT('j', 16);
 @a	@a = REPEAT('j', 16)
@@ -3721,7 +3721,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = REPEAT('k', 16);
 @a	@a = REPEAT('k', 16)
@@ -3739,7 +3739,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = REPEAT('l', 16);
 @a	@a = REPEAT('l', 16)
@@ -3757,7 +3757,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = 'aaa';
 @a	@a = 'aaa'
@@ -3775,7 +3775,7 @@ CREATE TEMPORARY TABLE tmp1 AS SELECT @a AS c1;
 SHOW CREATE TABLE tmp1;
 Table	Create Table
 tmp1	CREATE TEMPORARY TABLE `tmp1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT @a, @a = 'aaa';
 @a	@a = 'aaa'

mysql-test/r/ps_2myisam.result

@@ -1783,17 +1783,17 @@ t5	CREATE TABLE `t5` (
   `const03` double NOT NULL,
   `param03` double DEFAULT NULL,
   `const04` varchar(3) NOT NULL,
-  `param04` longtext,
+  `param04` longtext DEFAULT NULL,
   `const05` varbinary(3) NOT NULL,
-  `param05` longblob,
+  `param05` longblob DEFAULT NULL,
   `const06` varchar(10) NOT NULL,
-  `param06` longtext,
+  `param06` longtext DEFAULT NULL,
   `const07` date DEFAULT NULL,
-  `param07` longtext,
+  `param07` longtext DEFAULT NULL,
   `const08` varchar(19) NOT NULL,
-  `param08` longtext,
+  `param08` longtext DEFAULT NULL,
   `const09` datetime DEFAULT NULL,
-  `param09` longtext,
+  `param09` longtext DEFAULT NULL,
   `const10` bigint(17) DEFAULT NULL,
   `param10` bigint(20) DEFAULT NULL,
   `const11` int(4) DEFAULT NULL,
@@ -1801,8 +1801,8 @@ t5	CREATE TABLE `t5` (
   `const12` binary(0) DEFAULT NULL,
   `param12` bigint(20) DEFAULT NULL,
   `param13` decimal(65,38) DEFAULT NULL,
-  `param14` longtext,
+  `param14` longtext DEFAULT NULL,
-  `param15` longblob
+  `param15` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t5 ;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

mysql-test/r/ps_3innodb.result

@@ -1766,17 +1766,17 @@ t5	CREATE TABLE `t5` (
   `const03` double NOT NULL,
   `param03` double DEFAULT NULL,
   `const04` varchar(3) NOT NULL,
-  `param04` longtext,
+  `param04` longtext DEFAULT NULL,
   `const05` varbinary(3) NOT NULL,
-  `param05` longblob,
+  `param05` longblob DEFAULT NULL,
   `const06` varchar(10) NOT NULL,
-  `param06` longtext,
+  `param06` longtext DEFAULT NULL,
   `const07` date DEFAULT NULL,
-  `param07` longtext,
+  `param07` longtext DEFAULT NULL,
   `const08` varchar(19) NOT NULL,
-  `param08` longtext,
+  `param08` longtext DEFAULT NULL,
   `const09` datetime DEFAULT NULL,
-  `param09` longtext,
+  `param09` longtext DEFAULT NULL,
   `const10` bigint(17) DEFAULT NULL,
   `param10` bigint(20) DEFAULT NULL,
   `const11` int(4) DEFAULT NULL,
@@ -1784,8 +1784,8 @@ t5	CREATE TABLE `t5` (
   `const12` binary(0) DEFAULT NULL,
   `param12` bigint(20) DEFAULT NULL,
   `param13` decimal(65,38) DEFAULT NULL,
-  `param14` longtext,
+  `param14` longtext DEFAULT NULL,
-  `param15` longblob
+  `param15` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t5 ;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

mysql-test/r/ps_4heap.result

@@ -1767,17 +1767,17 @@ t5	CREATE TABLE `t5` (
   `const03` double NOT NULL,
   `param03` double DEFAULT NULL,
   `const04` varchar(3) NOT NULL,
-  `param04` longtext,
+  `param04` longtext DEFAULT NULL,
   `const05` varbinary(3) NOT NULL,
-  `param05` longblob,
+  `param05` longblob DEFAULT NULL,
   `const06` varchar(10) NOT NULL,
-  `param06` longtext,
+  `param06` longtext DEFAULT NULL,
   `const07` date DEFAULT NULL,
-  `param07` longtext,
+  `param07` longtext DEFAULT NULL,
   `const08` varchar(19) NOT NULL,
-  `param08` longtext,
+  `param08` longtext DEFAULT NULL,
   `const09` datetime DEFAULT NULL,
-  `param09` longtext,
+  `param09` longtext DEFAULT NULL,
   `const10` bigint(17) DEFAULT NULL,
   `param10` bigint(20) DEFAULT NULL,
   `const11` int(4) DEFAULT NULL,
@@ -1785,8 +1785,8 @@ t5	CREATE TABLE `t5` (
   `const12` binary(0) DEFAULT NULL,
   `param12` bigint(20) DEFAULT NULL,
   `param13` decimal(65,38) DEFAULT NULL,
-  `param14` longtext,
+  `param14` longtext DEFAULT NULL,
-  `param15` longblob
+  `param15` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t5 ;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

mysql-test/r/ps_5merge.result

@@ -1704,17 +1704,17 @@ t5	CREATE TABLE `t5` (
   `const03` double NOT NULL,
   `param03` double DEFAULT NULL,
   `const04` varchar(3) NOT NULL,
-  `param04` longtext,
+  `param04` longtext DEFAULT NULL,
   `const05` varbinary(3) NOT NULL,
-  `param05` longblob,
+  `param05` longblob DEFAULT NULL,
   `const06` varchar(10) NOT NULL,
-  `param06` longtext,
+  `param06` longtext DEFAULT NULL,
   `const07` date DEFAULT NULL,
-  `param07` longtext,
+  `param07` longtext DEFAULT NULL,
   `const08` varchar(19) NOT NULL,
-  `param08` longtext,
+  `param08` longtext DEFAULT NULL,
   `const09` datetime DEFAULT NULL,
-  `param09` longtext,
+  `param09` longtext DEFAULT NULL,
   `const10` bigint(17) DEFAULT NULL,
   `param10` bigint(20) DEFAULT NULL,
   `const11` int(4) DEFAULT NULL,
@@ -1722,8 +1722,8 @@ t5	CREATE TABLE `t5` (
   `const12` binary(0) DEFAULT NULL,
   `param12` bigint(20) DEFAULT NULL,
   `param13` decimal(65,38) DEFAULT NULL,
-  `param14` longtext,
+  `param14` longtext DEFAULT NULL,
-  `param15` longblob
+  `param15` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t5 ;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
@@ -5058,17 +5058,17 @@ t5	CREATE TABLE `t5` (
   `const03` double NOT NULL,
   `param03` double DEFAULT NULL,
   `const04` varchar(3) NOT NULL,
-  `param04` longtext,
+  `param04` longtext DEFAULT NULL,
   `const05` varbinary(3) NOT NULL,
-  `param05` longblob,
+  `param05` longblob DEFAULT NULL,
   `const06` varchar(10) NOT NULL,
-  `param06` longtext,
+  `param06` longtext DEFAULT NULL,
   `const07` date DEFAULT NULL,
-  `param07` longtext,
+  `param07` longtext DEFAULT NULL,
   `const08` varchar(19) NOT NULL,
-  `param08` longtext,
+  `param08` longtext DEFAULT NULL,
   `const09` datetime DEFAULT NULL,
-  `param09` longtext,
+  `param09` longtext DEFAULT NULL,
   `const10` bigint(17) DEFAULT NULL,
   `param10` bigint(20) DEFAULT NULL,
   `const11` int(4) DEFAULT NULL,
@@ -5076,8 +5076,8 @@ t5	CREATE TABLE `t5` (
   `const12` binary(0) DEFAULT NULL,
   `param12` bigint(20) DEFAULT NULL,
   `param13` decimal(65,38) DEFAULT NULL,
-  `param14` longtext,
+  `param14` longtext DEFAULT NULL,
-  `param15` longblob
+  `param15` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t5 ;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

mysql-test/r/show_check.result

@@ -349,10 +349,10 @@ t1	CREATE TABLE `t1` (
   `type_year` year(4) DEFAULT NULL,
   `type_enum` enum('red','green','blue') DEFAULT NULL,
   `type_set` enum('red','green','blue') DEFAULT NULL,
-  `type_tinyblob` tinyblob,
+  `type_tinyblob` tinyblob DEFAULT NULL,
-  `type_blob` blob,
+  `type_blob` blob DEFAULT NULL,
-  `type_medium_blob` mediumblob,
+  `type_medium_blob` mediumblob DEFAULT NULL,
-  `type_long_blob` longblob,
+  `type_long_blob` longblob DEFAULT NULL,
   PRIMARY KEY (`type_tiny`),
   KEY `type_short` (`type_short`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 MIN_ROWS=10 MAX_ROWS=100 AVG_ROW_LENGTH=10 PACK_KEYS=1 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=FIXED COMMENT='test'
@@ -1269,13 +1269,13 @@ PRIMARY KEY  (Codigo)
 show create table t1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def					Table	253	64	2	N	1	39	7
-def					Create Table	253	1024	445	N	1	39	7
+def					Create Table	253	1024	458	N	1	39	7
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `Codigo` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `Nombre` varchar(255) DEFAULT NULL,
   `Telefono` varchar(255) DEFAULT NULL,
-  `Observaciones` longtext,
+  `Observaciones` longtext DEFAULT NULL,
   `Direccion` varchar(255) DEFAULT NULL,
   `Dni` varchar(255) DEFAULT NULL,
   `CP` int(11) DEFAULT NULL,

mysql-test/r/system_mysql_db.result

@@ -219,7 +219,7 @@ proc	CREATE TABLE `proc` (
   `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `body_utf8` longblob,
+  `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`,`type`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Stored Procedures'
 show create table event;
@@ -246,7 +246,7 @@ event	CREATE TABLE `event` (
   `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `body_utf8` longblob,
+  `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'
 show create table general_log;

mysql-test/r/system_mysql_db_fix40123.result

@@ -219,7 +219,7 @@ proc	CREATE TABLE `proc` (
   `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `body_utf8` longblob,
+  `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`,`type`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Stored Procedures'
 show create table event;
@@ -246,7 +246,7 @@ event	CREATE TABLE `event` (
   `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `body_utf8` longblob,
+  `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'
 show create table general_log;

mysql-test/r/system_mysql_db_fix50030.result

@@ -208,7 +208,7 @@ proc	CREATE TABLE `proc` (
   `sql_data_access` enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA') NOT NULL DEFAULT 'CONTAINS_SQL',
   `is_deterministic` enum('YES','NO') NOT NULL DEFAULT 'NO',
   `security_type` enum('INVOKER','DEFINER') NOT NULL DEFAULT 'DEFINER',
-  `param_list` blob NOT NULL,
+  `param_list` blob NOT NULL DEFAULT '',
   `returns` longblob NOT NULL,
   `body` longblob NOT NULL,
   `definer` char(141) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
@@ -219,7 +219,7 @@ proc	CREATE TABLE `proc` (
   `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `body_utf8` longblob,
+  `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`,`type`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Stored Procedures'
 show create table event;
@@ -246,7 +246,7 @@ event	CREATE TABLE `event` (
   `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `body_utf8` longblob,
+  `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'
 show create table general_log;

mysql-test/r/system_mysql_db_fix50117.result

@@ -219,7 +219,7 @@ proc	CREATE TABLE `proc` (
   `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `body_utf8` longblob,
+  `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`,`type`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Stored Procedures'
 show create table event;
@@ -246,7 +246,7 @@ event	CREATE TABLE `event` (
   `character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
-  `body_utf8` longblob,
+  `body_utf8` longblob DEFAULT NULL,
   PRIMARY KEY (`db`,`name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'
 show create table general_log;

mysql-test/r/type_blob.result

@@ -23,8 +23,8 @@ create table t3 (a long, b long byte);
 show create TABLE t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
-  `a` mediumtext,
+  `a` mediumtext DEFAULT NULL,
-  `b` mediumblob
+  `b` mediumblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show create TABLE t4;
 Table	Create Table
@@ -364,7 +364,7 @@ Warning	1071	Specified key was too long; max key length is 1000 bytes
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` text,
+  `a` text DEFAULT NULL,
   KEY `a` (`a`(1000))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -798,7 +798,7 @@ Warning	1101	BLOB/TEXT column 'a' can't have a default value
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` text
+  `a` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values (default);
 select * from t1;

mysql-test/r/type_varchar.result

@@ -7,7 +7,7 @@ t1	CREATE TABLE `t1` (
   `v` varchar(30) DEFAULT NULL,
   `c` char(3) DEFAULT NULL,
   `e` enum('abc','def','ghi') DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 show create table vchar;
 Table	Create Table
@@ -15,7 +15,7 @@ vchar	CREATE TABLE `vchar` (
   `v` varchar(30) DEFAULT NULL,
   `c` char(3) DEFAULT NULL,
   `e` enum('abc','def','ghi') DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values ('abc', 'de', 'ghi', 'jkl');
 insert into t1 values ('abc ', 'de ', 'ghi', 'jkl ');
@@ -40,7 +40,7 @@ vchar	CREATE TABLE `vchar` (
   `v` varchar(30) DEFAULT NULL,
   `c` char(3) DEFAULT NULL,
   `e` enum('abc','def','ghi') DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   `i` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select length(v),length(c),length(e),length(t) from vchar;
@@ -411,7 +411,7 @@ alter table t1 modify f1 tinytext;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `f1` tinytext,
+  `f1` tinytext DEFAULT NULL,
   KEY `index1` (`f1`(10))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;

mysql-test/r/union.result

@@ -796,7 +796,7 @@ tetetetetest
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `dt` blob
+  `dt` blob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 SELECT sv from t2 UNION select b from t2;
@@ -807,7 +807,7 @@ tetetetetest
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `sv` blob
+  `sv` blob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 SELECT i from t2 UNION select d from t2 UNION select b from t2;
@@ -819,7 +819,7 @@ tetetetetest
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` blob
+  `i` blob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 SELECT sv from t2 UNION select tx from t2;
@@ -830,7 +830,7 @@ teeeeeeeeeeeest
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `sv` text
+  `sv` text DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 SELECT b from t2 UNION select tx from t2;
@@ -841,7 +841,7 @@ teeeeeeeeeeeest
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `b` blob
+  `b` blob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1,t2;
 create table t1 select 1 union select -1;
@@ -1354,7 +1354,7 @@ create table t3 SELECT left(a,100000000) FROM t1 UNION  SELECT b FROM t2;
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
-  `left(a,100000000)` mediumtext
+  `left(a,100000000)` mediumtext DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop tables t1,t2,t3;
 CREATE TABLE t1 (a longtext);
@@ -1368,7 +1368,7 @@ create table t3 SELECT left(a,100000000) FROM t1 UNION  SELECT b FROM t2;
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
-  `left(a,100000000)` longtext
+  `left(a,100000000)` longtext DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop tables t1,t2,t3;
 SELECT @tmp_max:= @@global.max_allowed_packet;
@@ -1385,7 +1385,7 @@ CREATE TABLE t3 SELECT REPEAT(a,20000000) AS a FROM t1 UNION SELECT b FROM t2;
 SHOW CREATE TABLE t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
-  `a` longtext
+  `a` longtext DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLES t1,t3;
 CREATE TABLE t1 (a tinytext);
@@ -1403,7 +1403,7 @@ CREATE TABLE t3 SELECT REPEAT(a,2) AS a FROM t1 UNION SELECT b FROM t2;
 SHOW CREATE TABLE t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
-  `a` longtext
+  `a` longtext DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLES t1,t3;
 CREATE TABLE t1 (a tinyblob);
@@ -1448,8 +1448,8 @@ t2	CREATE TABLE `t2` (
   `f4` binary(5) DEFAULT NULL,
   `f5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   `f6` varchar(1) CHARACTER SET utf8 DEFAULT NULL,
-  `f7` text,
+  `f7` text DEFAULT NULL,
-  `f8` mediumtext CHARACTER SET utf8
+  `f8` mediumtext CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 (select avg(1)) union (select avg(1)) union (select avg(1)) union

mysql-test/r/user_var.result

@@ -219,7 +219,7 @@ create table t1 select @first_var;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `@first_var` longblob
+  `@first_var` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 set @first_var= cast(NULL as signed integer);
@@ -243,7 +243,7 @@ create table t1 select @first_var;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `@first_var` longblob
+  `@first_var` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 set @first_var=1;
@@ -252,7 +252,7 @@ create table t1 select @first_var;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `@first_var` longtext
+  `@first_var` longtext DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 set @a=18446744071710965857;

mysql-test/r/variables.result

@@ -732,7 +732,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` bigint(20) DEFAULT NULL,
   `c2` decimal(65,38) DEFAULT NULL,
-  `c3` longtext,
+  `c3` longtext DEFAULT NULL,
   `c4` double DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;

mysql-test/suite/archive/archive.result

@@ -12664,7 +12664,7 @@ SHOW CREATE TABLE t6;
 Table	Create Table
 t6	CREATE TABLE `t6` (
   `a` int(11) NOT NULL AUTO_INCREMENT,
-  `b` tinyblob,
+  `b` tinyblob DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
 ) ENGINE=ARCHIVE AUTO_INCREMENT=36 DEFAULT CHARSET=latin1
@@ -12792,10 +12792,10 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
-  `b` text,
+  `b` text DEFAULT NULL,
   `c` varchar(255) DEFAULT NULL,
-  `d` blob,
+  `d` blob DEFAULT NULL,
-  `e` blob
+  `e` blob DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
 SELECT * FROM t1;
 a	b	c	d	e

mysql-test/suite/encryption/r/innodb_onlinealter_encryption.result

@@ -96,7 +96,7 @@ SHOW CREATE TABLE t5;
 Table	Create Table
 t5	CREATE TABLE `t5` (
   `id` int(11) NOT NULL,
-  `a` text,
+  `a` text DEFAULT NULL,
   `b` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `b` (`b`),
@@ -106,7 +106,7 @@ SHOW CREATE TABLE t6;
 Table	Create Table
 t6	CREATE TABLE `t6` (
   `id` int(11) DEFAULT NULL,
-  `a` text,
+  `a` text DEFAULT NULL,
   `b` varchar(255) DEFAULT NULL,
   FULLTEXT KEY `b` (`b`),
   FULLTEXT KEY `a` (`a`)

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

@@ -43,7 +43,7 @@ NUMERIC_SCALE	bigint(21) unsigned	YES		NULL
 DATETIME_PRECISION	bigint(21) unsigned	YES		NULL	
 CHARACTER_SET_NAME	varchar(32)	YES		NULL	
 COLLATION_NAME	varchar(32)	YES		NULL	
-COLUMN_TYPE	longtext	NO		NULL	
+COLUMN_TYPE	longtext	NO			
 COLUMN_KEY	varchar(3)	NO			
 EXTRA	varchar(27)	NO			
 PRIVILEGES	varchar(80)	NO			
@@ -56,7 +56,7 @@ COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
   `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,
+  `COLUMN_DEFAULT` longtext DEFAULT NULL,
   `IS_NULLABLE` varchar(3) NOT NULL DEFAULT '',
   `DATA_TYPE` varchar(64) NOT NULL DEFAULT '',
   `CHARACTER_MAXIMUM_LENGTH` bigint(21) unsigned DEFAULT NULL,
@@ -66,7 +66,7 @@ COLUMNS	CREATE TEMPORARY TABLE `COLUMNS` (
   `DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL,
   `CHARACTER_SET_NAME` varchar(32) DEFAULT NULL,
   `COLLATION_NAME` varchar(32) DEFAULT NULL,
-  `COLUMN_TYPE` longtext NOT NULL,
+  `COLUMN_TYPE` longtext NOT NULL DEFAULT '',
   `COLUMN_KEY` varchar(3) NOT NULL DEFAULT '',
   `EXTRA` varchar(27) NOT NULL DEFAULT '',
   `PRIVILEGES` varchar(80) NOT NULL DEFAULT '',
@@ -89,7 +89,7 @@ NUMERIC_SCALE	bigint(21) unsigned	YES		NULL
 DATETIME_PRECISION	bigint(21) unsigned	YES		NULL	
 CHARACTER_SET_NAME	varchar(32)	YES		NULL	
 COLLATION_NAME	varchar(32)	YES		NULL	
-COLUMN_TYPE	longtext	NO		NULL	
+COLUMN_TYPE	longtext	NO			
 COLUMN_KEY	varchar(3)	NO			
 EXTRA	varchar(27)	NO			
 PRIVILEGES	varchar(80)	NO			

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

@@ -65,7 +65,7 @@ def	information_schema	COLUMNS	COLUMN_COMMENT	20		NO	varchar	1024	3072	NULL	NULL
 def	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 def	information_schema	COLUMNS	COLUMN_KEY	17		NO	varchar	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 def	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-def	information_schema	COLUMNS	COLUMN_TYPE	16	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+def	information_schema	COLUMNS	COLUMN_TYPE	16		NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 def	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 def	information_schema	COLUMNS	DATETIME_PRECISION	13	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select	
 def	information_schema	COLUMNS	EXTRA	18		NO	varchar	27	81	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(27)			select	
@@ -100,7 +100,7 @@ def	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NU
 def	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
 def	information_schema	EVENTS	EVENT_CATALOG	1		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 def	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-def	information_schema	EVENTS	EVENT_DEFINITION	7	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+def	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 def	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 def	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 def	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(9)			select	
@@ -204,7 +204,7 @@ def	information_schema	PARAMETERS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192
 def	information_schema	PARAMETERS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 def	information_schema	PARAMETERS	DATA_TYPE	7		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 def	information_schema	PARAMETERS	DATETIME_PRECISION	12	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned			select	
-def	information_schema	PARAMETERS	DTD_IDENTIFIER	15	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+def	information_schema	PARAMETERS	DTD_IDENTIFIER	15		NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 def	information_schema	PARAMETERS	NUMERIC_PRECISION	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)			select	
 def	information_schema	PARAMETERS	NUMERIC_SCALE	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)			select	
 def	information_schema	PARAMETERS	ORDINAL_POSITION	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)			select	
@@ -301,7 +301,7 @@ def	information_schema	ROUTINES	NUMERIC_SCALE	10	NULL	YES	int	NULL	NULL	10	0	NUL
 def	information_schema	ROUTINES	PARAMETER_STYLE	19		NO	varchar	8	24	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
 def	information_schema	ROUTINES	ROUTINE_BODY	15		NO	varchar	8	24	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(8)			select	
 def	information_schema	ROUTINES	ROUTINE_CATALOG	2		NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
-def	information_schema	ROUTINES	ROUTINE_COMMENT	27	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+def	information_schema	ROUTINES	ROUTINE_COMMENT	27		NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 def	information_schema	ROUTINES	ROUTINE_DEFINITION	16	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 def	information_schema	ROUTINES	ROUTINE_NAME	4		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 def	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
@@ -413,7 +413,7 @@ def	information_schema	TRIGGERS	ACTION_REFERENCE_NEW_ROW	16		NO	varchar	3	9	NULL
 def	information_schema	TRIGGERS	ACTION_REFERENCE_NEW_TABLE	14	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 def	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_ROW	15		NO	varchar	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(3)			select	
 def	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_TABLE	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-def	information_schema	TRIGGERS	ACTION_STATEMENT	10	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+def	information_schema	TRIGGERS	ACTION_STATEMENT	10		NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 def	information_schema	TRIGGERS	ACTION_TIMING	12		NO	varchar	6	18	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(6)			select	
 def	information_schema	TRIGGERS	CHARACTER_SET_CLIENT	20		NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
 def	information_schema	TRIGGERS	COLLATION_CONNECTION	21		NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
@@ -467,7 +467,7 @@ def	information_schema	VIEWS	SECURITY_TYPE	8		NO	varchar	7	21	NULL	NULL	NULL	utf
 def	information_schema	VIEWS	TABLE_CATALOG	1		NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select	
 def	information_schema	VIEWS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 def	information_schema	VIEWS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
-def	information_schema	VIEWS	VIEW_DEFINITION	4	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select	
+def	information_schema	VIEWS	VIEW_DEFINITION	4		NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext			select	
 ##########################################################################
 # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH
 ##########################################################################

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

@@ -65,7 +65,7 @@ def	information_schema	COLUMNS	COLUMN_COMMENT	20		NO	varchar	1024	3072	NULL	NULL
 def	information_schema	COLUMNS	COLUMN_DEFAULT	6	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
 def	information_schema	COLUMNS	COLUMN_KEY	17		NO	varchar	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(3)				
 def	information_schema	COLUMNS	COLUMN_NAME	4		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
-def	information_schema	COLUMNS	COLUMN_TYPE	16	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
+def	information_schema	COLUMNS	COLUMN_TYPE	16		NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
 def	information_schema	COLUMNS	DATA_TYPE	8		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
 def	information_schema	COLUMNS	DATETIME_PRECISION	13	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned				
 def	information_schema	COLUMNS	EXTRA	18		NO	varchar	27	81	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(27)				
@@ -100,7 +100,7 @@ def	information_schema	EVENTS	ENDS	14	NULL	YES	datetime	NULL	NULL	NULL	NULL	0	NU
 def	information_schema	EVENTS	EVENT_BODY	6		NO	varchar	8	24	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(8)				
 def	information_schema	EVENTS	EVENT_CATALOG	1		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
 def	information_schema	EVENTS	EVENT_COMMENT	20		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
-def	information_schema	EVENTS	EVENT_DEFINITION	7	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
+def	information_schema	EVENTS	EVENT_DEFINITION	7		NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
 def	information_schema	EVENTS	EVENT_NAME	3		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
 def	information_schema	EVENTS	EVENT_SCHEMA	2		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
 def	information_schema	EVENTS	EVENT_TYPE	8		NO	varchar	9	27	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(9)				
@@ -204,7 +204,7 @@ def	information_schema	PARAMETERS	CHARACTER_SET_NAME	13	NULL	YES	varchar	64	192
 def	information_schema	PARAMETERS	COLLATION_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
 def	information_schema	PARAMETERS	DATA_TYPE	7		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
 def	information_schema	PARAMETERS	DATETIME_PRECISION	12	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	NULL	bigint(21) unsigned				
-def	information_schema	PARAMETERS	DTD_IDENTIFIER	15	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
+def	information_schema	PARAMETERS	DTD_IDENTIFIER	15		NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
 def	information_schema	PARAMETERS	NUMERIC_PRECISION	10	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)				
 def	information_schema	PARAMETERS	NUMERIC_SCALE	11	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)				
 def	information_schema	PARAMETERS	ORDINAL_POSITION	4	0	NO	int	NULL	NULL	10	0	NULL	NULL	NULL	int(21)				
@@ -301,7 +301,7 @@ def	information_schema	ROUTINES	NUMERIC_SCALE	10	NULL	YES	int	NULL	NULL	10	0	NUL
 def	information_schema	ROUTINES	PARAMETER_STYLE	19		NO	varchar	8	24	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(8)				
 def	information_schema	ROUTINES	ROUTINE_BODY	15		NO	varchar	8	24	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(8)				
 def	information_schema	ROUTINES	ROUTINE_CATALOG	2		NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)				
-def	information_schema	ROUTINES	ROUTINE_COMMENT	27	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
+def	information_schema	ROUTINES	ROUTINE_COMMENT	27		NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
 def	information_schema	ROUTINES	ROUTINE_DEFINITION	16	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
 def	information_schema	ROUTINES	ROUTINE_NAME	4		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
 def	information_schema	ROUTINES	ROUTINE_SCHEMA	3		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
@@ -413,7 +413,7 @@ def	information_schema	TRIGGERS	ACTION_REFERENCE_NEW_ROW	16		NO	varchar	3	9	NULL
 def	information_schema	TRIGGERS	ACTION_REFERENCE_NEW_TABLE	14	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
 def	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_ROW	15		NO	varchar	3	9	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(3)				
 def	information_schema	TRIGGERS	ACTION_REFERENCE_OLD_TABLE	13	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
-def	information_schema	TRIGGERS	ACTION_STATEMENT	10	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
+def	information_schema	TRIGGERS	ACTION_STATEMENT	10		NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
 def	information_schema	TRIGGERS	ACTION_TIMING	12		NO	varchar	6	18	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(6)				
 def	information_schema	TRIGGERS	CHARACTER_SET_CLIENT	20		NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)				
 def	information_schema	TRIGGERS	COLLATION_CONNECTION	21		NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)				
@@ -467,7 +467,7 @@ def	information_schema	VIEWS	SECURITY_TYPE	8		NO	varchar	7	21	NULL	NULL	NULL	utf
 def	information_schema	VIEWS	TABLE_CATALOG	1		NO	varchar	512	1536	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(512)				
 def	information_schema	VIEWS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
 def	information_schema	VIEWS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)				
-def	information_schema	VIEWS	VIEW_DEFINITION	4	NULL	NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
+def	information_schema	VIEWS	VIEW_DEFINITION	4		NO	longtext	4294967295	4294967295	NULL	NULL	NULL	utf8	utf8_general_ci	longtext				
 ##########################################################################
 # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH
 ##########################################################################

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

@@ -34,7 +34,7 @@ EVENT_NAME	varchar(64)	NO
 DEFINER	varchar(189)	NO			
 TIME_ZONE	varchar(64)	NO			
 EVENT_BODY	varchar(8)	NO			
-EVENT_DEFINITION	longtext	NO		NULL	
+EVENT_DEFINITION	longtext	NO			
 EVENT_TYPE	varchar(9)	NO			
 EXECUTE_AT	datetime	YES		NULL	
 INTERVAL_VALUE	varchar(256)	YES		NULL	
@@ -61,7 +61,7 @@ EVENTS	CREATE TEMPORARY TABLE `EVENTS` (
   `DEFINER` varchar(189) NOT NULL DEFAULT '',
   `TIME_ZONE` varchar(64) NOT NULL DEFAULT '',
   `EVENT_BODY` varchar(8) NOT NULL DEFAULT '',
-  `EVENT_DEFINITION` longtext NOT NULL,
+  `EVENT_DEFINITION` longtext NOT NULL DEFAULT '',
   `EVENT_TYPE` varchar(9) NOT NULL DEFAULT '',
   `EXECUTE_AT` datetime DEFAULT NULL,
   `INTERVAL_VALUE` varchar(256) DEFAULT NULL,
@@ -88,7 +88,7 @@ EVENT_NAME	varchar(64)	NO
 DEFINER	varchar(189)	NO			
 TIME_ZONE	varchar(64)	NO			
 EVENT_BODY	varchar(8)	NO			
-EVENT_DEFINITION	longtext	NO		NULL	
+EVENT_DEFINITION	longtext	NO			
 EVENT_TYPE	varchar(9)	NO			
 EXECUTE_AT	datetime	YES		NULL	
 INTERVAL_VALUE	varchar(256)	YES		NULL	

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

@@ -55,7 +55,7 @@ SECURITY_TYPE	varchar(7)	NO
 CREATED	datetime	NO		0000-00-00 00:00:00	
 LAST_ALTERED	datetime	NO		0000-00-00 00:00:00	
 SQL_MODE	varchar(8192)	NO			
-ROUTINE_COMMENT	longtext	NO		NULL	
+ROUTINE_COMMENT	longtext	NO			
 DEFINER	varchar(189)	NO			
 CHARACTER_SET_CLIENT	varchar(32)	NO			
 COLLATION_CONNECTION	varchar(32)	NO			
@@ -76,9 +76,9 @@ ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
   `DATETIME_PRECISION` bigint(21) unsigned DEFAULT NULL,
   `CHARACTER_SET_NAME` varchar(64) DEFAULT NULL,
   `COLLATION_NAME` varchar(64) DEFAULT NULL,
-  `DTD_IDENTIFIER` longtext,
+  `DTD_IDENTIFIER` longtext DEFAULT NULL,
   `ROUTINE_BODY` varchar(8) NOT NULL DEFAULT '',
-  `ROUTINE_DEFINITION` longtext,
+  `ROUTINE_DEFINITION` longtext DEFAULT NULL,
   `EXTERNAL_NAME` varchar(64) DEFAULT NULL,
   `EXTERNAL_LANGUAGE` varchar(64) DEFAULT NULL,
   `PARAMETER_STYLE` varchar(8) NOT NULL DEFAULT '',
@@ -89,7 +89,7 @@ ROUTINES	CREATE TEMPORARY TABLE `ROUTINES` (
   `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` varchar(8192) NOT NULL DEFAULT '',
-  `ROUTINE_COMMENT` longtext NOT NULL,
+  `ROUTINE_COMMENT` longtext NOT NULL DEFAULT '',
   `DEFINER` varchar(189) NOT NULL DEFAULT '',
   `CHARACTER_SET_CLIENT` varchar(32) NOT NULL DEFAULT '',
   `COLLATION_CONNECTION` varchar(32) NOT NULL DEFAULT '',
@@ -123,7 +123,7 @@ SECURITY_TYPE	varchar(7)	NO
 CREATED	datetime	NO		0000-00-00 00:00:00	
 LAST_ALTERED	datetime	NO		0000-00-00 00:00:00	
 SQL_MODE	varchar(8192)	NO			
-ROUTINE_COMMENT	longtext	NO		NULL	
+ROUTINE_COMMENT	longtext	NO			
 DEFINER	varchar(189)	NO			
 CHARACTER_SET_CLIENT	varchar(32)	NO			
 COLLATION_CONNECTION	varchar(32)	NO			

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

@@ -38,7 +38,7 @@ EVENT_OBJECT_SCHEMA	varchar(64)	NO
 EVENT_OBJECT_TABLE	varchar(64)	NO			
 ACTION_ORDER	bigint(4)	NO		0	
 ACTION_CONDITION	longtext	YES		NULL	
-ACTION_STATEMENT	longtext	NO		NULL	
+ACTION_STATEMENT	longtext	NO			
 ACTION_ORIENTATION	varchar(9)	NO			
 ACTION_TIMING	varchar(6)	NO			
 ACTION_REFERENCE_OLD_TABLE	varchar(64)	YES		NULL	
@@ -62,8 +62,8 @@ TRIGGERS	CREATE TEMPORARY TABLE `TRIGGERS` (
   `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_CONDITION` longtext DEFAULT NULL,
-  `ACTION_STATEMENT` longtext NOT NULL,
+  `ACTION_STATEMENT` longtext NOT NULL DEFAULT '',
   `ACTION_ORIENTATION` varchar(9) NOT NULL DEFAULT '',
   `ACTION_TIMING` varchar(6) NOT NULL DEFAULT '',
   `ACTION_REFERENCE_OLD_TABLE` varchar(64) DEFAULT NULL,
@@ -88,7 +88,7 @@ EVENT_OBJECT_SCHEMA	varchar(64)	NO
 EVENT_OBJECT_TABLE	varchar(64)	NO			
 ACTION_ORDER	bigint(4)	NO		0	
 ACTION_CONDITION	longtext	YES		NULL	
-ACTION_STATEMENT	longtext	NO		NULL	
+ACTION_STATEMENT	longtext	NO			
 ACTION_ORIENTATION	varchar(9)	NO			
 ACTION_TIMING	varchar(6)	NO			
 ACTION_REFERENCE_OLD_TABLE	varchar(64)	YES		NULL	

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

@@ -31,7 +31,7 @@ Field	Type	Null	Key	Default	Extra
 TABLE_CATALOG	varchar(512)	NO			
 TABLE_SCHEMA	varchar(64)	NO			
 TABLE_NAME	varchar(64)	NO			
-VIEW_DEFINITION	longtext	NO		NULL	
+VIEW_DEFINITION	longtext	NO			
 CHECK_OPTION	varchar(8)	NO			
 IS_UPDATABLE	varchar(3)	NO			
 DEFINER	varchar(189)	NO			
@@ -45,7 +45,7 @@ VIEWS	CREATE TEMPORARY TABLE `VIEWS` (
   `TABLE_CATALOG` varchar(512) NOT NULL DEFAULT '',
   `TABLE_SCHEMA` varchar(64) NOT NULL DEFAULT '',
   `TABLE_NAME` varchar(64) NOT NULL DEFAULT '',
-  `VIEW_DEFINITION` longtext NOT NULL,
+  `VIEW_DEFINITION` longtext NOT NULL DEFAULT '',
   `CHECK_OPTION` varchar(8) NOT NULL DEFAULT '',
   `IS_UPDATABLE` varchar(3) NOT NULL DEFAULT '',
   `DEFINER` varchar(189) NOT NULL DEFAULT '',
@@ -59,7 +59,7 @@ Field	Type	Null	Key	Default	Extra
 TABLE_CATALOG	varchar(512)	NO			
 TABLE_SCHEMA	varchar(64)	NO			
 TABLE_NAME	varchar(64)	NO			
-VIEW_DEFINITION	longtext	NO		NULL	
+VIEW_DEFINITION	longtext	NO			
 CHECK_OPTION	varchar(8)	NO			
 IS_UPDATABLE	varchar(3)	NO			
 DEFINER	varchar(189)	NO			

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

@@ -31,7 +31,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `COMMAND` varchar(16) NOT NULL DEFAULT '',
   `TIME` int(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext,
+  `INFO` longtext DEFAULT NULL,
   `TIME_MS` decimal(22,3) NOT NULL DEFAULT '0.000',
   `STAGE` tinyint(2) NOT NULL DEFAULT '0',
   `MAX_STAGE` tinyint(2) NOT NULL DEFAULT '0',
@@ -39,7 +39,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `MEMORY_USED` bigint(7) NOT NULL DEFAULT '0',
   `EXAMINED_ROWS` int(7) NOT NULL DEFAULT '0',
   `QUERY_ID` bigint(4) NOT NULL DEFAULT '0',
-  `INFO_BINARY` blob,
+  `INFO_BINARY` blob DEFAULT NULL,
   `TID` bigint(4) NOT NULL DEFAULT '0'
 )  DEFAULT CHARSET=utf8
 SHOW processlist;
@@ -110,7 +110,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `COMMAND` varchar(16) NOT NULL DEFAULT '',
   `TIME` int(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext,
+  `INFO` longtext DEFAULT NULL,
   `TIME_MS` decimal(22,3) NOT NULL DEFAULT '0.000',
   `STAGE` tinyint(2) NOT NULL DEFAULT '0',
   `MAX_STAGE` tinyint(2) NOT NULL DEFAULT '0',
@@ -118,7 +118,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `MEMORY_USED` bigint(7) NOT NULL DEFAULT '0',
   `EXAMINED_ROWS` int(7) NOT NULL DEFAULT '0',
   `QUERY_ID` bigint(4) NOT NULL DEFAULT '0',
-  `INFO_BINARY` blob,
+  `INFO_BINARY` blob DEFAULT NULL,
   `TID` bigint(4) NOT NULL DEFAULT '0'
 )  DEFAULT CHARSET=utf8
 SHOW processlist;

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

@@ -31,7 +31,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `COMMAND` varchar(16) NOT NULL DEFAULT '',
   `TIME` int(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext,
+  `INFO` longtext DEFAULT NULL,
   `TIME_MS` decimal(22,3) NOT NULL DEFAULT '0.000',
   `STAGE` tinyint(2) NOT NULL DEFAULT '0',
   `MAX_STAGE` tinyint(2) NOT NULL DEFAULT '0',
@@ -39,7 +39,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `MEMORY_USED` bigint(7) NOT NULL DEFAULT '0',
   `EXAMINED_ROWS` int(7) NOT NULL DEFAULT '0',
   `QUERY_ID` bigint(4) NOT NULL DEFAULT '0',
-  `INFO_BINARY` blob,
+  `INFO_BINARY` blob DEFAULT NULL,
   `TID` bigint(4) NOT NULL DEFAULT '0'
 )  DEFAULT CHARSET=utf8
 SHOW processlist;
@@ -110,7 +110,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `COMMAND` varchar(16) NOT NULL DEFAULT '',
   `TIME` int(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext,
+  `INFO` longtext DEFAULT NULL,
   `TIME_MS` decimal(22,3) NOT NULL DEFAULT '0.000',
   `STAGE` tinyint(2) NOT NULL DEFAULT '0',
   `MAX_STAGE` tinyint(2) NOT NULL DEFAULT '0',
@@ -118,7 +118,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `MEMORY_USED` bigint(7) NOT NULL DEFAULT '0',
   `EXAMINED_ROWS` int(7) NOT NULL DEFAULT '0',
   `QUERY_ID` bigint(4) NOT NULL DEFAULT '0',
-  `INFO_BINARY` blob,
+  `INFO_BINARY` blob DEFAULT NULL,
   `TID` bigint(4) NOT NULL DEFAULT '0'
 )  DEFAULT CHARSET=utf8
 SHOW processlist;

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

@@ -19,7 +19,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `COMMAND` varchar(16) NOT NULL DEFAULT '',
   `TIME` int(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext,
+  `INFO` longtext DEFAULT NULL,
   `TIME_MS` decimal(22,3) NOT NULL DEFAULT '0.000',
   `STAGE` tinyint(2) NOT NULL DEFAULT '0',
   `MAX_STAGE` tinyint(2) NOT NULL DEFAULT '0',
@@ -27,7 +27,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `MEMORY_USED` bigint(7) NOT NULL DEFAULT '0',
   `EXAMINED_ROWS` int(7) NOT NULL DEFAULT '0',
   `QUERY_ID` bigint(4) NOT NULL DEFAULT '0',
-  `INFO_BINARY` blob,
+  `INFO_BINARY` blob DEFAULT NULL,
   `TID` bigint(4) NOT NULL DEFAULT '0'
 )  DEFAULT CHARSET=utf8
 # Ensure that the information about the own connection is correct.

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

@@ -19,7 +19,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `COMMAND` varchar(16) NOT NULL DEFAULT '',
   `TIME` int(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
-  `INFO` longtext,
+  `INFO` longtext DEFAULT NULL,
   `TIME_MS` decimal(22,3) NOT NULL DEFAULT '0.000',
   `STAGE` tinyint(2) NOT NULL DEFAULT '0',
   `MAX_STAGE` tinyint(2) NOT NULL DEFAULT '0',
@@ -27,7 +27,7 @@ PROCESSLIST	CREATE TEMPORARY TABLE `PROCESSLIST` (
   `MEMORY_USED` bigint(7) NOT NULL DEFAULT '0',
   `EXAMINED_ROWS` int(7) NOT NULL DEFAULT '0',
   `QUERY_ID` bigint(4) NOT NULL DEFAULT '0',
-  `INFO_BINARY` blob,
+  `INFO_BINARY` blob DEFAULT NULL,
   `TID` bigint(4) NOT NULL DEFAULT '0'
 )  DEFAULT CHARSET=utf8
 # Ensure that the information about the own connection is correct.

mysql-test/suite/innodb/r/innodb-16k.result

@@ -376,27 +376,27 @@ CREATE INDEX t1st ON t1 (s(767), t(767));
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` blob,
+  `a` blob DEFAULT NULL,
-  `b` blob,
+  `b` blob DEFAULT NULL,
-  `c` blob,
+  `c` blob DEFAULT NULL,
-  `d` blob,
+  `d` blob DEFAULT NULL,
-  `e` blob,
+  `e` blob DEFAULT NULL,
-  `f` blob,
+  `f` blob DEFAULT NULL,
-  `g` blob,
+  `g` blob DEFAULT NULL,
-  `h` blob,
+  `h` blob DEFAULT NULL,
-  `i` blob,
+  `i` blob DEFAULT NULL,
-  `j` blob,
+  `j` blob DEFAULT NULL,
-  `k` blob,
+  `k` blob DEFAULT NULL,
-  `l` blob,
+  `l` blob DEFAULT NULL,
-  `m` blob,
+  `m` blob DEFAULT NULL,
-  `n` blob,
+  `n` blob DEFAULT NULL,
-  `o` blob,
+  `o` blob DEFAULT NULL,
-  `p` blob,
+  `p` blob DEFAULT NULL,
-  `q` blob,
+  `q` blob DEFAULT NULL,
-  `r` blob,
+  `r` blob DEFAULT NULL,
-  `s` blob,
+  `s` blob DEFAULT NULL,
-  `t` blob,
+  `t` blob DEFAULT NULL,
-  `u` blob,
+  `u` blob DEFAULT NULL,
   KEY `t1a` (`a`(767)),
   KEY `t1b` (`b`(767)),
   KEY `t1c` (`c`(767)),
@@ -508,22 +508,22 @@ CREATE INDEX ndx_p ON tlong2 (p(500));
 SHOW CREATE TABLE tlong2;
 Table	Create Table
 tlong2	CREATE TABLE `tlong2` (
-  `a` blob,
+  `a` blob DEFAULT NULL,
-  `b` blob,
+  `b` blob DEFAULT NULL,
-  `c` blob,
+  `c` blob DEFAULT NULL,
-  `d` blob,
+  `d` blob DEFAULT NULL,
-  `e` blob,
+  `e` blob DEFAULT NULL,
-  `f` blob,
+  `f` blob DEFAULT NULL,
-  `g` blob,
+  `g` blob DEFAULT NULL,
-  `h` blob,
+  `h` blob DEFAULT NULL,
-  `i` blob,
+  `i` blob DEFAULT NULL,
-  `j` blob,
+  `j` blob DEFAULT NULL,
-  `k` blob,
+  `k` blob DEFAULT NULL,
-  `l` blob,
+  `l` blob DEFAULT NULL,
-  `m` blob,
+  `m` blob DEFAULT NULL,
-  `n` blob,
+  `n` blob DEFAULT NULL,
-  `o` blob,
+  `o` blob DEFAULT NULL,
-  `p` blob,
+  `p` blob DEFAULT NULL,
   KEY `ndx_c` (`c`(500)),
   KEY `ndx_d` (`d`(500)),
   KEY `ndx_e` (`e`(500)),

mysql-test/suite/innodb/r/innodb-update-insert.result

@@ -8,7 +8,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `f1` char(1) NOT NULL,
   `f2` int(11) NOT NULL,
-  `f3` blob,
+  `f3` blob DEFAULT NULL,
   PRIMARY KEY (`f1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 insert into t1 values ('a', 0, repeat('b',8102));

mysql-test/suite/innodb/r/innodb.result

@@ -1730,7 +1730,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 create table t2 like t1;
 show create table t2;
@@ -1738,7 +1738,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 create table t3 select * from t1;
 show create table t3;
@@ -1746,7 +1746,7 @@ Table	Create Table
 t3	CREATE TABLE `t3` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 alter table t1 modify c varchar(10);
 show create table t1;
@@ -1754,7 +1754,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 alter table t1 modify v char(10);
 show create table t1;
@@ -1762,7 +1762,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` char(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 alter table t1 modify t varchar(10);
 Warnings:
@@ -1785,7 +1785,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `v` (`v`),
   KEY `c` (`c`),
   KEY `t` (`t`(10))
@@ -2006,7 +2006,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(300) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`)
@@ -2086,7 +2086,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(300) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`(30))
@@ -2166,7 +2166,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(600) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`)
@@ -2244,7 +2244,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
   KEY `t` (`t`(5))
@@ -2297,7 +2297,7 @@ Note	1246	Converting column 'v' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` mediumtext
+  `v` mediumtext DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (v varchar(65530) character set utf8);
@@ -2306,7 +2306,7 @@ Note	1246	Converting column 'v' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` mediumtext CHARACTER SET utf8
+  `v` mediumtext CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 drop table t1;
 set storage_engine=MyISAM;

mysql-test/suite/innodb/r/innodb_mysql.result

@@ -1182,7 +1182,7 @@ Warning	1071	Specified key was too long; max key length is 767 bytes
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` text,
+  `a` text DEFAULT NULL,
   KEY `a` (`a`(255))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
 drop table t1;

mysql-test/suite/innodb_fts/r/fulltext.result

@@ -240,7 +240,7 @@ show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `ticket` int(11) DEFAULT NULL,
-  `inhalt` text,
+  `inhalt` text DEFAULT NULL,
   KEY `tig` (`ticket`),
   FULLTEXT KEY `tix` (`inhalt`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1

mysql-test/suite/innodb_fts/r/innodb-fts-stopword.result

@@ -147,7 +147,7 @@ Table	Create Table
 articles	CREATE TABLE `articles` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `title` varchar(200) DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `idx` (`title`,`body`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
@@ -243,7 +243,7 @@ Table	Create Table
 articles	CREATE TABLE `articles` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `title` varchar(200) DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=latin1
 ALTER TABLE articles ADD FULLTEXT INDEX idx (title,body);
@@ -437,7 +437,7 @@ Table	Create Table
 articles	CREATE TABLE `articles` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `title` varchar(200) DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `idx` (`title`,`body`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
@@ -548,7 +548,7 @@ Table	Create Table
 articles	CREATE TABLE `articles` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `title` varchar(200) DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `idx` (`title`,`body`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1

mysql-test/suite/innodb_fts/r/innodb_fts_misc.result

@@ -16,7 +16,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `a` varchar(200) DEFAULT NULL,
-  `b` text,
+  `b` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `idx` (`a`,`b`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1
@@ -563,7 +563,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `a` varchar(200) DEFAULT NULL,
-  `b` text,
+  `b` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `idx` (`a`,`b`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1
@@ -969,7 +969,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `a` varchar(200) DEFAULT NULL,
-  `b` text,
+  `b` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `idx` (`a`,`b`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1

mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result

@@ -477,7 +477,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `a` varchar(200) DEFAULT NULL,
-  `b` text,
+  `b` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `idx` (`a`,`b`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPRESSED

mysql-test/suite/innodb_fts/r/innodb_fts_multiple_index.result

@@ -17,7 +17,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `a` varchar(200) DEFAULT NULL,
-  `b` text,
+  `b` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `idx_1` (`a`),
   FULLTEXT KEY `idx_2` (`b`)

mysql-test/suite/maria/maria.result

@@ -1024,7 +1024,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 create table t2 like t1;
 show create table t2;
@@ -1032,7 +1032,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 create table t3 select * from t1;
 show create table t3;
@@ -1040,7 +1040,7 @@ Table	Create Table
 t3	CREATE TABLE `t3` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 alter table t1 modify c varchar(10);
 show create table t1;
@@ -1048,7 +1048,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 alter table t1 modify v char(10);
 show create table t1;
@@ -1056,7 +1056,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` char(10) DEFAULT NULL,
   `c` varchar(10) DEFAULT NULL,
-  `t` text
+  `t` text DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 alter table t1 modify t varchar(10);
 Warnings:
@@ -1079,7 +1079,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `v` (`v`),
   KEY `c` (`c`),
   KEY `t` (`t`(10))
@@ -1300,7 +1300,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(300) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`)
@@ -1380,7 +1380,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(300) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`(30))
@@ -1460,7 +1460,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(600) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
   KEY `v` (`v`)
@@ -1538,7 +1538,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
-  `t` text,
+  `t` text DEFAULT NULL,
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
   KEY `t` (`t`(5))
@@ -1589,7 +1589,7 @@ Note	1246	Converting column 'v' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` mediumtext
+  `v` mediumtext DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (v varchar(65530) character set utf8);
@@ -1598,7 +1598,7 @@ Note	1246	Converting column 'v' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` mediumtext CHARACTER SET utf8
+  `v` mediumtext CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (v varchar(65535));

mysql-test/suite/maria/ps_maria.result

@@ -1783,17 +1783,17 @@ t5	CREATE TABLE `t5` (
   `const03` double NOT NULL,
   `param03` double DEFAULT NULL,
   `const04` varchar(3) NOT NULL,
-  `param04` longtext,
+  `param04` longtext DEFAULT NULL,
   `const05` varbinary(3) NOT NULL,
-  `param05` longblob,
+  `param05` longblob DEFAULT NULL,
   `const06` varchar(10) NOT NULL,
-  `param06` longtext,
+  `param06` longtext DEFAULT NULL,
   `const07` date DEFAULT NULL,
-  `param07` longtext,
+  `param07` longtext DEFAULT NULL,
   `const08` varchar(19) NOT NULL,
-  `param08` longtext,
+  `param08` longtext DEFAULT NULL,
   `const09` datetime DEFAULT NULL,
-  `param09` longtext,
+  `param09` longtext DEFAULT NULL,
   `const10` bigint(17) DEFAULT NULL,
   `param10` bigint(20) DEFAULT NULL,
   `const11` int(4) DEFAULT NULL,
@@ -1801,8 +1801,8 @@ t5	CREATE TABLE `t5` (
   `const12` binary(0) DEFAULT NULL,
   `param12` bigint(20) DEFAULT NULL,
   `param13` decimal(65,38) DEFAULT NULL,
-  `param14` longtext,
+  `param14` longtext DEFAULT NULL,
-  `param15` longblob
+  `param15` longblob DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t5 ;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

mysql-test/suite/parts/r/rpl_partition.result

@@ -130,7 +130,7 @@ Create Table	CREATE TABLE `t3` (
   `id` mediumint(9) NOT NULL AUTO_INCREMENT,
   `dt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `user` char(255) DEFAULT NULL,
-  `uuidf` longblob,
+  `uuidf` longblob DEFAULT NULL,
   `fkid` mediumint(9) DEFAULT NULL,
   `filler` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)

mysql-test/suite/perfschema/r/schema.result

@@ -182,9 +182,9 @@ events_statements_current	CREATE TABLE `events_statements_current` (
   `TIMER_END` bigint(20) unsigned DEFAULT NULL,
   `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
   `LOCK_TIME` bigint(20) unsigned NOT NULL,
-  `SQL_TEXT` longtext,
+  `SQL_TEXT` longtext DEFAULT NULL,
   `DIGEST` varchar(32) DEFAULT NULL,
-  `DIGEST_TEXT` longtext,
+  `DIGEST_TEXT` longtext DEFAULT NULL,
   `CURRENT_SCHEMA` varchar(64) DEFAULT NULL,
   `OBJECT_TYPE` varchar(64) DEFAULT NULL,
   `OBJECT_SCHEMA` varchar(64) DEFAULT NULL,
@@ -226,9 +226,9 @@ events_statements_history	CREATE TABLE `events_statements_history` (
   `TIMER_END` bigint(20) unsigned DEFAULT NULL,
   `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
   `LOCK_TIME` bigint(20) unsigned NOT NULL,
-  `SQL_TEXT` longtext,
+  `SQL_TEXT` longtext DEFAULT NULL,
   `DIGEST` varchar(32) DEFAULT NULL,
-  `DIGEST_TEXT` longtext,
+  `DIGEST_TEXT` longtext DEFAULT NULL,
   `CURRENT_SCHEMA` varchar(64) DEFAULT NULL,
   `OBJECT_TYPE` varchar(64) DEFAULT NULL,
   `OBJECT_SCHEMA` varchar(64) DEFAULT NULL,
@@ -270,9 +270,9 @@ events_statements_history_long	CREATE TABLE `events_statements_history_long` (
   `TIMER_END` bigint(20) unsigned DEFAULT NULL,
   `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
   `LOCK_TIME` bigint(20) unsigned NOT NULL,
-  `SQL_TEXT` longtext,
+  `SQL_TEXT` longtext DEFAULT NULL,
   `DIGEST` varchar(32) DEFAULT NULL,
-  `DIGEST_TEXT` longtext,
+  `DIGEST_TEXT` longtext DEFAULT NULL,
   `CURRENT_SCHEMA` varchar(64) DEFAULT NULL,
   `OBJECT_TYPE` varchar(64) DEFAULT NULL,
   `OBJECT_SCHEMA` varchar(64) DEFAULT NULL,
@@ -307,7 +307,7 @@ Table	Create Table
 events_statements_summary_by_digest	CREATE TABLE `events_statements_summary_by_digest` (
   `SCHEMA_NAME` varchar(64) DEFAULT NULL,
   `DIGEST` varchar(32) DEFAULT NULL,
-  `DIGEST_TEXT` longtext,
+  `DIGEST_TEXT` longtext DEFAULT NULL,
   `COUNT_STAR` bigint(20) unsigned NOT NULL,
   `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
   `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
@@ -1034,7 +1034,7 @@ threads	CREATE TABLE `threads` (
   `PROCESSLIST_COMMAND` varchar(16) DEFAULT NULL,
   `PROCESSLIST_TIME` bigint(20) DEFAULT NULL,
   `PROCESSLIST_STATE` varchar(64) DEFAULT NULL,
-  `PROCESSLIST_INFO` longtext,
+  `PROCESSLIST_INFO` longtext DEFAULT NULL,
   `PARENT_THREAD_ID` bigint(20) unsigned DEFAULT NULL,
   `ROLE` varchar(64) DEFAULT NULL,
   `INSTRUMENTED` enum('YES','NO') NOT NULL

mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result

@@ -657,8 +657,8 @@ Table	Create Table
 t16	CREATE TABLE `t16` (
   `c1` int(11) NOT NULL,
   `c2` decimal(8,2) DEFAULT NULL,
-  `c3` text,
+  `c3` text DEFAULT NULL,
-  `c4` blob,
+  `c4` blob DEFAULT NULL,
   `c5` char(5) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
@@ -671,8 +671,8 @@ Table	Create Table
 t16	CREATE TABLE `t16` (
   `c1` int(11) NOT NULL,
   `c2` decimal(8,2) DEFAULT NULL,
-  `c3` text,
+  `c3` text DEFAULT NULL,
-  `c4` blob,
+  `c4` blob DEFAULT NULL,
   `c5` char(5) DEFAULT NULL,
   `c6` int(11) DEFAULT '1',
   `c7` timestamp NULL DEFAULT CURRENT_TIMESTAMP,

mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result

@@ -657,8 +657,8 @@ Table	Create Table
 t16	CREATE TABLE `t16` (
   `c1` int(11) NOT NULL,
   `c2` decimal(8,2) DEFAULT NULL,
-  `c3` text,
+  `c3` text DEFAULT NULL,
-  `c4` blob,
+  `c4` blob DEFAULT NULL,
   `c5` char(5) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -671,8 +671,8 @@ Table	Create Table
 t16	CREATE TABLE `t16` (
   `c1` int(11) NOT NULL,
   `c2` decimal(8,2) DEFAULT NULL,
-  `c3` text,
+  `c3` text DEFAULT NULL,
-  `c4` blob,
+  `c4` blob DEFAULT NULL,
   `c5` char(5) DEFAULT NULL,
   `c6` int(11) DEFAULT '1',
   `c7` timestamp NULL DEFAULT CURRENT_TIMESTAMP,

mysql-test/suite/rpl/r/rpl_innodb_bug28430.result

@@ -116,7 +116,7 @@ Create Table	CREATE TABLE `byrange_tbl` (
   `id` mediumint(9) NOT NULL AUTO_INCREMENT,
   `dt` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `user` char(255) DEFAULT NULL,
-  `uuidf` longblob,
+  `uuidf` longblob DEFAULT NULL,
   `fkid` mediumint(9) DEFAULT NULL,
   `filler` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)

mysql-test/suite/rpl/r/rpl_row_UUID.result

@@ -28,7 +28,7 @@ SHOW CREATE TABLE test.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL,
-  `blob_column` longblob,
+  `blob_column` longblob DEFAULT NULL,
   `vchar_column` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1

mysql-test/suite/rpl/r/rpl_row_basic_8partition.result

@@ -108,7 +108,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` mediumint(9) NOT NULL,
   `b1` bit(8) DEFAULT NULL,
-  `vc` text,
+  `vc` text DEFAULT NULL,
   `bc` char(255) DEFAULT NULL,
   `d` decimal(10,4) DEFAULT '0.0000',
   `f` float DEFAULT '0',
@@ -129,7 +129,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` mediumint(9) NOT NULL,
   `b1` bit(8) DEFAULT NULL,
-  `vc` text,
+  `vc` text DEFAULT NULL,
   `bc` char(255) DEFAULT NULL,
   `d` decimal(10,4) DEFAULT '0.0000',
   `f` float DEFAULT '0',
@@ -287,7 +287,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` mediumint(9) NOT NULL,
   `b1` bit(8) DEFAULT NULL,
-  `vc` text,
+  `vc` text DEFAULT NULL,
   `bc` char(255) DEFAULT NULL,
   `d` decimal(10,4) DEFAULT '0.0000',
   `f` float DEFAULT '0',
@@ -305,7 +305,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` mediumint(9) NOT NULL,
   `b1` bit(8) DEFAULT NULL,
-  `vc` text,
+  `vc` text DEFAULT NULL,
   `bc` char(255) DEFAULT NULL,
   `d` decimal(10,4) DEFAULT '0.0000',
   `f` float DEFAULT '0',
@@ -453,7 +453,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` mediumint(9) NOT NULL,
   `b1` bit(8) DEFAULT NULL,
-  `vc` text,
+  `vc` text DEFAULT NULL,
   `bc` char(255) DEFAULT NULL,
   `d` decimal(10,4) DEFAULT '0.0000',
   `f` float DEFAULT '0',
@@ -469,7 +469,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` mediumint(9) NOT NULL,
   `b1` bit(8) DEFAULT NULL,
-  `vc` text,
+  `vc` text DEFAULT NULL,
   `bc` char(255) DEFAULT NULL,
   `d` decimal(10,4) DEFAULT '0.0000',
   `f` float DEFAULT '0',
@@ -698,7 +698,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` mediumint(9) NOT NULL,
   `b1` bit(8) DEFAULT NULL,
-  `vc` text,
+  `vc` text DEFAULT NULL,
   `bc` char(255) DEFAULT NULL,
   `d` decimal(10,4) DEFAULT '0.0000',
   `f` float DEFAULT '0',
@@ -715,7 +715,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` mediumint(9) NOT NULL,
   `b1` bit(8) DEFAULT NULL,
-  `vc` text,
+  `vc` text DEFAULT NULL,
   `bc` char(255) DEFAULT NULL,
   `d` decimal(10,4) DEFAULT '0.0000',
   `f` float DEFAULT '0',

mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result

@@ -2184,7 +2184,7 @@ create table t1 (a long, b datetime as (from_days(a)));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` mediumtext,
+  `a` mediumtext DEFAULT NULL,
   `b` datetime AS (from_days(a)) VIRTUAL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 insert into t1 values (730669,default);
@@ -2200,7 +2200,7 @@ create table t1 (a long, b datetime as (from_unixtime(a)));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` mediumtext,
+  `a` mediumtext DEFAULT NULL,
   `b` datetime AS (from_unixtime(a)) VIRTUAL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 insert into t1 values (1196440219,default);
@@ -2402,7 +2402,7 @@ create table t1 (a long, b time as (sec_to_time(a)));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` mediumtext,
+  `a` mediumtext DEFAULT NULL,
   `b` time AS (sec_to_time(a)) VIRTUAL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 insert into t1 values (2378,default);

mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result

@@ -2184,7 +2184,7 @@ create table t1 (a long, b datetime as (from_days(a)));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` mediumtext,
+  `a` mediumtext DEFAULT NULL,
   `b` datetime AS (from_days(a)) VIRTUAL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values (730669,default);
@@ -2200,7 +2200,7 @@ create table t1 (a long, b datetime as (from_unixtime(a)));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` mediumtext,
+  `a` mediumtext DEFAULT NULL,
   `b` datetime AS (from_unixtime(a)) VIRTUAL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values (1196440219,default);
@@ -2402,7 +2402,7 @@ create table t1 (a long, b time as (sec_to_time(a)));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` mediumtext,
+  `a` mediumtext DEFAULT NULL,
   `b` time AS (sec_to_time(a)) VIRTUAL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values (2378,default);

sql/sql_show.cc

@@ -1625,8 +1625,7 @@ static bool get_field_default_value(THD *thd, Field *field, String *def_value,
   */
   has_now_default= field->has_insert_default_function();
 
-  has_default= (field_type != FIELD_TYPE_BLOB &&
+  has_default= (!(field->flags & NO_DEFAULT_VALUE_FLAG) &&
-                !(field->flags & NO_DEFAULT_VALUE_FLAG) &&
                 field->unireg_check != Field::NEXT_NUMBER &&
                 !((thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40))
                   && has_now_default));

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_after.result

@@ -7,7 +7,7 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 ALTER TABLE diaries ADD title TEXT AFTER id;
@@ -15,8 +15,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga.");

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_first.result

@@ -7,16 +7,16 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 ALTER TABLE diaries ADD title TEXT FIRST;
 SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
-  `title` text,
+  `title` text DEFAULT NULL,
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga.");

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_multiple.result

@@ -7,7 +7,7 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries (title) VALUES ("survey");
@@ -34,10 +34,10 @@ started groonga.	3	0	groonga (2)	2014-02-09 12:19:00
 SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
-  `body` text,
+  `body` text DEFAULT NULL,
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `published` tinyint(1) DEFAULT NULL,
-  `title` text,
+  `title` text DEFAULT NULL,
   `created_at` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_add_column_plain.result

@@ -7,7 +7,7 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries (title) VALUES ("survey");
@@ -30,8 +30,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8
 DROP TABLE diaries;

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_after.result

@@ -8,8 +8,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 ALTER TABLE diaries CHANGE body description TEXT AFTER id;
@@ -17,8 +17,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `description` text,
+  `description` text DEFAULT NULL,
-  `title` text,
+  `title` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries (title, description) values ("groonga (1)", "starting groonga.");

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_first.result

@@ -8,17 +8,17 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 ALTER TABLE diaries CHANGE body description TEXT FIRST;
 SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
-  `description` text,
+  `description` text DEFAULT NULL,
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries (title, description) values ("groonga (1)", "starting groonga.");

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_multiple.result

@@ -8,8 +8,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 ALTER TABLE diaries
@@ -19,9 +19,9 @@ CHANGE id internal_id INT;
 SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
-  `description` text,
+  `description` text DEFAULT NULL,
   `internal_id` int(11) NOT NULL,
-  `subject` text,
+  `subject` text DEFAULT NULL,
   PRIMARY KEY (`internal_id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries (subject, description)

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_column_rename_no_order.result

@@ -8,8 +8,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 ALTER TABLE diaries CHANGE body description TEXT;
@@ -17,8 +17,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `description` text,
+  `description` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries (title, description) values ("groonga (1)", "starting groonga.");

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_change_engine.result

@@ -10,8 +10,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `title_index` (`title`),
   FULLTEXT KEY `body_index` (`body`)
@@ -28,8 +28,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `title_index` (`title`),
   FULLTEXT KEY `body_index` (`body`)

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_multiple.result

@@ -8,8 +8,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries (title, body) VALUES ("survey", "will start groonga!");

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_drop_column_one.result

@@ -8,8 +8,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries (title, body) VALUES ("survey", "will start groonga!");
@@ -21,7 +21,7 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8
 SELECT * FROM diaries;

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_engine_decimal.result

@@ -8,7 +8,7 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
   `temperature` decimal(6,3) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
@@ -31,7 +31,7 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
   `temperature` decimal(6,3) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_fulltext_add_normal.result

@@ -11,7 +11,7 @@ SHOW CREATE TABLE memos;
 Table	Create Table
 memos	CREATE TABLE `memos` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `content` text,
+  `content` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `content_index` (`content`)
 ) ENGINE=Mroonga AUTO_INCREMENT=4 DEFAULT CHARSET=utf8

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_after.result

@@ -8,8 +8,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga.");
@@ -21,8 +21,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `body` text,
+  `body` text DEFAULT NULL,
-  `title` text,
+  `title` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8
 INSERT INTO diaries (title, body) values ("groonga (2)", "started groonga.");

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_first.result

@@ -8,8 +8,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga.");
@@ -20,9 +20,9 @@ ALTER TABLE diaries MODIFY body TEXT FIRST;
 SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
-  `body` text,
+  `body` text DEFAULT NULL,
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8
 INSERT INTO diaries (title, body) values ("groonga (2)", "started groonga.");

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_modify_column_no_order.result

@@ -8,8 +8,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
 INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga.");
@@ -22,7 +22,7 @@ Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `title` varchar(100) DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga AUTO_INCREMENT=2 DEFAULT CHARSET=utf8
 INSERT INTO diaries (title, body) values ("groonga (2)", "started groonga.");

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_recreate_anonymous_index_at_once.result

@@ -9,8 +9,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `body` (`body`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8
@@ -39,8 +39,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `body` (`body`)
 ) ENGINE=Mroonga AUTO_INCREMENT=3 DEFAULT CHARSET=utf8

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_rename_table.result

@@ -10,8 +10,8 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `title_index` (`title`),
   FULLTEXT KEY `body_index` (`body`)
@@ -36,8 +36,8 @@ SHOW CREATE TABLE memos;
 Table	Create Table
 memos	CREATE TABLE `memos` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
-  `body` text,
+  `body` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   FULLTEXT KEY `title_index` (`title`),
   FULLTEXT KEY `body_index` (`body`)

storage/mroonga/mysql-test/mroonga/storage/r/alter_table_spatial.result

@@ -124,7 +124,7 @@ SHOW CREATE TABLE shops;
 Table	Create Table
 shops	CREATE TABLE `shops` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` text,
+  `name` text DEFAULT NULL,
   `location` geometry NOT NULL,
   PRIMARY KEY (`id`),
   SPATIAL KEY `location_index` (`location`)

storage/mroonga/mysql-test/mroonga/storage/r/column_date_with_index.result

@@ -9,7 +9,7 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
   `created_at` date DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `created_at` (`created_at`)

storage/mroonga/mysql-test/mroonga/storage/r/column_date_without_index.result

@@ -8,7 +8,7 @@ SHOW CREATE TABLE diaries;
 Table	Create Table
 diaries	CREATE TABLE `diaries` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` text,
+  `title` text DEFAULT NULL,
   `created_at` date DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=Mroonga DEFAULT CHARSET=utf8