diff options
| author | unknown <evgen@moonbone.local> | 2007-03-31 02:57:26 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-03-31 02:57:26 +0400 |
| commit | f92433ae131d056191cd65753d56bd90c9ca5adc (patch) | |
| tree | c5c18a6504847cea21e71c597bc36f7240948d33 /mysql-test/r/insert_update.result | |
| parent | da11d8177e738ca5d35e5f29a58746400eefaf85 (diff) | |
| download | mariadb-git-f92433ae131d056191cd65753d56bd90c9ca5adc.tar.gz | |
item.cc, insert_update.result:
After merge fix.
mysql-test/r/insert_update.result:
After merge fix.
sql/item.cc:
After merge fix.
Diffstat (limited to 'mysql-test/r/insert_update.result')
| -rw-r--r-- | mysql-test/r/insert_update.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result index ce0ec7025de..fed66ed47a7 100644 --- a/mysql-test/r/insert_update.result +++ b/mysql-test/r/insert_update.result @@ -315,7 +315,7 @@ INSERT IGNORE INTO t1 (f1) VALUES ("test1"),("test4") ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id); SELECT LAST_INSERT_ID(); LAST_INSERT_ID() -1 +2 SELECT * FROM t1; id f1 1 test1 |