From f92433ae131d056191cd65753d56bd90c9ca5adc Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 31 Mar 2007 02:57:26 +0400 Subject: item.cc, insert_update.result: After merge fix. mysql-test/r/insert_update.result: After merge fix. sql/item.cc: After merge fix. --- mysql-test/r/insert_update.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/r/insert_update.result') 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 -- cgit v1.2.1