From be7c84c7e7d441b9a28f8a956feb87884d02202b Mon Sep 17 00:00:00 2001
From: unknown <knielsen@knielsen-hq.org>
Date: Sun, 2 May 2010 08:47:28 +0200
Subject: [PATCH] 5.1.46 after-merge fixes: must FLUSH TABLES before copying
 .frm.

---
 mysql-test/r/myisam.result | 1 +
 mysql-test/t/myisam.test   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index ab5f52ed876..ccfb223dfcc 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -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
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index 27b5a38978b..d498d4e95ad 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -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