diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-06-07 18:13:02 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-06-07 18:13:02 +0200 |
| commit | 9b98cae4cc44fa39813675b361b7aa65d129b29d (patch) | |
| tree | 7f4baeea245f91006e88c62508c2859ed9390c2d /mysql-test/suite/innodb/r | |
| parent | 29af1aefe914da6aca73498c077f7e37a36d7de4 (diff) | |
| parent | 4d128777dde904c5f0adab9b093e854c9c580d41 (diff) | |
| download | mariadb-git-9b98cae4cc44fa39813675b361b7aa65d129b29d.tar.gz | |
merge with 5.1-micro
Diffstat (limited to 'mysql-test/suite/innodb/r')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_bug54044.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_mysql.result | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_bug54044.result b/mysql-test/suite/innodb/r/innodb_bug54044.result index 90ab812f2ae..3f607e20ddf 100644 --- a/mysql-test/suite/innodb/r/innodb_bug54044.result +++ b/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) diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index 25df971ffc7..f072c76b775 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/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; # |