#At file:///home/dlenev/src/bzr/mysql-5.5-runtime/ based on revid:jon.hauglid@stripped
3120 Dmitry Lenev 2010-08-25 [merge]
Merged follow-up for bug#54332 "Deadlock with two connections
doing LOCK TABLE+INSERT DELAYED" from mysql-5.5-bugfixing
into mysql-5.5-runtime.
modified:
mysql-test/r/delayed.result
mysql-test/t/delayed.test
=== modified file 'mysql-test/r/delayed.result'
--- a/mysql-test/r/delayed.result 2010-08-23 15:42:53 +0000
+++ b/mysql-test/r/delayed.result 2010-08-24 16:20:00 +0000
@@ -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);
=== modified file 'mysql-test/t/delayed.test'
--- a/mysql-test/t/delayed.test 2010-08-23 15:42:53 +0000
+++ b/mysql-test/t/delayed.test 2010-08-24 16:20:00 +0000
@@ -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
Attachment: [text/bzr-bundle] bzr/dlenev@mysql.com-20100825063628-168t2jpcsj57bwcq.bundle
Thread |
---|
• bzr commit into mysql-5.5-runtime branch (dlenev:3120) Bug#54332 | Dmitry Lenev | 25 Aug |