bk commit into 5.1 tree (tulin:1.1908)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.1908 05/08/31 23:05:44 tulin@stripped +2 -0
  corrected merge error

  mysql-test/t/alter_table.test
    1.40 05/08/31 23:04:01 ndbdev@stripped +1 -0
    corrected merge error

  mysql-test/r/alter_table.result
    1.53 05/08/31 23:04:01 ndbdev@stripped +15 -14
    corrected merge error

# 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:	tulin
# Host:	dl145b.mysql.com
# Root:	/home/ndbdev/tomas/mysql-5.1

--- 1.52/mysql-test/r/alter_table.result	Wed Aug 31 20:45:43 2005
+++ 1.53/mysql-test/r/alter_table.result	Wed Aug 31 23:04:01 2005
@@ -541,6 +541,21 @@
 alter table t1 add unique ( a(1) );
 ERROR HY000: Incorrect sub part key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique sub keys
 drop table t1;
+create database mysqltest1;
+create table t1 (c1 int);
+alter table t1 rename mysqltest1.t1;
+drop table t1;
+ERROR 42S02: Unknown table 't1'
+alter table mysqltest1.t1 rename t1;
+drop table t1;
+create table t1 (c1 int);
+use mysqltest1;
+drop database mysqltest1;
+alter table test.t1 rename t1;
+ERROR 3D000: No database selected
+alter table test.t1 rename test.t1;
+use test;
+drop table t1;
 create table t1 (v varchar(32));
 insert into t1 values ('def'),('abc'),('hij'),('3r4f');
 select * from t1;
@@ -595,18 +610,4 @@
 select * from t1 where i between 2 and 4 and v in ('def','3r4f','lmn');
 i	v
 4	3r4f
-create database mysqltest1;
-create table t1 (c1 int);
-alter table t1 rename mysqltest1.t1;
-drop table t1;
-ERROR 42S02: Unknown table 't1'
-alter table mysqltest1.t1 rename t1;
-drop table t1;
-create table t1 (c1 int);
-use mysqltest1;
-drop database mysqltest1;
-alter table test.t1 rename t1;
-ERROR 3D000: No database selected
-alter table test.t1 rename test.t1;
-use test;
 drop table t1;

--- 1.39/mysql-test/t/alter_table.test	Wed Aug 31 20:43:50 2005
+++ 1.40/mysql-test/t/alter_table.test	Wed Aug 31 23:04:01 2005
@@ -428,3 +428,4 @@
 select * from t1;
 alter table t1 add unique key (i, v);
 select * from t1 where i between 2 and 4 and v in ('def','3r4f','lmn');
+drop table t1;