summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-06-04 08:29:08 +0300
committermonty@hundin.mysql.fi <>2002-06-04 08:29:08 +0300
commitfc8490a111c7bd979e927c105e731a1c4881c0a8 (patch)
treed273a823d7f94fdea3e5775b8d8cd0b912812b0f /mysql-test
parentee6bd848804192d9bb4258ccf84b61b774190673 (diff)
parent8cba72fe1f106049b14167898f8aea2a15519065 (diff)
downloadmariadb-git-fc8490a111c7bd979e927c105e731a1c4881c0a8.tar.gz
merge with 4.0 to get last fixes to last merge
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/alter_table.result8
-rw-r--r--mysql-test/t/alter_table.test10
2 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index ab03cfde2c8..0356f14db8a 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -114,3 +114,11 @@ i
3
4
drop table t1;
+create table t1 (i int unsigned not null auto_increment primary key);
+alter table t1 rename t2;
+alter table t2 rename t1, add c char(10) comment "no comment";
+show columns from t1;
+Field Type Null Key Default Extra
+i int(10) unsigned PRI NULL auto_increment
+c char(10) YES NULL
+drop table t1;
diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test
index 22af6663e0a..2b329f3ec6e 100644
--- a/mysql-test/t/alter_table.test
+++ b/mysql-test/t/alter_table.test
@@ -105,3 +105,13 @@ insert into t1 values (null),(null),(null),(null);
alter table t1 drop i,add i int unsigned not null auto_increment, drop primary key, add primary key (i);
select * from t1;
drop table t1;
+
+#
+# Alter table and rename
+#
+
+create table t1 (i int unsigned not null auto_increment primary key);
+alter table t1 rename t2;
+alter table t2 rename t1, add c char(10) comment "no comment";
+show columns from t1;
+drop table t1;