bzr commit into mysql-5.6-next-mr branch (magne.mahre:2946) Bug#36573

[Magne Mahre]

#At file:///data/z/mysql-next-mr-runtime/ based on revid:magne.mahre@stripped

 2946 Magne Mahre	2009-11-26
      Fix for a bug when backporting/merging Bug#36573

    modified:
      mysql-test/r/myisampack.result
      mysql-test/t/myisampack.test
=== modified file 'mysql-test/r/myisampack.result'
--- a/mysql-test/r/myisampack.result	2009-11-25 19:22:45 +0000
+++ b/mysql-test/r/myisampack.result	2009-11-26 12:47:55 +0000
@@ -115,7 +115,8 @@ ERROR 42S02: Table 'test.t3' doesn't exi
 # ===== 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;

=== modified file 'mysql-test/t/myisampack.test'
--- a/mysql-test/t/myisampack.test	2009-11-25 19:22:45 +0000
+++ b/mysql-test/t/myisampack.test	2009-11-26 12:47:55 +0000
@@ -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;
 


Attachment: [text/bzr-bundle] bzr/[e-mail]