3.23 -> 4.0 merge: after merge fixes

mysql-test/r/alter_table.result

@@ -350,11 +350,24 @@ t1	0	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE
 t1	0	PRIMARY	2	User	A	0	NULL	NULL		BTREE	
 t1	1	Host	1	Host	A	NULL	NULL	NULL		BTREE	disabled
 DROP TABLE t1;
+create table t1 (name char(15));
+insert into t1 (name) values ("current");
+create database mysqltest;
+create table mysqltest.t1 (name char(15));
+insert into mysqltest.t1 (name) values ("mysqltest");
+select * from t1;
 name
 current
+select * from mysqltest.t1;
 name
 mysqltest
+alter table t1 rename mysqltest.t1;
+Table 't1' already exists
+select * from t1;
 name
 current
+select * from mysqltest.t1;
 name
 mysqltest
+drop table t1;
+drop database mysqltest;

mysql-test/r/func_math.result

@@ -41,15 +41,21 @@ pi()	sin(pi()/2)	cos(pi()/2)	abs(tan(pi()))	cot(1)	asin(1)	acos(0)	atan(1)
 select degrees(pi()),radians(360);
 degrees(pi())	radians(360)
 180	6.2831853071796
+SELECT ACOS(1.0);
 ACOS(1.0)
 0.000000
+SELECT ASIN(1.0);
 ASIN(1.0)
 1.570796
+SELECT ACOS(0.2*5.0);
 ACOS(0.2*5.0)
 0.000000
+SELECT ACOS(0.5*2.0);
 ACOS(0.5*2.0)
 0.000000
+SELECT ASIN(0.8+0.2);
 ASIN(0.8+0.2)
 1.570796
+SELECT ASIN(1.2-0.2);
 ASIN(1.2-0.2)
 1.570796

mysql-test/r/insert_select.result

@@ -592,15 +592,34 @@ CREATE TABLE t2 ( USID INTEGER UNSIGNED AUTO_INCREMENT, ServerID TINYINT UNSIGNE
 INSERT INTO t1 VALUES (39,42,'Access-Granted','46','491721000045',2130706433,17690,NULL,NULL,'Localnet','491721000045','49172200000',754974766,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2003-07-18 00:11:21',NULL,NULL,20030718001121);
 INSERT INTO t2 SELECT USID, ServerID, State, SessionID, User, NASAddr, NASPort, NASPortType, ConnectSpeed, CarrierType, CallingStationID, CalledStationID, AssignedAddr, SessionTime, PacketsIn, OctetsIn, PacketsOut, OctetsOut, TerminateCause, UnauthTime, AccessRequestTime, AcctStartTime, AcctLastTime, LastModification from t1 LIMIT 1;
 drop table t1,t2;
+CREATE TABLE t1(
+Month date NOT NULL,
+Type tinyint(3) unsigned NOT NULL auto_increment,
+Field int(10) unsigned NOT NULL,
+Count int(10) unsigned NOT NULL,
+UNIQUE KEY Month (Month,Type,Field)
+);
+insert into t1 Values
+(20030901, 1, 1, 100),
+(20030901, 1, 2, 100),
+(20030901, 2, 1, 100),
+(20030901, 2, 2, 100),
+(20030901, 3, 1, 100);
+select * from t1;
 Month	Type	Field	Count
 2003-09-01	1	1	100
 2003-09-01	1	2	100
 2003-09-01	2	1	100
 2003-09-01	2	2	100
 2003-09-01	3	1	100
+Select null, Field, Count From t1 Where Month=20030901 and Type=2;
 NULL	Field	Count
 NULL	1	100
 NULL	2	100
+create table t2(No int not null, Field int not null, Count int not null);
+insert into t2 Select null, Field, Count From t1 Where Month=20030901 and Type=2;
+select * from t2;
 No	Field	Count
 0	1	100
 0	2	100
+drop table t1, t2;

mysql-test/t/insert_select.test

@@ -132,6 +132,8 @@ CREATE TABLE t2 ( USID INTEGER UNSIGNED AUTO_INCREMENT, ServerID TINYINT UNSIGNE
 INSERT INTO t1 VALUES (39,42,'Access-Granted','46','491721000045',2130706433,17690,NULL,NULL,'Localnet','491721000045','49172200000',754974766,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2003-07-18 00:11:21',NULL,NULL,20030718001121);
 INSERT INTO t2 SELECT USID, ServerID, State, SessionID, User, NASAddr, NASPort, NASPortType, ConnectSpeed, CarrierType, CallingStationID, CalledStationID, AssignedAddr, SessionTime, PacketsIn, OctetsIn, PacketsOut, OctetsOut, TerminateCause, UnauthTime, AccessRequestTime, AcctStartTime, AcctLastTime, LastModification from t1 LIMIT 1;
 drop table t1,t2;
+
+#
 # Another problem from Bug #2012
 #
 

sql/sql_table.cc

@@ -1490,6 +1490,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
   if (new_name)
   {
     strmov(new_name_buff,new_name);
+    strmov(new_alias= new_alias_buff, new_name);
     if (lower_case_table_names)
     {
       if (lower_case_table_names != 2)