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 | 5867d275a39f4253e7401a034c50d3d169879853 (patch) | |
| tree | c9c3978afa21ee1f05cc50ff5b86a8ab31ec80ee /mysql-test/r/delete.result | |
| parent | 1db438506fad262d0a4a535c919a6ce8d78b28d3 (diff) | |
| parent | 84766b060a09ae3709fcd17cadc16c982c0d3a78 (diff) | |
| download | mariadb-git-5867d275a39f4253e7401a034c50d3d169879853.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/share/Makefile.am
Diffstat (limited to 'mysql-test/r/delete.result')
| -rw-r--r-- | mysql-test/r/delete.result | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result index d6eb1fbabe9..733614b765a 100644 --- a/mysql-test/r/delete.result +++ b/mysql-test/r/delete.result @@ -278,6 +278,18 @@ 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 DROP DATABASE IF EXISTS db1; DROP DATABASE IF EXISTS db2; @@ -478,16 +490,4 @@ END | DELETE IGNORE FROM t1; ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger. DROP TABLE t1; -# -# 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.1 tests |