Commit a9954110 authored by kostja@bodhi.(none)'s avatar kostja@bodhi.(none)
Browse files

Update test coverage for Bug#27430 "Crash in subquery code when in PS 

and table DDL changed after PREPARE" to pass in embedded mode.
parent 87a75bdf

mysql-test/r/ps.result

+18 −0
Original line number Diff line number Diff line
@@ -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.

mysql-test/r/ps_ddl.result

+4 −12
Original line number Diff line number Diff line
@@ -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



#

mysql-test/t/ps.test

+18 −0
Original line number Diff line number Diff line
@@ -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.

mysql-test/t/ps_ddl.test

+4 −13
Original line number Diff line number Diff line
@@ -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