1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed --ps-protocol failures of test for bug#54332 "Deadlock

Browse Source 
with two connections doing LOCK TABLE+INSERT DELAYED".

Disabled --ps-protocol for this part of the test as INSERT
DELAYED simply doesn't work with it under LOCK TABLES.
This commit is contained in:
Dmitry Lenev 2010-08-24 20:20:00 +04:00
parent 664833fa88
commit 6c50022ac8
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/delayed.result
View File

@ -348,6 +348,8 @@ DROP TABLE t1;
# #
# Bug#54332 Deadlock with two connections doing LOCK TABLE+INSERT DELAYED # Bug#54332 Deadlock with two connections doing LOCK TABLE+INSERT DELAYED
# #
# This test is not supposed to work under --ps-protocol since
# INSERT DELAYED doesn't work under LOCK TABLES with this protocol.
DROP TABLE IF EXISTS t1, t2; DROP TABLE IF EXISTS t1, t2;
CREATE TABLE t1 (a INT); CREATE TABLE t1 (a INT);
CREATE TABLE t2 (a INT); CREATE TABLE t2 (a INT);

5
mysql-test/t/delayed.test
View File

@ -394,6 +394,10 @@ DROP TABLE t1;
--echo # Bug#54332 Deadlock with two connections doing LOCK TABLE+INSERT DELAYED --echo # Bug#54332 Deadlock with two connections doing LOCK TABLE+INSERT DELAYED
--echo # --echo #
--echo # This test is not supposed to work under --ps-protocol since
--echo # INSERT DELAYED doesn't work under LOCK TABLES with this protocol.
--disable_ps_protocol
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1, t2; DROP TABLE IF EXISTS t1, t2;
--enable_warnings --enable_warnings
@ -547,3 +551,4 @@ disconnect con1;
--echo # Connection default --echo # Connection default
connection default; connection default;
DROP TABLE t1, t2, t3; DROP TABLE t1, t2, t3;
--enable_ps_protocol