diff options
author | unknown <kostja@bodhi.(none)> | 2008-05-20 22:43:26 +0400 |
---|---|---|
committer | unknown <kostja@bodhi.(none)> | 2008-05-20 22:43:26 +0400 |
commit | 3433706a12db67c33bbc48fe9e316d79e9aea614 (patch) | |
tree | 392772f37ae153be5efea00b3f1840ee68a26dca /mysql-test/r | |
parent | 7ce32c91ba07d9b53cacbca2beb6d64064624aaf (diff) | |
download | mariadb-git-3433706a12db67c33bbc48fe9e316d79e9aea614.tar.gz |
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:
Update results (Bug#27430)
mysql-test/r/ps_ddl.result:
Update results (Bug#27430)
mysql-test/t/ps.test:
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:
Move a part of the test for Bug#27430 that doesn't work
in embedded server to ps.test, that includes not_embedded.inc.
Diffstat (limited to 'mysql-test/r')
-rw-r--r-- | mysql-test/r/ps.result | 18 | ||||
-rw-r--r-- | mysql-test/r/ps_ddl.result | 16 |
2 files changed, 22 insertions, 12 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index dbc8620398a..4cae3928097 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -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 --git a/mysql-test/r/ps_ddl.result b/mysql-test/r/ps_ddl.result index 9e1db062368..a47c01cca17 100644 --- a/mysql-test/r/ps_ddl.result +++ b/mysql-test/r/ps_ddl.result @@ -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 # |