diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-31 01:06:50 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-31 01:06:50 +0300 |
| commit | 2b0f6b5ace4b455344dc25e400873d3d68c90090 (patch) | |
| tree | 64c1a58bb6f6f5516fbf930759b54e0081b98b90 /mysql-test/t/delete.test | |
| parent | 22e0e72370ddbd95d0438b769ac5dda82b2c9b0a (diff) | |
| parent | d9e9a73e8f1355a24b27d64d56d555d045ee0b4c (diff) | |
| download | mariadb-git-2b0f6b5ace4b455344dc25e400873d3d68c90090.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- mysql-test/suite/rpl/r/rpl_binlog_grant.result
- mysql-test/suite/rpl/r/rpl_sp.result
- mysql-test/suite/rpl/t/rpl_binlog_grant.test
- sql/sql_parse.cc
- sql/sql_table.cc
- sql/sql_test.cc
Diffstat (limited to 'mysql-test/t/delete.test')
| -rw-r--r-- | mysql-test/t/delete.test | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/mysql-test/t/delete.test b/mysql-test/t/delete.test index fde98ab7e97..3b73a47534e 100644 --- a/mysql-test/t/delete.test +++ b/mysql-test/t/delete.test @@ -510,4 +510,21 @@ END | --error ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG DELETE IGNORE FROM t1; -DROP TABLE t1;
\ No newline at end of file +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 |