From 57edb25c41cbe5be276fa1faf6f6b10bd5cc8b96 Mon Sep 17 00:00:00 2001 From: Magne Mahre Date: Thu, 26 Nov 2009 13:47:55 +0100 Subject: Fix for a bug when backporting/merging Bug#36573 --- mysql-test/r/myisampack.result | 3 ++- mysql-test/t/myisampack.test | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/myisampack.result b/mysql-test/r/myisampack.result index 1efde35ba9f..dd14c31f32e 100644 --- a/mysql-test/r/myisampack.result +++ b/mysql-test/r/myisampack.result @@ -115,7 +115,8 @@ ERROR 42S02: Table 'test.t3' doesn't exist # ===== myisampack.4 ===== #Tests the myisampack join operation with an existing destination .frm,.MYI,.MDI #the command should fail with exit status 2 -/data/z/mysql-next-mr-runtime/mysql-test/var/mysqld.1/data//master-data/test/t1 gave error 2 on open +myisampack: Can't create/write to file (Errcode: 17) +Aborted: file is not compressed DROP TABLE t1,t2,t3; DROP TABLE mysql_db1.t1; DROP DATABASE mysql_db1; diff --git a/mysql-test/t/myisampack.test b/mysql-test/t/myisampack.test index 6f1ac24a507..463aa559de2 100644 --- a/mysql-test/t/myisampack.test +++ b/mysql-test/t/myisampack.test @@ -214,7 +214,7 @@ SELECT COUNT(a) FROM t3; # --replace_regex /.*myisampack(\.exe)?: Can't create\/write to file .*\(/myisampack: Can't create\/write to file (/ /Aborted: .*is/Aborted: file is/ --error 2 ---exec $MYISAMPACK --join=$MYSQLD_DATADIR/test/t3 $MYSQLD_DATADIR/master-data/test/t1 $MYSQLD_DATADIR/test/t2 2>&1 +--exec $MYISAMPACK --join=$MYSQLD_DATADIR/test/t3 $MYSQLD_DATADIR/test/t1 $MYSQLD_DATADIR/test/t2 2>&1 DROP TABLE t1,t2,t3; -- cgit v1.2.1