bk commit into 6.0 tree (sergefp:1.2630)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
6.0 repository of sergefp.  When sergefp does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-01 13:15:05+04:00, sergefp@stripped +4 -0
  Fix pushbuild testcase issues

  mysql-test/r/subselect_notembedded.result@stripped, 2008-05-01 13:14:46+04:00, sergefp@stripped +6 -0
    Pushbuild fix: moving a copy of testcase for BUG#33245 into 
      subselect_notembedded.test because it does re-connect which can't be done 
      againist embedded server. 

  mysql-test/r/subselect_sj2.result@stripped, 2008-05-01 13:14:46+04:00, sergefp@stripped +1 -1
    Pushbuild fix: remove spurious warning
     

  mysql-test/t/subselect_notembedded.test@stripped, 2008-05-01 13:14:46+04:00, sergefp@stripped +13 -0
    Pushbuild fix: moving a copy of testcase for BUG#33245 into 
      subselect_notembedded.test because it does re-connect which can't be done 
      againist embedded server. 

  mysql-test/t/subselect_sj2.test@stripped, 2008-05-01 13:14:46+04:00, sergefp@stripped +1 -4
    Pushbuild fix: remove spurious warning
     

diff -Nrup a/mysql-test/r/subselect_notembedded.result b/mysql-test/r/subselect_notembedded.result
--- a/mysql-test/r/subselect_notembedded.result	2008-04-14 14:09:57 +04:00
+++ b/mysql-test/r/subselect_notembedded.result	2008-05-01 13:14:46 +04:00
@@ -37,3 +37,9 @@ insert into t1(a,b) values (1,2),(2,1),(
 1
 drop table t1;
 End of 5.1 tests
+CREATE TABLE t1 (f1 INT NOT NULL);
+CREATE VIEW v1 (a) AS SELECT f1 IN (SELECT f1 FROM t1) FROM t1;
+SELECT * FROM v1;
+a
+drop view v1;
+drop table t1;
diff -Nrup a/mysql-test/r/subselect_sj2.result b/mysql-test/r/subselect_sj2.result
--- a/mysql-test/r/subselect_sj2.result	2008-05-01 12:45:46 +04:00
+++ b/mysql-test/r/subselect_sj2.result	2008-05-01 13:14:46 +04:00
@@ -576,5 +576,5 @@ set @save_join_buffer_size=@@join_buffer
 set join_buffer_size=1;
 select * from t2 where filler1 in ( select a from t1);
 a	b	c	filler1
-set join_buffer_size=@save_join_buffer_size;
+set join_buffer_size=default;
 drop table t1, t2;
diff -Nrup a/mysql-test/t/subselect_notembedded.test b/mysql-test/t/subselect_notembedded.test
--- a/mysql-test/t/subselect_notembedded.test	2008-04-14 14:09:57 +04:00
+++ b/mysql-test/t/subselect_notembedded.test	2008-05-01 13:14:46 +04:00
@@ -55,3 +55,16 @@ while ($nesting)
 drop table t1;
 
 --echo End of 5.1 tests
+
+#
+# BUG#33245 "Crash on VIEW referencing FROM table in an IN clause"
+# (this is a second copy of testcase that uses disconnect/connect commands
+#  which increase probability of crash)
+--disconnect default
+--connect (default,localhost,root,,test)
+CREATE TABLE t1 (f1 INT NOT NULL);
+CREATE VIEW v1 (a) AS SELECT f1 IN (SELECT f1 FROM t1) FROM t1;
+SELECT * FROM v1;
+drop view v1;
+drop table t1;
+
diff -Nrup a/mysql-test/t/subselect_sj2.test b/mysql-test/t/subselect_sj2.test
--- a/mysql-test/t/subselect_sj2.test	2008-05-01 12:45:46 +04:00
+++ b/mysql-test/t/subselect_sj2.test	2008-05-01 13:14:46 +04:00
@@ -7,7 +7,6 @@ drop table if exists t0, t1, t2, t3;
 drop view if exists v1;
 --enable_warnings
 
-
 create table t0 (a int);
 insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 
@@ -704,8 +703,6 @@ DROP TABLE t1, t2, t3;
 #
 # BUG#33245 "Crash on VIEW referencing FROM table in an IN clause"
 # 
---disconnect default
---connect (default,localhost,root,,test)
 CREATE TABLE t1 (f1 INT NOT NULL);
 CREATE VIEW v1 (a) AS SELECT f1 IN (SELECT f1 FROM t1) FROM t1;
 SELECT * FROM v1;
@@ -750,6 +747,6 @@ set join_buffer_size=1;
 --enable_warnings
 
 select * from t2 where filler1 in ( select a from t1);
-set join_buffer_size=@save_join_buffer_size;
+set join_buffer_size=default;
 
 drop table t1, t2;