diff options
| author | joerg@trift2. <> | 2007-08-22 17:13:42 +0200 |
|---|---|---|
| committer | joerg@trift2. <> | 2007-08-22 17:13:42 +0200 |
| commit | d4d4f8528e455bbcb9e1012ddeaf962dcf902392 (patch) | |
| tree | 558b8d71a70fb5e5e31a5e1f7f67bf92449b1cd0 /sql/item_subselect.cc | |
| parent | 400aec95f7dcf0a25b41c90854584f47cce12b35 (diff) | |
| parent | 20ce6067979029b13b8c5f30fb8c2d15d2734185 (diff) | |
| download | mariadb-git-d4d4f8528e455bbcb9e1012ddeaf962dcf902392.tar.gz | |
Manual merge of parallel development in separate team trees.
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 6d4207e89ec..843c6ced263 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -2129,10 +2129,10 @@ int subselect_uniquesubquery_engine::exec() if (!table->file->inited) table->file->ha_index_init(tab->ref.key, 0); - error= table->file->index_read(table->record[0], - tab->ref.key_buff, - make_prev_keypart_map(tab->ref.key_parts), - HA_READ_KEY_EXACT); + error= table->file->index_read_map(table->record[0], + tab->ref.key_buff, + make_prev_keypart_map(tab->ref.key_parts), + HA_READ_KEY_EXACT); if (error && error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE) error= report_error(table, error); @@ -2239,10 +2239,10 @@ int subselect_indexsubquery_engine::exec() if (!table->file->inited) table->file->ha_index_init(tab->ref.key, 1); - error= table->file->index_read(table->record[0], - tab->ref.key_buff, - make_prev_keypart_map(tab->ref.key_parts), - HA_READ_KEY_EXACT); + error= table->file->index_read_map(table->record[0], + tab->ref.key_buff, + make_prev_keypart_map(tab->ref.key_parts), + HA_READ_KEY_EXACT); if (error && error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE) error= report_error(table, error); |