diff options
| author | dlenev@mysql.com <> | 2005-06-20 16:58:02 +0400 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2005-06-20 16:58:02 +0400 |
| commit | e28264d29f7fda6d2d3ed6b7dec540f07b84275f (patch) | |
| tree | 2402fd9354a4e624c7e01a7a8b2b9457be765370 /mysql-test | |
| parent | b875f7902d1b5960d7274351c7143d77656e1c78 (diff) | |
| parent | b5b3b32d0a7e1577347f4250cb1407d16dbf1316 (diff) | |
| download | mariadb-git-e28264d29f7fda6d2d3ed6b7dec540f07b84275f.tar.gz | |
Manual merge of patch for bug#11060 "Server crashes on calling stored
procedure with INSERT SELECT UNION SELECT" aka "Server crashes on
re-execution of prepared INSERT ... SELECT with UNION" into 5.0 tree.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ps.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/ps.test | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 496d566a5ee..290d264174e 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -675,3 +675,9 @@ a 10 drop table t1; deallocate prepare stmt; +create table t1 (id int); +prepare stmt from "insert into t1 (id) select id from t1 union select id from t1"; +execute stmt; +execute stmt; +deallocate prepare stmt; +drop table t1; diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index 60b77576572..415185d825b 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -693,3 +693,15 @@ execute stmt using @offset, @limit, @offset, @limit, @limit; drop table t1; deallocate prepare stmt; + +# +# Bug#11060 "Server crashes on calling stored procedure with INSERT SELECT +# UNION SELECT" aka "Server crashes on re-execution of prepared INSERT ... +# SELECT with UNION". +# +create table t1 (id int); +prepare stmt from "insert into t1 (id) select id from t1 union select id from t1"; +execute stmt; +execute stmt; +deallocate prepare stmt; +drop table t1; |