diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-12-11 19:28:05 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-12-11 19:28:05 +0200 |
| commit | 24e452a208adebedce6a8a418265fced66bfb027 (patch) | |
| tree | 83bc0c6e237fbd9f9dcbd2ac79f03a3b86756239 /mysql-test/r/insert_update.result | |
| parent | 8a09adb3eaf036b652b11afea7d9d86a978fa566 (diff) | |
| parent | 148587461954b544355bc808a89bfed1a70694e1 (diff) | |
| download | mariadb-git-24e452a208adebedce6a8a418265fced66bfb027.tar.gz | |
Merge with 5.1 & fixes to IGNORE handling
Diffstat (limited to 'mysql-test/r/insert_update.result')
| -rw-r--r-- | mysql-test/r/insert_update.result | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result index a285810b78b..c3acea5d11f 100644 --- a/mysql-test/r/insert_update.result +++ b/mysql-test/r/insert_update.result @@ -379,7 +379,6 @@ INSERT IGNORE INTO t1 (id,c1) SELECT 1,NULL ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1; Warnings: Warning 1048 Column 'c1' cannot be null -Error 1048 Column 'c1' cannot be null SELECT * FROM t1; id c1 cnt 1 0 2 @@ -387,7 +386,6 @@ INSERT IGNORE INTO t1 (id,c1) SELECT * FROM t2 ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1; Warnings: Warning 1048 Column 'c1' cannot be null -Error 1048 Column 'c1' cannot be null SELECT * FROM t1; id c1 cnt 1 0 3 |