diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-05-21 22:00:08 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-05-21 22:00:08 +0300 |
| commit | 3143ad589a24ac7581e2195ba0dc13576cb3c9da (patch) | |
| tree | 9c02baa18cdca6f60d80e2f7ee7f3f792c293ab9 /sql/item_subselect.cc | |
| parent | 068c61978e3a81836d52b8caf11e044290159ad1 (diff) | |
| download | mariadb-git-3143ad589a24ac7581e2195ba0dc13576cb3c9da.tar.gz | |
Push a lot of small fixes to get larger parts to compile
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 87e96da8f62..5652c921d27 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -3753,7 +3753,7 @@ void subselect_uniquesubquery_engine::print(String *str) { KEY *key_info= tab->table->key_info + tab->ref.key; str->append(STRING_WITH_LEN("<primary_index_lookup>(")); - for (uint i= 0; i < key_info->key_parts; i++) + for (uint i= 0; i < key_info->user_defined_key_parts; i++) tab->ref.items[i]->print(str); str->append(STRING_WITH_LEN(" in ")); str->append(tab->table->s->table_name.str, tab->table->s->table_name.length); @@ -4310,7 +4310,8 @@ bool subselect_hash_sj_engine::init(List<Item> *tmp_columns, uint subquery_id) DBUG_ASSERT( tmp_table->s->uniques || tmp_table->key_info->key_length >= tmp_table->file->max_key_length() || - tmp_table->key_info->key_parts > tmp_table->file->max_key_parts()); + tmp_table->key_info->user_defined_key_parts > + tmp_table->file->max_key_parts()); free_tmp_table(thd, tmp_table); tmp_table= NULL; delete result; @@ -4324,7 +4325,7 @@ bool subselect_hash_sj_engine::init(List<Item> *tmp_columns, uint subquery_id) */ DBUG_ASSERT(tmp_table->s->keys == 1 && ((Item_in_subselect *) item)->left_expr->cols() == - tmp_table->key_info->key_parts); + tmp_table->key_info->user_defined_key_parts); if (make_semi_join_conds() || /* A unique_engine is used both for complete and partial matching. */ |