From 55e9bfd4d9abd866729d488172ff50b422fe33ed Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Tue, 12 Nov 2013 02:19:27 +0400 Subject: [PATCH] Windows-specific suppression and perl problems --- mysql-test/suite/storage_engine/alter_tablespace.test | 2 +- mysql-test/suite/storage_engine/repair_table.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/storage_engine/alter_tablespace.test b/mysql-test/suite/storage_engine/alter_tablespace.test index 508639c7dc5..64ff7e09158 100644 --- a/mysql-test/suite/storage_engine/alter_tablespace.test +++ b/mysql-test/suite/storage_engine/alter_tablespace.test @@ -81,7 +81,7 @@ EOF # Adding a warning suppression based on what InnoDB currently does # when it attempts to access a table without an *.ibd file --disable_query_log - eval CALL mtr.add_suppression('$storage_engine: Error:.*'); + eval CALL mtr.add_suppression('$storage_engine: Error:'); --enable_query_log } diff --git a/mysql-test/suite/storage_engine/repair_table.inc b/mysql-test/suite/storage_engine/repair_table.inc index be3e5ba35c2..aa3b4e6304d 100644 --- a/mysql-test/suite/storage_engine/repair_table.inc +++ b/mysql-test/suite/storage_engine/repair_table.inc @@ -110,7 +110,7 @@ if ($have_default_index) while (!$my_errno) { - --error 0,1 + --error 0,2 --perl use File::Copy; @files = glob "$ENV{my_datadir}/test/t1*"; @@ -122,7 +122,7 @@ if ($have_default_index) exit 0; } # No more files - exit 1; + exit 2; EOF let $my_errno = $errno; if (!$my_errno)