diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-12-13 14:28:53 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-12-13 14:28:53 -0800 |
| commit | 7229af3034872b4f19122ff3d2492a3fd0a0d773 (patch) | |
| tree | 1777bf5b52e72d06eb36f9e779b24be0f8606459 /sql | |
| parent | 190aa085577fb6e08aa861138036e50d7fc25313 (diff) | |
| parent | d274e32c8c0363073e924446f02ff18f7c3c4821 (diff) | |
| download | mariadb-git-7229af3034872b4f19122ff3d2492a3fd0a0d773.tar.gz | |
Merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index c95bd6cbcda..bf559fa40bf 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -17536,8 +17536,8 @@ find_field_in_item_list (Field *field, void *data) while ((item= li++)) { - if (item->type() == Item::FIELD_ITEM && - ((Item_field*) item)->field->eq(field)) + if (item->real_item()->type() == Item::FIELD_ITEM && + ((Item_field*) (item->real_item()))->field->eq(field)) { part_found= 1; break; @@ -17833,7 +17833,8 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit_arg, uint used_pk_parts= 0; if (used_key_parts > used_index_parts) used_pk_parts= used_key_parts-used_index_parts; - rec_per_key= keyinfo->rec_per_key[used_key_parts-1]; + rec_per_key= used_key_parts ? + keyinfo->rec_per_key[used_key_parts-1] : 1; /* Take into account the selectivity of the used pk prefix */ if (used_pk_parts) { |