~drizzle-trunk/drizzle/development

Merge Andrews - fix bug 673833: Embedded SELECT inside UPDATE or DELETE can timeout without error

added added

removed removed

CREATE TABLE t1 (a int, b int, PRIMARY KEY (a,b)) ENGINE=InnoDB;

INSERT INTO t1 (a,b) VALUES (1070109,99);

CREATE TABLE t2 (b int, a int, PRIMARY KEY (b)) ENGINE=InnoDB;

INSERT INTO t2 (b,a) VALUES (7,1070109);

SELECT * FROM t1;

BEGIN;

SELECT b FROM t2 WHERE b=7 FOR UPDATE;

CONNECT (addconroot, localhost, root,,);

CONNECTION addconroot;

BEGIN;

--error ER_LOCK_WAIT_TIMEOUT

DELETE FROM t1 WHERE a=(SELECT a FROM t2 WHERE b=7);

CONNECTION default;

DISCONNECT addconroot;

ROLLBACK;

DROP TABLE t2, t1;