Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
This commit is contained in:
commit
4c122a033a
@ -236,3 +236,14 @@ INSERT INTO t2 VALUES (1), (3);
|
|||||||
INSERT INTO t1 SELECT 1, COUNT(*) FROM t2 ON DUPLICATE KEY UPDATE j= a;
|
INSERT INTO t1 SELECT 1, COUNT(*) FROM t2 ON DUPLICATE KEY UPDATE j= a;
|
||||||
ERROR 42S22: Unknown column 'a' in 'field list'
|
ERROR 42S22: Unknown column 'a' in 'field list'
|
||||||
DROP TABLE t1,t2;
|
DROP TABLE t1,t2;
|
||||||
|
CREATE TABLE t1 (f1 INT AUTO_INCREMENT PRIMARY KEY,
|
||||||
|
f2 VARCHAR(5) NOT NULL UNIQUE);
|
||||||
|
INSERT t1 (f2) VALUES ('test') ON DUPLICATE KEY UPDATE f1 = LAST_INSERT_ID(f1);
|
||||||
|
SELECT LAST_INSERT_ID();
|
||||||
|
LAST_INSERT_ID()
|
||||||
|
1
|
||||||
|
INSERT t1 (f2) VALUES ('test') ON DUPLICATE KEY UPDATE f1 = LAST_INSERT_ID(f1);
|
||||||
|
SELECT LAST_INSERT_ID();
|
||||||
|
LAST_INSERT_ID()
|
||||||
|
1
|
||||||
|
DROP TABLE t1;
|
||||||
|
@ -162,3 +162,15 @@ INSERT INTO t2 VALUES (1), (3);
|
|||||||
--error ER_BAD_FIELD_ERROR
|
--error ER_BAD_FIELD_ERROR
|
||||||
INSERT INTO t1 SELECT 1, COUNT(*) FROM t2 ON DUPLICATE KEY UPDATE j= a;
|
INSERT INTO t1 SELECT 1, COUNT(*) FROM t2 ON DUPLICATE KEY UPDATE j= a;
|
||||||
DROP TABLE t1,t2;
|
DROP TABLE t1,t2;
|
||||||
|
|
||||||
|
#
|
||||||
|
# Bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were
|
||||||
|
# touched but not actually changed.
|
||||||
|
#
|
||||||
|
CREATE TABLE t1 (f1 INT AUTO_INCREMENT PRIMARY KEY,
|
||||||
|
f2 VARCHAR(5) NOT NULL UNIQUE);
|
||||||
|
INSERT t1 (f2) VALUES ('test') ON DUPLICATE KEY UPDATE f1 = LAST_INSERT_ID(f1);
|
||||||
|
SELECT LAST_INSERT_ID();
|
||||||
|
INSERT t1 (f2) VALUES ('test') ON DUPLICATE KEY UPDATE f1 = LAST_INSERT_ID(f1);
|
||||||
|
SELECT LAST_INSERT_ID();
|
||||||
|
DROP TABLE t1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user