maria-developers team mailing list archive

[knielsen@xxxxxxxxxxxxxxx]

#At lp:maria

 2857 knielsen@xxxxxxxxxxxxxxx	2010-05-02
      5.1.46 after-merge fixes: must FLUSH TABLES before copying .frm.
      modified:
        mysql-test/r/myisam.result
        mysql-test/t/myisam.test

=== modified file 'mysql-test/r/myisam.result'
--- a/mysql-test/r/myisam.result	2010-04-28 12:52:24 +0000
+++ b/mysql-test/r/myisam.result	2010-05-02 06:47:28 +0000
@@ -2379,6 +2379,7 @@ DROP TABLE t1;
 CREATE TABLE t1(a INT, b BIT(1));
 INSERT INTO t1 VALUES(1, 0), (2, 1);
 CREATE TABLE t2 SELECT * FROM t1;
+FLUSH TABLES;
 CHECKSUM TABLE t1 EXTENDED;
 Table	Checksum
 test.t1	3775188275

=== modified file 'mysql-test/t/myisam.test'
--- a/mysql-test/t/myisam.test	2010-04-28 12:52:24 +0000
+++ b/mysql-test/t/myisam.test	2010-05-02 06:47:28 +0000
@@ -1641,6 +1641,7 @@ DROP TABLE t1;
 CREATE TABLE t1(a INT, b BIT(1));
 INSERT INTO t1 VALUES(1, 0), (2, 1);
 CREATE TABLE t2 SELECT * FROM t1;
+FLUSH TABLES;
 --copy_file $MYSQLD_DATADIR/test/t1.frm $MYSQLD_DATADIR/test/t3.frm
 --copy_file $MYSQLD_DATADIR/test/t1.MYD $MYSQLD_DATADIR/test/t3.MYD
 --copy_file $MYSQLD_DATADIR/test/t1.MYI $MYSQLD_DATADIR/test/t3.MYI