Post-commit test fixes

- 12d75e61 - new thread stack size
- 99e48cb1 - warning text changed
- 6c173324 - default values for BLOBs
- c87e002b - don't return a negative zero

mysql-test/r/mysqld--help,win.rdiff

@@ -133,6 +133,6 @@
 -thread-pool-oversubscribe 3
 -thread-pool-stall-limit 500
 +thread-pool-min-threads 1
- thread-stack 296960
+ thread-stack 297984
  time-format %H:%i:%s
  timed-mutexes FALSE

mysql-test/r/mysqld--help.result

@@ -1430,7 +1430,7 @@ thread-pool-idle-timeout 60
 thread-pool-max-threads 1000
 thread-pool-oversubscribe 3
 thread-pool-stall-limit 500
-thread-stack 296960
+thread-stack 297984
 time-format %H:%i:%s
 timed-mutexes FALSE
 tmp-table-size 16777216

mysql-test/suite/engines/funcs/r/ix_drop_error.result

 DROP TABLE IF EXISTS t9;
 CREATE TABLE t9(c1 INTEGER NOT NULL);
 DROP INDEX i1 ON t9;
-ERROR 42000: Can't DROP 'i1'; check that column/key exists
+ERROR 42000: Can't DROP `i1`; check that it exists
 DROP TABLE t9;
 SHOW TABLES;
 Tables_in_test

mysql-test/suite/engines/funcs/r/ix_index_lob.result

@@ -7,7 +7,7 @@ t4
 SHOW CREATE TABLE t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
-  `c1` tinyblob,
+  `c1` tinyblob DEFAULT NULL,
   KEY `i1` (`c1`(100))
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t4;
@@ -21,7 +21,7 @@ t4
 SHOW CREATE TABLE t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
-  `c1` blob,
+  `c1` blob DEFAULT NULL,
   KEY `i1` (`c1`(100))
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t4;
@@ -35,7 +35,7 @@ t4
 SHOW CREATE TABLE t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
-  `c1` mediumblob,
+  `c1` mediumblob DEFAULT NULL,
   KEY `i1` (`c1`(100))
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t4;
@@ -49,7 +49,7 @@ t4
 SHOW CREATE TABLE t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
-  `c1` longblob,
+  `c1` longblob DEFAULT NULL,
   KEY `i1` (`c1`(100))
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t4;
@@ -63,7 +63,7 @@ t4
 SHOW CREATE TABLE t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
-  `c1` tinytext,
+  `c1` tinytext DEFAULT NULL,
   KEY `i1` (`c1`(100))
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t4;
@@ -77,7 +77,7 @@ t4
 SHOW CREATE TABLE t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
-  `c1` text,
+  `c1` text DEFAULT NULL,
   KEY `i1` (`c1`(100))
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t4;
@@ -91,7 +91,7 @@ t4
 SHOW CREATE TABLE t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
-  `c1` mediumtext,
+  `c1` mediumtext DEFAULT NULL,
   KEY `i1` (`c1`(100))
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t4;
@@ -105,7 +105,7 @@ t4
 SHOW CREATE TABLE t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
-  `c1` longtext,
+  `c1` longtext DEFAULT NULL,
   KEY `i1` (`c1`(100))
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t4;

mysql-test/suite/engines/funcs/r/ld_unique_error3.result

@@ -4,7 +4,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
-  `c2` text,
+  `c2` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 SHOW TABLES;

mysql-test/suite/engines/funcs/r/ta_add_column2.result

@@ -2832,7 +2832,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) DEFAULT NULL,
-  `c2` tinyblob
+  `c2` tinyblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -2854,7 +2854,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) DEFAULT NULL,
-  `c2` tinyblob
+  `c2` tinyblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -2876,7 +2876,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) DEFAULT NULL,
-  `c2` tinyblob
+  `c2` tinyblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -2898,7 +2898,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) DEFAULT NULL,
-  `c2` tinyblob
+  `c2` tinyblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3008,7 +3008,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) DEFAULT NULL,
-  `c2` blob
+  `c2` blob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3030,7 +3030,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) DEFAULT NULL,
-  `c2` blob
+  `c2` blob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3052,7 +3052,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) DEFAULT NULL,
-  `c2` blob
+  `c2` blob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3074,7 +3074,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) DEFAULT NULL,
-  `c2` blob
+  `c2` blob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3184,7 +3184,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) DEFAULT NULL,
-  `c2` mediumblob
+  `c2` mediumblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3206,7 +3206,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) DEFAULT NULL,
-  `c2` mediumblob
+  `c2` mediumblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3228,7 +3228,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) DEFAULT NULL,
-  `c2` mediumblob
+  `c2` mediumblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3250,7 +3250,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) DEFAULT NULL,
-  `c2` mediumblob
+  `c2` mediumblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3360,7 +3360,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) DEFAULT NULL,
-  `c2` longblob
+  `c2` longblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3382,7 +3382,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) DEFAULT NULL,
-  `c2` longblob
+  `c2` longblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3404,7 +3404,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) DEFAULT NULL,
-  `c2` longblob
+  `c2` longblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3426,7 +3426,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) DEFAULT NULL,
-  `c2` longblob
+  `c2` longblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3536,7 +3536,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) DEFAULT NULL,
-  `c2` tinytext
+  `c2` tinytext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3558,7 +3558,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) DEFAULT NULL,
-  `c2` tinytext
+  `c2` tinytext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3580,7 +3580,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) DEFAULT NULL,
-  `c2` tinytext
+  `c2` tinytext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3602,7 +3602,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) DEFAULT NULL,
-  `c2` tinytext
+  `c2` tinytext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3712,7 +3712,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) DEFAULT NULL,
-  `c2` text
+  `c2` text DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3734,7 +3734,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) DEFAULT NULL,
-  `c2` text
+  `c2` text DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3756,7 +3756,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) DEFAULT NULL,
-  `c2` text
+  `c2` text DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3778,7 +3778,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) DEFAULT NULL,
-  `c2` text
+  `c2` text DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3888,7 +3888,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) DEFAULT NULL,
-  `c2` mediumtext
+  `c2` mediumtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3910,7 +3910,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) DEFAULT NULL,
-  `c2` mediumtext
+  `c2` mediumtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3932,7 +3932,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) DEFAULT NULL,
-  `c2` mediumtext
+  `c2` mediumtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -3954,7 +3954,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) DEFAULT NULL,
-  `c2` mediumtext
+  `c2` mediumtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -4064,7 +4064,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) DEFAULT NULL,
-  `c2` longtext
+  `c2` longtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -4086,7 +4086,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) DEFAULT NULL,
-  `c2` longtext
+  `c2` longtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -4108,7 +4108,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) DEFAULT NULL,
-  `c2` longtext
+  `c2` longtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -4130,7 +4130,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) DEFAULT NULL,
-  `c2` longtext
+  `c2` longtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;

mysql-test/suite/engines/funcs/r/ta_add_column_first2.result

@@ -2831,7 +2831,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` tinyblob,
+  `c2` tinyblob DEFAULT NULL,
   `c1` char(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -2853,7 +2853,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` tinyblob,
+  `c2` tinyblob DEFAULT NULL,
   `c1` varchar(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -2875,7 +2875,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` tinyblob,
+  `c2` tinyblob DEFAULT NULL,
   `c1` binary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -2897,7 +2897,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` tinyblob,
+  `c2` tinyblob DEFAULT NULL,
   `c1` varbinary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3007,7 +3007,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` blob,
+  `c2` blob DEFAULT NULL,
   `c1` char(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3029,7 +3029,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` blob,
+  `c2` blob DEFAULT NULL,
   `c1` varchar(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3051,7 +3051,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` blob,
+  `c2` blob DEFAULT NULL,
   `c1` binary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3073,7 +3073,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` blob,
+  `c2` blob DEFAULT NULL,
   `c1` varbinary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3183,7 +3183,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` mediumblob,
+  `c2` mediumblob DEFAULT NULL,
   `c1` char(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3205,7 +3205,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` mediumblob,
+  `c2` mediumblob DEFAULT NULL,
   `c1` varchar(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3227,7 +3227,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` mediumblob,
+  `c2` mediumblob DEFAULT NULL,
   `c1` binary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3249,7 +3249,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` mediumblob,
+  `c2` mediumblob DEFAULT NULL,
   `c1` varbinary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3359,7 +3359,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` longblob,
+  `c2` longblob DEFAULT NULL,
   `c1` char(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3381,7 +3381,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` longblob,
+  `c2` longblob DEFAULT NULL,
   `c1` varchar(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3403,7 +3403,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` longblob,
+  `c2` longblob DEFAULT NULL,
   `c1` binary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3425,7 +3425,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` longblob,
+  `c2` longblob DEFAULT NULL,
   `c1` varbinary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3535,7 +3535,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` tinytext,
+  `c2` tinytext DEFAULT NULL,
   `c1` char(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3557,7 +3557,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` tinytext,
+  `c2` tinytext DEFAULT NULL,
   `c1` varchar(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3579,7 +3579,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` tinytext,
+  `c2` tinytext DEFAULT NULL,
   `c1` binary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3601,7 +3601,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` tinytext,
+  `c2` tinytext DEFAULT NULL,
   `c1` varbinary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3711,7 +3711,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` text,
+  `c2` text DEFAULT NULL,
   `c1` char(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3733,7 +3733,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` text,
+  `c2` text DEFAULT NULL,
   `c1` varchar(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3755,7 +3755,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` text,
+  `c2` text DEFAULT NULL,
   `c1` binary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3777,7 +3777,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` text,
+  `c2` text DEFAULT NULL,
   `c1` varbinary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3887,7 +3887,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` mediumtext,
+  `c2` mediumtext DEFAULT NULL,
   `c1` char(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3909,7 +3909,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` mediumtext,
+  `c2` mediumtext DEFAULT NULL,
   `c1` varchar(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3931,7 +3931,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` mediumtext,
+  `c2` mediumtext DEFAULT NULL,
   `c1` binary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -3953,7 +3953,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` mediumtext,
+  `c2` mediumtext DEFAULT NULL,
   `c1` varbinary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -4063,7 +4063,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` longtext,
+  `c2` longtext DEFAULT NULL,
   `c1` char(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -4085,7 +4085,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` longtext,
+  `c2` longtext DEFAULT NULL,
   `c1` varchar(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -4107,7 +4107,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` longtext,
+  `c2` longtext DEFAULT NULL,
   `c1` binary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
@@ -4129,7 +4129,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c2` longtext,
+  `c2` longtext DEFAULT NULL,
   `c1` varbinary(15) DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;

mysql-test/suite/engines/funcs/r/ta_add_column_middle2.result

@@ -3604,7 +3604,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` tinyblob,
+  `c4` tinyblob DEFAULT NULL,
   `c3` char(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -3632,7 +3632,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` tinyblob,
+  `c4` tinyblob DEFAULT NULL,
   `c3` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -3660,7 +3660,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` tinyblob,
+  `c4` tinyblob DEFAULT NULL,
   `c3` binary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -3688,7 +3688,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` tinyblob,
+  `c4` tinyblob DEFAULT NULL,
   `c3` varbinary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -3828,7 +3828,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` blob,
+  `c4` blob DEFAULT NULL,
   `c3` char(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -3856,7 +3856,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` blob,
+  `c4` blob DEFAULT NULL,
   `c3` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -3884,7 +3884,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` blob,
+  `c4` blob DEFAULT NULL,
   `c3` binary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -3912,7 +3912,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` blob,
+  `c4` blob DEFAULT NULL,
   `c3` varbinary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4052,7 +4052,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` mediumblob,
+  `c4` mediumblob DEFAULT NULL,
   `c3` char(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4080,7 +4080,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` mediumblob,
+  `c4` mediumblob DEFAULT NULL,
   `c3` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4108,7 +4108,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` mediumblob,
+  `c4` mediumblob DEFAULT NULL,
   `c3` binary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4136,7 +4136,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` mediumblob,
+  `c4` mediumblob DEFAULT NULL,
   `c3` varbinary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4276,7 +4276,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` longblob,
+  `c4` longblob DEFAULT NULL,
   `c3` char(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4304,7 +4304,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` longblob,
+  `c4` longblob DEFAULT NULL,
   `c3` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4332,7 +4332,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` longblob,
+  `c4` longblob DEFAULT NULL,
   `c3` binary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4360,7 +4360,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` longblob,
+  `c4` longblob DEFAULT NULL,
   `c3` varbinary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4500,7 +4500,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` tinytext,
+  `c4` tinytext DEFAULT NULL,
   `c3` char(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4528,7 +4528,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` tinytext,
+  `c4` tinytext DEFAULT NULL,
   `c3` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4556,7 +4556,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` tinytext,
+  `c4` tinytext DEFAULT NULL,
   `c3` binary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4584,7 +4584,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` tinytext,
+  `c4` tinytext DEFAULT NULL,
   `c3` varbinary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4724,7 +4724,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` text,
+  `c4` text DEFAULT NULL,
   `c3` char(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4752,7 +4752,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` text,
+  `c4` text DEFAULT NULL,
   `c3` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4780,7 +4780,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` text,
+  `c4` text DEFAULT NULL,
   `c3` binary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4808,7 +4808,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` text,
+  `c4` text DEFAULT NULL,
   `c3` varbinary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4948,7 +4948,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` mediumtext,
+  `c4` mediumtext DEFAULT NULL,
   `c3` char(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -4976,7 +4976,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` mediumtext,
+  `c4` mediumtext DEFAULT NULL,
   `c3` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -5004,7 +5004,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` mediumtext,
+  `c4` mediumtext DEFAULT NULL,
   `c3` binary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -5032,7 +5032,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` mediumtext,
+  `c4` mediumtext DEFAULT NULL,
   `c3` varbinary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -5172,7 +5172,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` char(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` longtext,
+  `c4` longtext DEFAULT NULL,
   `c3` char(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -5200,7 +5200,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varchar(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` longtext,
+  `c4` longtext DEFAULT NULL,
   `c3` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -5228,7 +5228,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` binary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` longtext,
+  `c4` longtext DEFAULT NULL,
   `c3` binary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -5256,7 +5256,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` varbinary(15) NOT NULL,
   `c2` int(11) NOT NULL,
-  `c4` longtext,
+  `c4` longtext DEFAULT NULL,
   `c3` varbinary(20) DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1

mysql-test/suite/engines/funcs/r/ta_column_to_not_null.result

@@ -342,7 +342,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` tinyblob
+  `c1` tinyblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 MODIFY c1 TINYBLOB NOT NULL;
 SHOW TABLES;
@@ -363,7 +363,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` blob
+  `c1` blob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 MODIFY c1 BLOB NOT NULL;
 SHOW TABLES;
@@ -384,7 +384,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` mediumblob
+  `c1` mediumblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 MODIFY c1 MEDIUMBLOB NOT NULL;
 SHOW TABLES;
@@ -405,7 +405,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 MODIFY c1 LONGBLOB NOT NULL;
 SHOW TABLES;
@@ -426,7 +426,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` tinytext
+  `c1` tinytext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 MODIFY c1 TINYTEXT NOT NULL;
 SHOW TABLES;
@@ -447,7 +447,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` text
+  `c1` text DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 MODIFY c1 TEXT NOT NULL;
 SHOW TABLES;
@@ -468,7 +468,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` mediumtext
+  `c1` mediumtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 MODIFY c1 MEDIUMTEXT NOT NULL;
 SHOW TABLES;
@@ -489,7 +489,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longtext
+  `c1` longtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 MODIFY c1 LONGTEXT NOT NULL;
 SHOW TABLES;
@@ -846,7 +846,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` tinyblob
+  `c1` tinyblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 CHANGE c1 c1 TINYBLOB NOT NULL;
 SHOW TABLES;
@@ -867,7 +867,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` blob
+  `c1` blob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 CHANGE c1 c1 BLOB NOT NULL;
 SHOW TABLES;
@@ -888,7 +888,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` mediumblob
+  `c1` mediumblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 CHANGE c1 c1 MEDIUMBLOB NOT NULL;
 SHOW TABLES;
@@ -909,7 +909,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 CHANGE c1 c1 LONGBLOB NOT NULL;
 SHOW TABLES;
@@ -930,7 +930,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` tinytext
+  `c1` tinytext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 CHANGE c1 c1 TINYTEXT NOT NULL;
 SHOW TABLES;
@@ -951,7 +951,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` text
+  `c1` text DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 CHANGE c1 c1 TEXT NOT NULL;
 SHOW TABLES;
@@ -972,7 +972,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` mediumtext
+  `c1` mediumtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 CHANGE c1 c1 MEDIUMTEXT NOT NULL;
 SHOW TABLES;
@@ -993,7 +993,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longtext
+  `c1` longtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 CHANGE c1 c1 LONGTEXT NOT NULL;
 SHOW TABLES;

mysql-test/suite/engines/funcs/r/ta_column_to_null.result

@@ -351,7 +351,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` tinyblob
+  `c1` tinyblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -372,7 +372,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` blob
+  `c1` blob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -393,7 +393,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` mediumblob
+  `c1` mediumblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -414,7 +414,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -435,7 +435,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` tinytext
+  `c1` tinytext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -456,7 +456,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` text
+  `c1` text DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -477,7 +477,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` mediumtext
+  `c1` mediumtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -498,7 +498,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` longtext
+  `c1` longtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -855,7 +855,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` tinyblob
+  `c1` tinyblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -876,7 +876,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` blob
+  `c1` blob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -897,7 +897,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` mediumblob
+  `c1` mediumblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -918,7 +918,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -939,7 +939,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` tinytext
+  `c1` tinytext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -960,7 +960,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` text
+  `c1` text DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -981,7 +981,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` mediumtext
+  `c1` mediumtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;
@@ -1002,7 +1002,7 @@ t2
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `c1` longtext
+  `c1` longtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;

mysql-test/suite/engines/funcs/r/tc_column_comment.result

@@ -246,7 +246,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` tinyblob COMMENT 'This is a TINYBLOB column'
+  `c1` tinyblob DEFAULT NULL COMMENT 'This is a TINYBLOB column'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -258,7 +258,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` blob COMMENT 'This is a BLOB column'
+  `c1` blob DEFAULT NULL COMMENT 'This is a BLOB column'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -270,7 +270,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` mediumblob COMMENT 'This is a MEDIUMBLOB column'
+  `c1` mediumblob DEFAULT NULL COMMENT 'This is a MEDIUMBLOB column'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -282,7 +282,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longblob COMMENT 'This is a LONGBLOB column'
+  `c1` longblob DEFAULT NULL COMMENT 'This is a LONGBLOB column'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -294,7 +294,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` tinytext COMMENT 'This is a TINYTEXT column'
+  `c1` tinytext DEFAULT NULL COMMENT 'This is a TINYTEXT column'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -306,7 +306,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` text COMMENT 'This is a TEXT column'
+  `c1` text DEFAULT NULL COMMENT 'This is a TEXT column'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -318,7 +318,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` mediumtext COMMENT 'This is a MEDIUMTEXT column'
+  `c1` mediumtext DEFAULT NULL COMMENT 'This is a MEDIUMTEXT column'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -330,7 +330,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longtext COMMENT 'This is a LONGTEXT column'
+  `c1` longtext DEFAULT NULL COMMENT 'This is a LONGTEXT column'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;

mysql-test/suite/engines/funcs/r/tc_column_null.result

@@ -246,7 +246,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` tinyblob
+  `c1` tinyblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -258,7 +258,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` blob
+  `c1` blob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -270,7 +270,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` mediumblob
+  `c1` mediumblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -282,7 +282,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -294,7 +294,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` tinytext
+  `c1` tinytext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -306,7 +306,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` text
+  `c1` text DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -318,7 +318,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` mediumtext
+  `c1` mediumtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -330,7 +330,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longtext
+  `c1` longtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;

mysql-test/suite/engines/funcs/r/tc_structure_comment.result

@@ -210,7 +210,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` tinyblob
+  `c1` tinyblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COMMENT='This table has a TINYBLOB column'
 DROP TABLE t1;
 SHOW TABLES;
@@ -222,7 +222,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` blob
+  `c1` blob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COMMENT='This table has a BLOB column'
 DROP TABLE t1;
 SHOW TABLES;
@@ -234,7 +234,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` mediumblob
+  `c1` mediumblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COMMENT='This table has a MEDIUMBLOB column'
 DROP TABLE t1;
 SHOW TABLES;
@@ -246,7 +246,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COMMENT='This table has a LONGBLOB column'
 DROP TABLE t1;
 SHOW TABLES;
@@ -258,7 +258,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` tinytext
+  `c1` tinytext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COMMENT='This table has a TINYTEXT column'
 DROP TABLE t1;
 SHOW TABLES;
@@ -270,7 +270,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` text
+  `c1` text DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COMMENT='This table has a TEXT column'
 DROP TABLE t1;
 SHOW TABLES;
@@ -282,7 +282,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` mediumtext
+  `c1` mediumtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COMMENT='This table has a MEDIUMTEXT column'
 DROP TABLE t1;
 SHOW TABLES;
@@ -294,7 +294,7 @@ t1
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` longtext
+  `c1` longtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1 COMMENT='This table has a LONGTEXT column'
 DROP TABLE t1;
 SHOW TABLES;

mysql-test/suite/engines/funcs/r/tc_structure_create_like.result

@@ -315,7 +315,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` tinyblob,
+  `c2` tinyblob DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -333,7 +333,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` blob,
+  `c2` blob DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -351,7 +351,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` mediumblob,
+  `c2` mediumblob DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -369,7 +369,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` longblob,
+  `c2` longblob DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -387,7 +387,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` tinytext,
+  `c2` tinytext DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -405,7 +405,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` text,
+  `c2` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -423,7 +423,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` mediumtext,
+  `c2` mediumtext DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -441,7 +441,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` longtext,
+  `c2` longtext DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;

mysql-test/suite/engines/funcs/r/tc_structure_create_select.result

@@ -587,7 +587,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` tinyblob,
+  `c2` tinyblob DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -603,7 +603,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` tinyblob,
+  `c2` tinyblob DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -621,7 +621,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` blob,
+  `c2` blob DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -637,7 +637,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` blob,
+  `c2` blob DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -655,7 +655,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` mediumblob,
+  `c2` mediumblob DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -671,7 +671,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` mediumblob,
+  `c2` mediumblob DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -689,7 +689,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` longblob,
+  `c2` longblob DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -705,7 +705,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` longblob,
+  `c2` longblob DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -723,7 +723,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` tinytext,
+  `c2` tinytext DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -739,7 +739,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` tinytext,
+  `c2` tinytext DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -757,7 +757,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` text,
+  `c2` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -773,7 +773,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` text,
+  `c2` text DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -791,7 +791,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` mediumtext,
+  `c2` mediumtext DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -807,7 +807,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` mediumtext,
+  `c2` mediumtext DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -825,7 +825,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` longtext,
+  `c2` longtext DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE dst;
@@ -841,7 +841,7 @@ SHOW CREATE TABLE dst;
 Table	Create Table
 dst	CREATE TABLE `dst` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
-  `c2` longtext,
+  `c2` longtext DEFAULT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE dst;

mysql-test/suite/engines/funcs/r/tc_temporary_column.result

@@ -225,7 +225,7 @@ Tables_in_test
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
-  `c1` tinyblob
+  `c1` tinyblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -236,7 +236,7 @@ Tables_in_test
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
-  `c1` blob
+  `c1` blob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -247,7 +247,7 @@ Tables_in_test
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
-  `c1` mediumblob
+  `c1` mediumblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -258,7 +258,7 @@ Tables_in_test
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
-  `c1` longblob
+  `c1` longblob DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -269,7 +269,7 @@ Tables_in_test
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
-  `c1` tinytext
+  `c1` tinytext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -280,7 +280,7 @@ Tables_in_test
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
-  `c1` text
+  `c1` text DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -291,7 +291,7 @@ Tables_in_test
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
-  `c1` mediumtext
+  `c1` mediumtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -302,7 +302,7 @@ Tables_in_test
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
-  `c1` longtext
+  `c1` longtext DEFAULT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;

mysql-test/suite/engines/iuds/r/insert_decimal.result

@@ -48,7 +48,6 @@ Warning	1264	Out of range value for column 'c2' at row 1
 Note	1265	Data truncated for column 'c3' at row 1
 insert into t2 values ("0.0","0.0","0.0",7),("-0.0","-0.0","-0.0",8),("+0.0","+0.0","+0.0",9),("01.0","01.0","01.0",10),("+01.0","+01.0","+01.0",11),("-01.0","-01.0","-01.0",12);
 Warnings:
-Warning	1264	Out of range value for column 'c2' at row 2
 Warning	1264	Out of range value for column 'c2' at row 6
 insert into t2 values ("-.1","-.1","-.1",13),("+.1","+.1","+.1",14),(".1",".1",".1",15);
 Warnings:

mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result

@@ -4687,9 +4687,9 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	THREAD_STACK
 SESSION_VALUE	NULL
-GLOBAL_VALUE	296960
+GLOBAL_VALUE	297984
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	296960
+DEFAULT_VALUE	297984
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	The stack size for each thread

mysql-test/suite/sys_vars/r/thread_stack_basic.result

 select @@global.thread_stack;
 @@global.thread_stack
-296960
+297984
 select @@session.thread_stack;
 ERROR HY000: Variable 'thread_stack' is a GLOBAL variable
 show global variables like 'thread_stack';
 Variable_name	Value
-thread_stack	296960
+thread_stack	297984
 show session variables like 'thread_stack';
 Variable_name	Value
-thread_stack	296960
+thread_stack	297984
 select * from information_schema.global_variables where variable_name='thread_stack';
 VARIABLE_NAME	VARIABLE_VALUE
-THREAD_STACK	296960
+THREAD_STACK	297984
 select * from information_schema.session_variables where variable_name='thread_stack';
 VARIABLE_NAME	VARIABLE_VALUE
-THREAD_STACK	296960
+THREAD_STACK	297984
 set global thread_stack=1;
 ERROR HY000: Variable 'thread_stack' is a read only variable
 set session thread_stack=1;