diff options
| author | unknown <evgen@moonbone.local> | 2007-01-12 16:43:52 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-01-12 16:43:52 +0300 |
| commit | cb96e8bcd8e4593929e2f1226468097963b5a793 (patch) | |
| tree | 73dbb4bdf18a95157622cc3458f0541da6215366 /sql/sql_delete.cc | |
| parent | 0f0d0f5bd45ef87ff75bc15c3faac8d9cb97c154 (diff) | |
| parent | 52c100ae0cfbf5588fe3fa1917aba3934241e3f6 (diff) | |
| download | mariadb-git-cb96e8bcd8e4593929e2f1226468097963b5a793.tar.gz | |
Merge moonbone.local:/work/latest-4.1-opt-mysql
into moonbone.local:/work/latest-5.0-opt-mysql
mysql-test/t/func_str.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_delete.cc:
Auto merged
mysql-test/r/delete.result:
Manual merge
mysql-test/r/func_str.result:
Manual merge
mysql-test/t/delete.test:
Manual merge
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 9264362a1c8..7752ac80adb 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -162,7 +162,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, DBUG_RETURN(TRUE); } - if (!select && limit != HA_POS_ERROR) + if ((!select || table->quick_keys.is_clear_all()) && limit != HA_POS_ERROR) usable_index= get_index_for_order(table, (ORDER*)(order->first), limit); if (usable_index == MAX_KEY) |