merge with 5.1-micro

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

@@ -1,3 +1,2 @@
 CREATE TEMPORARY TABLE table_54044 ENGINE = INNODB
 AS SELECT IF(NULL  IS NOT NULL, NULL, NULL);
-ERROR HY000: Can't create table 'test.table_54044' (errno: -1)

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

@@ -2535,7 +2535,7 @@ INSERT INTO t1 VALUES (0);
 SET SQL_MODE='STRICT_ALL_TABLES';
 CREATE TABLE t2 
 SELECT LEAST((SELECT '' FROM t1),NOW()) FROM `t1`;
-ERROR 22007: Truncated incorrect datetime value: ''
+ERROR 22007: Incorrect datetime value: ''
 DROP TABLE t1;
 SET SQL_MODE=DEFAULT;
 #

mysql-test/suite/innodb/t/innodb_bug54044.test

@@ -1,10 +1,4 @@
-# This is the test for bug #54044. Special handle MYSQL_TYPE_NULL type
-# during create table, so it will not trigger assertion failure.
-
 --source include/have_innodb.inc
 
-# This 'create table' operation should fail because of
-# using NULL datatype
---error ER_CANT_CREATE_TABLE
 CREATE TEMPORARY TABLE table_54044 ENGINE = INNODB
  AS SELECT IF(NULL  IS NOT NULL, NULL, NULL);