bk commit into 5.0 tree (tsmith:1.2567) BUG#25347

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith.  When tsmith does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-01-27 14:28:50-07:00, tsmith@stripped +2 -0
  Fix test case for Bug #25347 so that it actually tests the code fix,
  and so that it works correctly on Windows.

  mysql-test/r/mysqlcheck.result@stripped, 2008-01-27 14:28:49-07:00, tsmith@stripped
+1 -0
    Flush tables before monkeying around with underlying MyISAM data files

  mysql-test/t/mysqlcheck.test@stripped, 2008-01-27 14:28:49-07:00, tsmith@stripped
+2 -1
    Fix the test case for bug #25347 so that it actually does test the behavior.
    Also, this makes it work on Windows by ensuring that mysqld doesn't hold the
    underlying MyISAM files open while we try to corrupt them on disk.
    
    Flush tables before monkeying around with underlying MyISAM data files;
    --use-frm, so that mysqlcheck will succeed.

diff -Nrup a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result
--- a/mysql-test/r/mysqlcheck.result	2008-01-23 09:37:44 -07:00
+++ b/mysql-test/r/mysqlcheck.result	2008-01-27 14:28:49 -07:00
@@ -50,6 +50,7 @@ create database d_bug25347;
 use d_bug25347;
 create table t_bug25347 (a int);
 create view v_bug25347 as select * from t_bug25347;
+flush tables;
 removing and creating
 d_bug25347.t_bug25347                              OK
 drop view v_bug25347;
diff -Nrup a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test
--- a/mysql-test/t/mysqlcheck.test	2008-01-25 16:00:11 -07:00
+++ b/mysql-test/t/mysqlcheck.test	2008-01-27 14:28:49 -07:00
@@ -47,11 +47,12 @@ create database d_bug25347;
 use d_bug25347;
 create table t_bug25347 (a int);
 create view v_bug25347 as select * from t_bug25347;
+flush tables;
 --echo removing and creating
 --remove_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI
 --write_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI
 EOF
---exec $MYSQL_CHECK --repair --databases d_bug25347
+--exec $MYSQL_CHECK --repair --databases --use-frm d_bug25347
 drop view v_bug25347;
 drop table t_bug25347;
 drop database d_bug25347;