diff options
| author | unknown <jimw@mysql.com> | 2005-11-30 13:41:40 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-11-30 13:41:40 -0800 |
| commit | 8486e64f3bced3c5cd2234587235bae970cd8a92 (patch) | |
| tree | 7fc5052923ea1c839589426f6e4d77b2e8021bd8 | |
| parent | eae62b1d34a7d4fb1583a7602949f03769fae259 (diff) | |
| download | mariadb-git-8486e64f3bced3c5cd2234587235bae970cd8a92.tar.gz | |
After-merge cleanups to alter_table test
mysql-test/r/alter_table.result:
Add drop table that got axed in merge
mysql-test/t/alter_table.test:
Fix merge
| -rw-r--r-- | mysql-test/r/alter_table.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/alter_table.test | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index 85d3bd0b2ad..5b40b250786 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -555,6 +555,7 @@ 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 (mycol int(10) not null); alter table t1 alter column mycol set default 0; desc t1; diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test index e31cdc8a869..90109c17b62 100644 --- a/mysql-test/t/alter_table.test +++ b/mysql-test/t/alter_table.test @@ -411,7 +411,7 @@ drop table t1; 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 |