bk commit into 5.0-community tree (cmiller:1.2429)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0-community repository of cmiller. When cmiller 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, 2007-04-16 15:00:56-04:00, cmiller@stripped +2 -0
  Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-comeng
  MERGE: 1.2392.96.26

  mysql-test/r/mysqlcheck.result@stripped, 2007-04-16 15:00:53-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.3.1.2

  mysql-test/t/mysqlcheck.test@stripped, 2007-04-16 15:00:53-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.3.1.3

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.0-comeng/RESYNC

--- 1.5/mysql-test/r/mysqlcheck.result	2007-04-04 07:47:31 -04:00
+++ 1.6/mysql-test/r/mysqlcheck.result	2007-04-16 15:00:53 -04:00
@@ -45,8 +45,33 @@ create database d_bug25347;
 use d_bug25347;
 create table t_bug25347 (a int);
 create view v_bug25347 as select * from t_bug25347;
+insert into t_bug25347 values (1),(2),(3);
+flush tables;
 removing and creating
-d_bug25347.t_bug25347                              OK
+d_bug25347.t_bug25347
+error    : Incorrect file format 't_bug25347'
+insert into t_bug25347 values (4),(5),(6);
+ERROR HY000: Incorrect file format 't_bug25347'
+d_bug25347.t_bug25347
+warning  : Number of rows changed from 0 to 3
+status   : OK
+insert into t_bug25347 values (7),(8),(9);
+select * from t_bug25347;
+a
+1
+2
+3
+7
+8
+9
+select * from v_bug25347;
+a
+1
+2
+3
+7
+8
+9
 drop view v_bug25347;
 drop table t_bug25347;
 drop database d_bug25347;

--- 1.6/mysql-test/t/mysqlcheck.test	2007-04-10 16:52:55 -04:00
+++ 1.7/mysql-test/t/mysqlcheck.test	2007-04-16 15:00:53 -04:00
@@ -38,11 +38,19 @@ create database d_bug25347;
 use d_bug25347;
 create table t_bug25347 (a int);
 create view v_bug25347 as select * from t_bug25347;
+insert into t_bug25347 values (1),(2),(3);
+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
 EOF
 --exec $MYSQL_CHECK --repair --databases d_bug25347
+--error 130
+insert into t_bug25347 values (4),(5),(6);
+--exec $MYSQL_CHECK --repair --use-frm --databases d_bug25347
+insert into t_bug25347 values (7),(8),(9);
+select * from t_bug25347;
+select * from v_bug25347;
 drop view v_bug25347;
 drop table t_bug25347;
 drop database d_bug25347;