bk commit into 5.0 tree (monty:1.2494)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty 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-06-20 19:25:44+03:00, monty@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/my/mysql-5.0
  MERGE: 1.2475.76.1

  mysql-test/r/innodb_mysql.result@stripped, 2007-06-20 19:25:43+03:00, monty@stripped +0 -0
    SCCS merged
    MERGE: 1.22.1.1

  mysql-test/t/innodb_mysql.test@stripped, 2007-06-20 19:25:43+03:00, monty@stripped +0 -0
    SCCS merged
    MERGE: 1.22.1.1

# 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:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.0/RESYNC

--- 1.23/mysql-test/r/innodb_mysql.result	2007-06-14 14:39:42 +03:00
+++ 1.24/mysql-test/r/innodb_mysql.result	2007-06-20 19:25:43 +03:00
@@ -661,4 +661,12 @@ UPDATE t3 SET a = 'us' WHERE a = 'uk';
 SELECT * FROM t3 WHERE a = 'uk';
 a
 DROP TABLE t1,t2,t3;
+create table t1 (a int) engine=innodb;
+select * from t2;
+ERROR 42S02: Table 'test.t2' doesn't exist
+drop table t1;
+drop table t2;
+ERROR 42S02: Unknown table 't2'
+create table t2 (a int);
+drop table t2;
 End of 5.0 tests

--- 1.23/mysql-test/t/innodb_mysql.test	2007-06-14 14:40:23 +03:00
+++ 1.24/mysql-test/t/innodb_mysql.test	2007-06-20 19:25:43 +03:00
@@ -636,4 +636,18 @@ SELECT * FROM t3 WHERE a = 'uk';
 
 DROP TABLE t1,t2,t3;
 
+#
+# Test bug when trying to drop data file which no InnoDB directory entry
+#
+
+create table t1 (a int) engine=innodb;
+copy_file $MYSQLTEST_VARDIR/master-data/test/t1.frm $MYSQLTEST_VARDIR/master-data/test/t2.frm;
+--error 1146
+select * from t2;
+drop table t1;
+--error 1051
+drop table t2;
+create table t2 (a int);
+drop table t2;
+
 --echo End of 5.0 tests