From 01aba6f8f6a90f0a14c653e12fb64c20c233648b Mon Sep 17 00:00:00 2001 From: marko Date: Fri, 3 Oct 2008 09:43:35 +0000 Subject: [PATCH] branches/zip: innodb-index.test: Make the pattern for temporary table names more generic. The previous pattern could fail if other test cases were run before this one. Since r2716, the MySQL server is not restarted for this test. --- mysql-test/innodb-index.test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/innodb-index.test b/mysql-test/innodb-index.test index 84109beb5c0..d4578accf6f 100644 --- a/mysql-test/innodb-index.test +++ b/mysql-test/innodb-index.test @@ -469,20 +469,20 @@ CREATE TABLE t2( PRIMARY KEY (c1) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; ---replace_regex /'test\.#sql-[0-9a-f-]*_1'/'#sql-temporary'/ +--replace_regex /'test\.#sql-[0-9_a-f-]*'/'#sql-temporary'/ --error ER_CANT_CREATE_TABLE ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca FOREIGN KEY (c3,c2) REFERENCES t1(c1,c1); ---replace_regex /'test\.#sql-[0-9a-f-]*_1'/'#sql-temporary'/ +--replace_regex /'test\.#sql-[0-9_a-f-]*'/'#sql-temporary'/ --error ER_CANT_CREATE_TABLE ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca FOREIGN KEY (c3,c2) REFERENCES t1(c1,c2); ---replace_regex /'test\.#sql-[0-9a-f-]*_1'/'#sql-temporary'/ +--replace_regex /'test\.#sql-[0-9_a-f-]*'/'#sql-temporary'/ --error ER_CANT_CREATE_TABLE ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca FOREIGN KEY (c3,c2) REFERENCES t1(c2,c1); ALTER TABLE t1 MODIFY COLUMN c2 BIGINT(12) NOT NULL; ---replace_regex /'test\.#sql-[0-9a-f-]*_1'/'#sql-temporary'/ +--replace_regex /'test\.#sql-[0-9_a-f-]*'/'#sql-temporary'/ --error ER_CANT_CREATE_TABLE ALTER TABLE t2 ADD CONSTRAINT fk_t2_ca FOREIGN KEY (c3,c2) REFERENCES t1(c1,c2);