diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2010-05-18 16:10:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2010-05-18 16:10:36 +0300 |
| commit | 7d23919fa3f8727fe6c2f82a2584f9a3c83f2adc (patch) | |
| tree | f0c3330ca21a217aaf5cb44e92dd976c5ecb5d8e /mysql-test/suite/innodb/t/innodb_bug48024.test | |
| parent | d754b571992db4f048d641808a724df4ea18adb2 (diff) | |
| download | mariadb-git-7d23919fa3f8727fe6c2f82a2584f9a3c83f2adc.tar.gz | |
Merge a change from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3468
revision-id: marko.makela@oracle.com-20100518130658-rd00ql7h02ooakh1
parent: marko.makela@oracle.com-20100514131050-mkhlvlui1u52irob
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Tue 2010-05-18 16:06:58 +0300
message:
Work around Bug #53750 in innodb_bug48024.test
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb_bug48024.test')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_bug48024.test | 2 |
1 files changed, 2 insertions, 0 deletions
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; |