Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/work-do-4.1


sql/sql_parse.cc:
  Auto merged

2 files changed, 19 insertions, 2 deletions

diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 7dc03a31878..38a8e0368c6 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -841,4 +841,13 @@ ROW(1, 1, 'a') IN (select b,a,c from t where c='b' or c='a')
 1
 select ROW(1, 1, 'a') IN (select b,a,c from t limit 2);
 This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery'
-drop table if exists t;
+drop table t;
+create table t (a int);
+insert into t values (1);
+do @a:=(SELECT a from t);
+select @a;
+@a
+1
+drop table t;
+do (SELECT a from t);
+Table 'test.t' doesn't exist
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index ba9491125a4..de07df1905b 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -462,4 +462,12 @@ select ROW(1, 2, 'a') IN (select a,b,c from t where c='b' or c='a');
 select ROW(1, 1, 'a') IN (select b,a,c from t where c='b' or c='a');
 -- error 1235
 select ROW(1, 1, 'a') IN (select b,a,c from t limit 2);
-drop table if exists t;
+drop table t;
+
+create table t (a int);
+insert into t values (1);
+do @a:=(SELECT a from t);
+select @a;
+drop table t;
+-- error 1146
+do (SELECT a from t);