bk commit into 5.1 tree (kostja:1.2243)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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, 2006-07-28 18:02:38+04:00, kostja@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1
  into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
  MERGE: 1.2181.1.93

  mysql-test/r/create_not_windows.result@stripped, 2006-07-28 18:02:31+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.2.1.1

  sql/sql_base.cc@stripped, 2006-07-28 18:02:32+04:00, kostja@stripped +0 -0
    Auto merged
    MERGE: 1.334.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:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.1-runtime-merge/RESYNC

--- 1.3/mysql-test/r/create_not_windows.result	2006-07-28 18:02:46 +04:00
+++ 1.4/mysql-test/r/create_not_windows.result	2006-07-28 18:02:46 +04:00
@@ -12,3 +12,20 @@ about:text	CREATE TABLE `about:text` (
   PRIMARY KEY (`_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table `about:text`;
+use test;
+drop table if exists t1;
+create table t1(a int) engine=myisam;
+insert into t1 values(1);
+"We get an error because the table is in the definition cache"
+create table t1(a int, b int);
+ERROR 42S01: Table 't1' already exists
+"Flush the cache and recreate the table anew to be able to drop it"
+flush tables;
+show open tables like "t%";
+Database	Table	In_use	Name_locked
+create table t1(a int, b int, c int);
+"Try to select from the table. This should not crash the server"
+select count(a) from t1;
+count(a)
+0
+drop table t1;