mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
410e1a72b9
without error When using quick access methods for searching rows in UPDATE or DELETE there was no check if a fatal error was not already sent to the client while evaluating the quick condition. As a result a false OK (following the error) was sent to the client and the error was thus transformed into a warning. Fixed by checking for errors sent to the client during SQL_SELECT::check_quick() and treating them as real errors. Fixed a wrong test case in group_min_max.test Fixed a wrong return code in mysql_update() and mysql_delete() mysql-test/r/bug40113.result: Bug #40013: test case mysql-test/r/group_min_max.result: Bug #40013: fixed a wrong test case mysql-test/t/bug40113-master.opt: Bug #40013: test case mysql-test/t/bug40113.test: Bug #40013: test case mysql-test/t/group_min_max.test: Bug #40013: fixed a wrong test case sql/sql_delete.cc: Bug #40113: check for errors evaluating the quick select sql/sql_update.cc: Bug #40113: check for errors evaluating the quick select
46 lines
948 B
Text
46 lines
948 B
Text
--source include/have_innodb.inc
|
|
|
|
--echo #
|
|
--echo # Bug #40113: Embedded SELECT inside UPDATE or DELETE can timeout
|
|
--echo # without error
|
|
--echo #
|
|
|
|
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
|
|
SELECT b FROM t2 WHERE b=7 FOR UPDATE;
|
|
|
|
--error ER_LOCK_WAIT_TIMEOUT
|
|
INSERT INTO t1 (a) VALUES ((SELECT a FROM t2 WHERE b=7));
|
|
|
|
--error ER_LOCK_WAIT_TIMEOUT
|
|
UPDATE t1 SET a='7000000' WHERE a=(SELECT a FROM t2 WHERE b=7);
|
|
|
|
--error ER_LOCK_WAIT_TIMEOUT
|
|
DELETE FROM t1 WHERE a=(SELECT a FROM t2 WHERE b=7);
|
|
|
|
SELECT * FROM t1;
|
|
|
|
CONNECTION default;
|
|
DISCONNECT addconroot;
|
|
|
|
DROP TABLE t2, t1;
|
|
|
|
--echo End of 5.0 tests
|