diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-03-01 12:39:44 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-03-01 12:39:44 +0300 |
| commit | 1913b715bc6559d3c79f8eb9cddfd971fb1dd785 (patch) | |
| tree | c9c3978afa21ee1f05cc50ff5b86a8ab31ec80ee /mysql-test/t/delete.test | |
| parent | bf875901047faa8796aa0fe6a6bca32ea7fde956 (diff) | |
| parent | 031657c6943aab8109cd08321048ed1f3c943a34 (diff) | |
| download | mariadb-git-1913b715bc6559d3c79f8eb9cddfd971fb1dd785.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/share/Makefile.am
Diffstat (limited to 'mysql-test/t/delete.test')
| -rw-r--r-- | mysql-test/t/delete.test | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/mysql-test/t/delete.test b/mysql-test/t/delete.test index 3b73a47534e..acd67e0e766 100644 --- a/mysql-test/t/delete.test +++ b/mysql-test/t/delete.test @@ -291,6 +291,21 @@ 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 # @@ -513,18 +528,4 @@ DELETE IGNORE FROM t1; DROP TABLE t1; ---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.1 tests |