Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

3 files changed, 20 insertions, 0 deletions

diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index f0c3e2d162a..1d6d69465da 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/r/func_math.result b/mysql-test/r/func_math.result
index b961c839510..f067d1f651e 100644
--- a/mysql-test/r/func_math.result
+++ b/mysql-test/r/func_math.result
@@ -4,8 +4,10 @@ floor(5.5)	floor(-5.5)
 select ceiling(5.5),ceiling(-5.5);
 ceiling(5.5)	ceiling(-5.5)
 6	-5
+select truncate(52.64,1),truncate(52.64,2),truncate(52.64,-1),truncate(52.64,-2), truncate(-52.64,1),truncate(-52.64,-1);
 truncate(52.64,1)	truncate(52.64,2)	truncate(52.64,-1)	truncate(52.64,-2)	truncate(-52.64,1)	truncate(-52.64,-1)
 52.6	52.64	50	0	-52.6	-50
+select round(5.5),round(-5.5);
 round(5.5)	round(-5.5)
 6	-6
 select round(5.64,1),round(5.64,2),round(5.64,-1),round(5.64,-2);
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;