Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/media/sda1/mysql/mysql-4.1-6050


sql/sql_class.h:
  Auto merged

2 files changed, 36 insertions, 1 deletions

diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 0aba0c4672e..0950a066e64 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -375,3 +375,38 @@ rand()	cast(rand(10)*@precision as unsigned integer)	cast(rand(a)*@precision as
 -	9647622201	3845601374	6211931236
 drop table t1;
 deallocate prepare stmt;
+create database mysqltest1;
+create table t1 (a int);
+create table mysqltest1.t1 (a int);
+select * from t1, mysqltest1.t1;
+a	a
+prepare stmt from "select * from t1, mysqltest1.t1";
+execute stmt;
+a	a
+execute stmt;
+a	a
+execute stmt;
+a	a
+drop table t1;
+drop table mysqltest1.t1;
+drop database mysqltest1;
+deallocate prepare stmt;
+select '1.1' as a, '1.2' as a UNION SELECT '2.1', '2.2';
+a	a
+1.1	1.2
+2.1	2.2
+prepare stmt from
+"select '1.1' as a, '1.2' as a UNION SELECT '2.1', '2.2'";
+execute stmt;
+a	a
+1.1	1.2
+2.1	2.2
+execute stmt;
+a	a
+1.1	1.2
+2.1	2.2
+execute stmt;
+a	a
+1.1	1.2
+2.1	2.2
+deallocate prepare stmt;
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result
index 6dcdb0feab1..ccf2945d488 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -184,7 +184,7 @@ f3 int
 );
 insert into t5( f1, f2, f3) values( 9, 'recreated table', 9);
 execute stmt2 ;
-ERROR 42S22: Unknown column 't5.a' in 'field list'
+ERROR 42S22: Unknown column 'test.t5.a' in 'field list'
 drop table t5 ;
 prepare stmt1 from ' select * from t1 where a <= 2 ' ;
 execute stmt1 ;