diff options
author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-24 00:41:18 +0400 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-24 00:41:18 +0400 |
commit | 598cf5aec7c7cf4dbb158c87d80916b6e58e7ae6 (patch) | |
tree | f4f37b22f4271c44aa03c55abe609a058828bedc /mysql-test/r/delete.result | |
parent | dabd4a1c55cabbe73350c7c9b4c2bd6ab2db2b5c (diff) | |
parent | d72a4710aaad2f1e76ac20d50793f13f941ef899 (diff) | |
download | mariadb-git-598cf5aec7c7cf4dbb158c87d80916b6e58e7ae6.tar.gz |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
conflict Makefile.am
conflict mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
conflict mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
conflict sql/opt_sum.cc
conflict sql/set_var.cc
conflict sql/sql_base.cc
conflict sql/sql_priv.h
conflict sql/sql_show.cc
Diffstat (limited to 'mysql-test/r/delete.result')
-rw-r--r-- | mysql-test/r/delete.result | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result index 733614b765a..0c9b0d7d2e5 100644 --- a/mysql-test/r/delete.result +++ b/mysql-test/r/delete.result @@ -490,4 +490,13 @@ 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 #53450: Crash/assertion +# "virtual int ha_myisam::index_first(uchar*)") at assert.c:81 +# +CREATE TABLE t1 (a INT, b INT, c INT, +INDEX(a), INDEX(b), INDEX(c)); +INSERT INTO t1 VALUES (1,2,3), (4,5,6), (7,8,9); +DELETE FROM t1 WHERE a = 10 OR b = 20 ORDER BY c LIMIT 1; +DROP TABLE t1; End of 5.1 tests |