diff options
| author | unknown <acurtis@xiphis.org> | 2005-08-10 22:17:53 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-08-10 22:17:53 +0100 |
| commit | 5329be868e6dc44bd78e5b5540b37ee8cb204513 (patch) | |
| tree | e56c88e5c44e91416f40652b7af3a1165c35b4ba /mysql-test/r/insert_update.result | |
| parent | 42fec6b68be70f65553db40c853134bee5aa7eb6 (diff) | |
| parent | fdb4d307ab8c7639ced6e08c61528bfe81823fae (diff) | |
| download | mariadb-git-5329be868e6dc44bd78e5b5540b37ee8cb204513.tar.gz | |
Merge xiphis.org:/usr/home/antony/work2/p2-bug10109.3
into xiphis.org:/usr/home/antony/work2/p2-bug10109.4
mysql-test/t/insert_update.test:
Auto merged
mysql-test/r/insert_update.result:
Auto merged
sql/sql_class.h:
discard bug10109 changes from 4.1
sql/sql_insert.cc:
merge bug10109 from 4.1 to 5.0
sql/sql_parse.cc:
discard bug10109 changes from 4.1
Diffstat (limited to 'mysql-test/r/insert_update.result')
| -rw-r--r-- | mysql-test/r/insert_update.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result index fc157093a7f..dbe5d600a95 100644 --- a/mysql-test/r/insert_update.result +++ b/mysql-test/r/insert_update.result @@ -191,3 +191,9 @@ ERROR 23000: Column 'a' in field list is ambiguous insert ignore into t1 select a from t1 on duplicate key update a=t1.a+1 ; ERROR 23000: Column 't1.a' in field list is ambiguous drop table t1; +CREATE TABLE t1 ( +a BIGINT(20) NOT NULL DEFAULT 0, +PRIMARY KEY (a) +) ENGINE=MyISAM; +INSERT INTO t1 ( a ) SELECT 0 ON DUPLICATE KEY UPDATE a = a + VALUES (a) ; +DROP TABLE t1; |