diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-08 09:50:56 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-08 10:19:55 +0200 |
| commit | c761b43451d54eeeecdf3c102906fcce88d4e9d9 (patch) | |
| tree | c00b07bf4b36108f1ecbfc3015b5594899e0e248 /mysql-test/suite/innodb/r/innodb_mysql.result | |
| parent | 07e4853c232726a639b30d4718bef9914ea42d24 (diff) | |
| parent | bac2ec3a5b28ed590826b20a4cf27fd788903bbd (diff) | |
| download | mariadb-git-c761b43451d54eeeecdf3c102906fcce88d4e9d9.tar.gz | |
Merge 10.3 into 10.4mariadb-10.4.0
Diffstat (limited to 'mysql-test/suite/innodb/r/innodb_mysql.result')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_mysql.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index 3663c18ea44..b4e0f090e5d 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/mysql-test/suite/innodb/r/innodb_mysql.result @@ -3126,7 +3126,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: Incorrect datetime value: '' +ERROR 22007: Truncated incorrect datetime value: '' DROP TABLE t1; SET SQL_MODE=DEFAULT; # |