From 7d23919fa3f8727fe6c2f82a2584f9a3c83f2adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 18 May 2010 16:10:36 +0300 Subject: [PATCH] Merge a change from mysql-5.1-innodb: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------------------------------------------------------ revno: 3468 revision-id: marko.makela@oracle.com-20100518130658-rd00ql7h02ooakh1 parent: marko.makela@oracle.com-20100514131050-mkhlvlui1u52irob committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Tue 2010-05-18 16:06:58 +0300 message: Work around Bug #53750 in innodb_bug48024.test --- mysql-test/suite/innodb/t/innodb_bug48024.test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/suite/innodb/t/innodb_bug48024.test b/mysql-test/suite/innodb/t/innodb_bug48024.test index 00d76beb89d..db828aa1cda 100644 --- a/mysql-test/suite/innodb/t/innodb_bug48024.test +++ b/mysql-test/suite/innodb/t/innodb_bug48024.test @@ -10,6 +10,8 @@ ADD CONSTRAINT FOREIGN KEY(b) REFERENCES bug48024_b(b); DROP TABLE bug48024,bug48024_b; +# Work around Bug #53750 (failure in mysql-test-run --ps-protocol) +-- disable_ps_protocol delimiter |; CREATE TABLE bug48024(a int PRIMARY KEY,b int NOT NULL,KEY(b)) ENGINE=InnoDB; CREATE TABLE bug48024_b(b int PRIMARY KEY) ENGINE=InnoDB;