bk commit into 5.1 tree (kostja:1.2651) BUG#27430

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja.  When kostja 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-20 22:43:26+04:00, kostja@bodhi.(none) +4 -0
  Update test coverage for Bug#27430 "Crash in subquery code when in PS 
  and table DDL changed after PREPARE" to pass in embedded mode.

  mysql-test/r/ps.result@stripped, 2008-05-20 22:43:22+04:00, kostja@bodhi.(none) +18 -0
    Update results (Bug#27430)

  mysql-test/r/ps_ddl.result@stripped, 2008-05-20 22:43:22+04:00, kostja@bodhi.(none) +4 -12
    Update results (Bug#27430)

  mysql-test/t/ps.test@stripped, 2008-05-20 22:43:23+04:00, kostja@bodhi.(none) +18 -0
    Add a test case for Bug#27430. ps.test is not run in --embedded-server,
    thus it now contains the part of the test for Bug#27430 that
    doesn't work in embedded server.

  mysql-test/t/ps_ddl.test@stripped, 2008-05-20 22:43:23+04:00, kostja@bodhi.(none) +4 -13
    Move a part of the test for Bug#27430 that doesn't work
    in embedded server to ps.test, that includes not_embedded.inc.

diff -Nrup a/mysql-test/r/ps.result b/mysql-test/r/ps.result
--- a/mysql-test/r/ps.result	2008-02-29 02:19:35 +03:00
+++ b/mysql-test/r/ps.result	2008-05-20 22:43:22 +04:00
@@ -2902,4 +2902,22 @@ execute stmt;
 ERROR 21000: Subquery returns more than 1 row
 deallocate prepare stmt;
 drop table t1, t2;
+#
+# Bug#27430 Crash in subquery code when in PS and table DDL changed
+# after PREPARE
+#
+# This part of the test doesn't work in embedded server, this is
+# why it's here. For the main test see ps_ddl*.test
+
+drop table if exists t1;
+create table t1 (a int);
+prepare stmt from "show events where (1) in (select * from t1)";
+execute stmt;
+Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval
field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database
Collation
+drop table t1;
+create table t1 (x int);
+execute stmt;
+Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval
field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database
Collation
+drop table t1;
+deallocate prepare stmt;
 End of 5.1 tests.
diff -Nrup a/mysql-test/r/ps_ddl.result b/mysql-test/r/ps_ddl.result
--- a/mysql-test/r/ps_ddl.result	2008-04-18 23:18:51 +04:00
+++ b/mysql-test/r/ps_ddl.result	2008-05-20 22:43:22 +04:00
@@ -2124,17 +2124,9 @@ deallocate prepare stmt;
 #
 # SQLCOM_SHOW_EVENTS
 #
-drop table if exists t1;
-create table t1 (a int);
-prepare stmt from "show events where (1) in (select * from t1)";
-execute stmt;
-Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval
field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database
Collation
-drop table t1;
-create table t1 (x int);
-execute stmt;
-Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval
field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database
Collation
-drop table t1;
-deallocate prepare stmt;
+#
+# Please see this test in ps.test, it requires not_embedded.inc
+#
 #
 # SQLCOM_SET_OPTION
 #
@@ -2191,7 +2183,7 @@ drop table t1;
 deallocate prepare stmt;
 # Intermediate result: number of reprepares matches the number
 # of tests
-call p_verify_reprepare_count(18);
+call p_verify_reprepare_count(17);
 SUCCESS
 
 #
diff -Nrup a/mysql-test/t/ps.test b/mysql-test/t/ps.test
--- a/mysql-test/t/ps.test	2008-02-29 02:19:35 +03:00
+++ b/mysql-test/t/ps.test	2008-05-20 22:43:23 +04:00
@@ -2979,6 +2979,24 @@ execute stmt;
 deallocate prepare stmt;
 drop table t1, t2;
 
+--echo #
+--echo # Bug#27430 Crash in subquery code when in PS and table DDL changed
+--echo # after PREPARE
+--echo #
+--echo # This part of the test doesn't work in embedded server, this is
+--echo # why it's here. For the main test see ps_ddl*.test
+--echo
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+create table t1 (a int);
+prepare stmt from "show events where (1) in (select * from t1)";
+execute stmt;
+drop table t1;
+create table t1 (x int);
+execute stmt;
+drop table t1;
+deallocate prepare stmt;
 
 
 --echo End of 5.1 tests.
diff -Nrup a/mysql-test/t/ps_ddl.test b/mysql-test/t/ps_ddl.test
--- a/mysql-test/t/ps_ddl.test	2008-04-18 23:18:51 +04:00
+++ b/mysql-test/t/ps_ddl.test	2008-05-20 22:43:23 +04:00
@@ -1961,18 +1961,9 @@ deallocate prepare stmt;
 --echo #
 --echo # SQLCOM_SHOW_EVENTS
 --echo #
-
---disable_warnings
-drop table if exists t1;
---enable_warnings
-create table t1 (a int);
-prepare stmt from "show events where (1) in (select * from t1)";
-execute stmt;
-drop table t1;
-create table t1 (x int);
-execute stmt;
-drop table t1;
-deallocate prepare stmt;
+--echo #
+--echo # Please see this test in ps.test, it requires not_embedded.inc
+--echo #
 
 --echo #
 --echo # SQLCOM_SET_OPTION
@@ -2045,7 +2036,7 @@ drop table t1;
 deallocate prepare stmt;
 --echo # Intermediate result: number of reprepares matches the number
 --echo # of tests
-call p_verify_reprepare_count(18);
+call p_verify_reprepare_count(17);
 
 --echo #
 --echo # SQLCOM_ALTER_VIEW