diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-11-28 12:49:48 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-11-28 12:49:48 +0400 |
| commit | b908c2228d9f392f44bf0d4c2e122befdffa9cf1 (patch) | |
| tree | 16e7cabc79a0844bf84f2d2f15fae9da84e5c6f2 /mysql-test/r/delayed.result | |
| parent | f0ac4a74dfcc814b7070dc254e6cf694d086ac9d (diff) | |
| parent | 503755256d9bb4c07a4f0fd62cec5de64c7ae21a (diff) | |
| download | mariadb-git-b908c2228d9f392f44bf0d4c2e122befdffa9cf1.tar.gz | |
Merge mysql.com:/home/ram/work/b32676/b32676.5.0
into mysql.com:/home/ram/work/b32676/b32676.5.1
sql/sql_insert.cc:
Auto merged
mysql-test/r/delayed.result:
manual merge.
mysql-test/t/delayed.test:
manual merge.
Diffstat (limited to 'mysql-test/r/delayed.result')
| -rw-r--r-- | mysql-test/r/delayed.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/delayed.result b/mysql-test/r/delayed.result index 95f7fe5aa61..bcda6ddb6ab 100644 --- a/mysql-test/r/delayed.result +++ b/mysql-test/r/delayed.result @@ -250,6 +250,11 @@ SELECT HEX(a) FROM t1; HEX(a) 1 DROP TABLE t1; +CREATE TABLE t1 (a INT); +INSERT DELAYED INTO t1 SET b= b(); +ERROR 42S22: Unknown column 'b' in 'field list' +DROP TABLE t1; +End of 5.0 tests DROP TABLE IF EXISTS t1,t2; SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'; CREATE TABLE `t1` ( @@ -279,3 +284,4 @@ ERROR 22007: Incorrect date value: '0000-00-00' for column 'f1' at row 1 INSERT DELAYED INTO t2 VALUES (0,'2007-00-00'); ERROR 22007: Incorrect date value: '2007-00-00' for column 'f1' at row 1 DROP TABLE t1,t2; +End of 5.1 tests |