bk commit into 4.1 tree (serg:1.2312)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
4.1 repository of serg. When serg 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
  1.2312 05/06/04 07:15:11 serg@stripped +2 -0
  after mergemerge

  mysql-test/t/create.test
    1.53 05/06/04 07:15:04 serg@stripped +1 -3
    after mergemerge

  mysql-test/r/create.result
    1.81 05/06/04 07:15:04 serg@stripped +8 -0
    after mergemerge

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-4.1

--- 1.80/mysql-test/r/create.result	Fri Jun  3 21:24:06 2005
+++ 1.81/mysql-test/r/create.result	Sat Jun  4 07:15:04 2005
@@ -563,6 +563,14 @@ select * from t2;
 b
 1
 drop table t1,t2;
+create table t1 (a int);
+create table t1 select * from t1;
+ERROR HY000: You can't specify target table 't1' for update in FROM clause
+create table t2 union = (t1) select * from t1;
+ERROR HY000: You can't specify target table 't1' for update in FROM clause
+flush tables with read lock;
+unlock tables;
+drop table t1;
 create table t1(column.name int);
 ERROR 42000: Incorrect table name 'column'
 create table t1(test.column.name int);

--- 1.52/mysql-test/t/create.test	Fri Jun  3 21:24:06 2005
+++ 1.53/mysql-test/t/create.test	Sat Jun  4 07:15:04 2005
@@ -408,12 +408,12 @@ connection user1;
 select database(), user();
 connection default;
 disconnect user1;
+use test;
 
 #
 # Test for Bug 856 'Naming a key "Primary" causes trouble'
 #
 
-use test;
 --error 1280
 create table t1 (a int, index `primary` (a));
 --error 1280
@@ -470,8 +470,6 @@ drop table t1,t2;
 # This tests two additional possible errors and a hang if 
 # an improper fix is present.
 #
-connection default;
-use test;
 create table t1 (a int);
 --error 1093
 create table t1 select * from t1;