bzr commit into mysql branch (kostja:2859) Bug#46610

[Konstantin Osipov]

#At file:///opt/local/work/5.4-30977-1/ based on revid:kostja@stripped

 2859 Konstantin Osipov	2009-08-14
      A follow up patch for the fix for Bug#46610 "MySQL 5.4.4: MyISAM 
      MRG engine crash on auto-repair of child".
      Due to bug 46714, there is a duplicate warning in the result
      file, and it contains a platform-specific path.
      Suppress the platform-specific output.
     @ mysql-test/r/merge_recover.result
        Update results.
     @ mysql-test/t/merge_recover.test
        Suppress platform-specific output.

    modified:
      mysql-test/r/merge_recover.result
      mysql-test/t/merge_recover.test
=== modified file 'mysql-test/r/merge_recover.result'
--- a/mysql-test/r/merge_recover.result	2009-08-13 22:17:20 +0000
+++ b/mysql-test/r/merge_recover.result	2009-08-14 11:04:35 +0000
@@ -82,7 +82,7 @@ a
 5
 6
 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 3 to 6
 #

=== modified file 'mysql-test/t/merge_recover.test'
--- a/mysql-test/t/merge_recover.test	2009-08-13 22:17:20 +0000
+++ b/mysql-test/t/merge_recover.test	2009-08-14 11:04:35 +0000
@@ -87,7 +87,7 @@ check table t1;
 --echo # and t1 is corrupted, and will be auto-repaired at open.
 --echo # Check that this doesn't lead to memory corruption.
 --echo #
---replace_result $MYSQLTEST_VARDIR . 
+--replace_regex /'.*[\/\\]/'/
 select * from t1_mrg;
 --echo #
 --echo # Cleanup


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