diff options
| author | Dmitry Lenev <dlenev@mysql.com> | 2010-08-24 20:20:00 +0400 |
|---|---|---|
| committer | Dmitry Lenev <dlenev@mysql.com> | 2010-08-24 20:20:00 +0400 |
| commit | ab4a92f99f1289b9bcc98bd1aa5ab4d0ec2b3232 (patch) | |
| tree | 759dd358e345f228eea412014c456c88803dd402 /mysql-test | |
| parent | 1c09847b5f252baa59a3af78d003b4146473a974 (diff) | |
| download | mariadb-git-ab4a92f99f1289b9bcc98bd1aa5ab4d0ec2b3232.tar.gz | |
Fixed --ps-protocol failures of test for bug#54332 "Deadlock
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.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/delayed.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/delayed.test | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/delayed.result b/mysql-test/r/delayed.result index 871931f6b49..4cb97719ff2 100644 --- a/mysql-test/r/delayed.result +++ b/mysql-test/r/delayed.result @@ -348,6 +348,8 @@ DROP TABLE t1; # # 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; CREATE TABLE t1 (a INT); CREATE TABLE t2 (a INT); diff --git a/mysql-test/t/delayed.test b/mysql-test/t/delayed.test index c43287b48e8..5f56cdf54e1 100644 --- a/mysql-test/t/delayed.test +++ b/mysql-test/t/delayed.test @@ -394,6 +394,10 @@ DROP TABLE t1; --echo # Bug#54332 Deadlock with two connections doing LOCK TABLE+INSERT DELAYED --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 DROP TABLE IF EXISTS t1, t2; --enable_warnings @@ -547,3 +551,4 @@ disconnect con1; --echo # Connection default connection default; DROP TABLE t1, t2, t3; +--enable_ps_protocol |