bk commit into 5.1 tree (jimw:1.1993)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw 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.1993 05/11/30 13:41:40 jimw@stripped +2 -0
  After-merge cleanups to alter_table test

  mysql-test/t/alter_table.test
    1.44 05/11/30 13:41:36 jimw@stripped +1 -1
    Fix merge

  mysql-test/r/alter_table.result
    1.57 05/11/30 13:41:36 jimw@stripped +1 -0
    Add drop table that got axed in merge

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.1-clean

--- 1.56/mysql-test/r/alter_table.result	2005-11-30 12:16:57 -08:00
+++ 1.57/mysql-test/r/alter_table.result	2005-11-30 13:41:36 -08:00
@@ -555,6 +555,7 @@
 ERROR 3D000: No database selected
 alter table test.t1 rename test.t1;
 use test;
+drop table t1;
 create table t1 (mycol int(10) not null);
 alter table t1 alter column mycol set default 0;
 desc t1;

--- 1.43/mysql-test/t/alter_table.test	2005-11-30 12:16:57 -08:00
+++ 1.44/mysql-test/t/alter_table.test	2005-11-30 13:41:36 -08:00
@@ -411,7 +411,7 @@
 create table t1 (mycol int(10) not null);
 alter table t1 alter column mycol set default 0;
 desc t1;
-drop table;
+drop table t1;
 
 #
 # Some additional tests for new, faster alter table.  Note that most of the