summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2010-02-25 16:57:15 +0200
committerGeorgi Kodinov <joro@sun.com>2010-02-25 16:57:15 +0200
commite3d0b6d7929ce7080958086c6f4fca61dd13de2e (patch)
tree21cf727a4c1d371627c9f4c4cdd78bc3d5d81fd5 /mysql-test
parentca6ec790b4c12ab93a11d0f8f1d6e23d13c041b5 (diff)
downloadmariadb-git-e3d0b6d7929ce7080958086c6f4fca61dd13de2e.tar.gz
Backport of the fix for bug #49552 to 5.0-bugteam
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/delete.result12
-rw-r--r--mysql-test/t/delete.test15
2 files changed, 27 insertions, 0 deletions
diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result
index a682d90fbf7..d3cf69279fd 100644
--- a/mysql-test/r/delete.result
+++ b/mysql-test/r/delete.result
@@ -241,4 +241,16 @@ DELETE FROM t1 ORDER BY (f1(10)) LIMIT 1;
ERROR 42000: Incorrect number of arguments for FUNCTION test.f1; expected 0, got 1
DROP TABLE t1;
DROP FUNCTION f1;
+#
+# Bug #49552 : sql_buffer_result cause crash + not found records
+# in multitable delete/subquery
+#
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES (1),(2),(3);
+SET SESSION SQL_BUFFER_RESULT=1;
+DELETE t1 FROM (SELECT SUM(a) a FROM t1) x,t1;
+SET SESSION SQL_BUFFER_RESULT=DEFAULT;
+SELECT * FROM t1;
+a
+DROP TABLE t1;
End of 5.0 tests
diff --git a/mysql-test/t/delete.test b/mysql-test/t/delete.test
index ec70587c9d1..d9091c92a52 100644
--- a/mysql-test/t/delete.test
+++ b/mysql-test/t/delete.test
@@ -247,4 +247,19 @@ DELETE FROM t1 ORDER BY (f1(10)) LIMIT 1;
DROP TABLE t1;
DROP FUNCTION f1;
+
+--echo #
+--echo # Bug #49552 : sql_buffer_result cause crash + not found records
+--echo # in multitable delete/subquery
+--echo #
+
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES (1),(2),(3);
+SET SESSION SQL_BUFFER_RESULT=1;
+DELETE t1 FROM (SELECT SUM(a) a FROM t1) x,t1;
+
+SET SESSION SQL_BUFFER_RESULT=DEFAULT;
+SELECT * FROM t1;
+DROP TABLE t1;
+
--echo End of 5.0 tests