1 files changed, 11 insertions, 3 deletions
diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result
index 5a02ca22392..ab6ae5e6a5a 100644
--- a/mysql-test/r/case.result
+++ b/mysql-test/r/case.result
@@ -40,15 +40,23 @@ select (CASE "two" when "one" then 1.00 WHEN "two" then 2.00 END) +0.0;
 select case 1/0 when "a" then "true" else "false" END;
 case 1/0 when "a" then "true" else "false" END
 false
+Warnings:
+Warning	1365	Division by 0
 select case 1/0 when "a" then "true" END;
 case 1/0 when "a" then "true" END
 NULL
+Warnings:
+Warning	1365	Division by 0
 select (case 1/0 when "a" then "true" END) | 0;
 (case 1/0 when "a" then "true" END) | 0
 NULL
+Warnings:
+Warning	1365	Division by 0
 select (case 1/0 when "a" then "true" END) + 0.0;
 (case 1/0 when "a" then "true" END) + 0.0
 NULL
+Warnings:
+Warning	1365	Division by 0
 select case when 1>0 then "TRUE" else "FALSE" END;
 case when 1>0 then "TRUE" else "FALSE" END
 TRUE
@@ -99,8 +107,8 @@ CASE WHEN 1 THEN 0.1e1 else '1' END AS c12
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) CHARACTER SET latin1 COLLATE latin1_danish_ci NOT NULL,
-  `c2` varchar(1) CHARACTER SET latin1 COLLATE latin1_danish_ci NOT NULL,
+  `c1` varchar(1) CHARACTER SET latin1 COLLATE latin1_danish_ci DEFAULT NULL,
+  `c2` varchar(1) CHARACTER SET latin1 COLLATE latin1_danish_ci DEFAULT NULL,
   `c3` varchar(1) NOT NULL,
   `c4` varchar(1) NOT NULL,
   `c5` varchar(4) NOT NULL,
@@ -157,7 +165,7 @@ t1	CREATE TABLE `t1` (
   `COALESCE(1,1.0)` decimal(2,1) NOT NULL,
   `COALESCE(1,'1')` varchar(1) NOT NULL,
   `COALESCE(1.1,'1')` varchar(4) NOT NULL,
-  `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL
+  `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 SELECT IFNULL('a' COLLATE latin1_swedish_ci, 'b' COLLATE latin1_bin);