diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-16 22:09:10 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-16 22:09:10 +0400 |
| commit | 793c30612ac1a2736018919649973e6c3d30cfe8 (patch) | |
| tree | 9b40ddfb35af3b50d0b25f3ef372ac695ccb5c61 /mysql-test/r/insert_update.result | |
| parent | 0270e811d047d3892d7641724e5ab7ca15b37f65 (diff) | |
| parent | 43b9ff1b21b2d645e5cd52d82878a48b47b01f8d (diff) | |
| download | mariadb-git-793c30612ac1a2736018919649973e6c3d30cfe8.tar.gz | |
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
mysql-test/r/insert_update.result:
Auto merged
mysql-test/t/insert_update.test:
Auto merged
mysql-test/t/skip_grants.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_insert.cc:
merging
Diffstat (limited to 'mysql-test/r/insert_update.result')
| -rw-r--r-- | mysql-test/r/insert_update.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result index b7a5a9a65ff..c7351258266 100644 --- a/mysql-test/r/insert_update.result +++ b/mysql-test/r/insert_update.result @@ -236,6 +236,17 @@ INSERT INTO t2 VALUES (1), (3); INSERT INTO t1 SELECT 1, COUNT(*) FROM t2 ON DUPLICATE KEY UPDATE j= a; ERROR 42S22: Unknown column 'a' in 'field list' DROP TABLE t1,t2; +SET SQL_MODE = 'TRADITIONAL'; +CREATE TABLE t1 (a INT PRIMARY KEY, b INT NOT NULL); +INSERT INTO t1 (a) VALUES (1); +ERROR HY000: Field 'b' doesn't have a default value +INSERT INTO t1 (a) VALUES (1) ON DUPLICATE KEY UPDATE a = b; +ERROR HY000: Field 'b' doesn't have a default value +INSERT INTO t1 (a) VALUES (1) ON DUPLICATE KEY UPDATE b = b; +ERROR HY000: Field 'b' doesn't have a default value +SELECT * FROM t1; +a b +DROP TABLE t1; CREATE TABLE t1 (f1 INT AUTO_INCREMENT PRIMARY KEY, f2 VARCHAR(5) NOT NULL UNIQUE); INSERT t1 (f2) VALUES ('test') ON DUPLICATE KEY UPDATE f1 = LAST_INSERT_ID(f1); |