Commit 496f421a authored by unknown's avatar unknown
Browse files

Merge moonbone.local:/mnt/gentoo64/work/27033-bug-5.0-opt-mysql 

into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql


mysql-test/r/insert_update.result:
  Auto merged
mysql-test/t/insert_update.test:
  Auto merged
sql/sql_class.h:
  Manual merge
sql/sql_insert.cc:
  Manual merge
parents b42da2dd c6ab94bd

mysql-test/r/insert_update.result

+11 −0
Original line number Diff line number Diff line
@@ -236,3 +236,14 @@ INSERT INTO t2 VALUES (1), (3); 
INSERT INTO t1 SELECT 1, COUNT(*) FROM t2 ON DUPLICATE KEY UPDATE j= a;

ERROR 42S22: Unknown column 'a' in 'field list'

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;

mysql-test/t/insert_update.test

+12 −0
Original line number Diff line number Diff line
@@ -162,3 +162,15 @@ INSERT INTO t2 VALUES (1), (3); 
--error ER_BAD_FIELD_ERROR

INSERT INTO t1 SELECT 1, COUNT(*) FROM t2 ON DUPLICATE KEY UPDATE j= a;

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;