From 820bf7b1f17fbaedb1061c7c845e755e6ebc1572 Mon Sep 17 00:00:00 2001 From: Ajo Robert Date: Tue, 12 May 2015 20:27:26 +0530 Subject: [PATCH] Bug #18075170 SQL NODE RESTART REQUIRED TO AVOID DEADLOCK AFTER RESTORE Test Failure Fix. --- mysql-test/r/myisam_recover.result | 2 +- mysql-test/t/myisam_recover.test | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/myisam_recover.result b/mysql-test/r/myisam_recover.result index 3c8639e0518..0829c1e8b82 100644 --- a/mysql-test/r/myisam_recover.result +++ b/mysql-test/r/myisam_recover.result @@ -139,7 +139,7 @@ a 1 4 Warnings: -Error 145 Table './test/t1' is marked as crashed and should be repaired +Error 145 Table 't1' is marked as crashed and should be repaired Error 1194 Table 't1' is marked as crashed and should be repaired Error 1034 Number of rows changed from 1 to 2 ALTER TABLE t2 ADD val INT; diff --git a/mysql-test/t/myisam_recover.test b/mysql-test/t/myisam_recover.test index 75aa9459acb..335c5e34bf0 100644 --- a/mysql-test/t/myisam_recover.test +++ b/mysql-test/t/myisam_recover.test @@ -124,6 +124,7 @@ connection default; --echo # middle of transaction, without aborting it. connection default; +--let $MYSQL_DATA_DIR=`select @@datadir` create table t1 (a int, key(a)) engine=myisam; create table t2 (a int); @@ -150,6 +151,7 @@ select * from t2; --echo # Without fix select from t1 will break the transaction. After the fix --echo # transaction should be active and should hold lock on table t2. Alter --echo # table from con2 will wait only if the transaction is not broken. +--replace_result $MYSQL_DATA_DIR '' ./ '' test/ '' select * from t1; connect(con2, localhost, root);