diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-11 23:37:36 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-11 23:37:36 +0500 |
| commit | ee7677d125ac91429bab45d2943f531400adc4d1 (patch) | |
| tree | 0ffe74a2cf8e879f5d487faee6151ab25c97fcfa /mysql-test/r/insert_update.result | |
| parent | e7c2cbe9df27119969db17541493cf115b178eb8 (diff) | |
| download | mariadb-git-ee7677d125ac91429bab45d2943f531400adc4d1.tar.gz | |
merging fixes
mysql-test/r/insert_update.result:
result fixed
mysql-test/r/type_newdecimal.result:
result fixed
Diffstat (limited to 'mysql-test/r/insert_update.result')
| -rw-r--r-- | mysql-test/r/insert_update.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result index f6a9c2505b9..020c587959f 100644 --- a/mysql-test/r/insert_update.result +++ b/mysql-test/r/insert_update.result @@ -378,7 +378,7 @@ id c1 cnt INSERT IGNORE INTO t1 (id,c1) SELECT 1,NULL ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1; Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'c1' at row 1 +Warning 1048 Column 'c1' cannot be null Error 1048 Column 'c1' cannot be null SELECT * FROM t1; id c1 cnt @@ -386,7 +386,7 @@ id c1 cnt INSERT IGNORE INTO t1 (id,c1) SELECT * FROM t2 ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1; Warnings: -Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'c1' at row 1 +Warning 1048 Column 'c1' cannot be null Error 1048 Column 'c1' cannot be null SELECT * FROM t1; id c1 cnt |