diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-08-22 17:29:38 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-08-22 17:29:38 +0300 |
| commit | b3dd7d5ca6f501210ca7f0f98c2029376c42e03c (patch) | |
| tree | eb1ce9100b55c8b26a72392c57e84461668936c7 /sql/sql_handler.cc | |
| parent | 7dd4e789586bef5141e1a1d4da4b7efc271708aa (diff) | |
| parent | edf4fccf98ce701a984e13e2c7bd174a15226ed4 (diff) | |
| download | mariadb-git-b3dd7d5ca6f501210ca7f0f98c2029376c42e03c.tar.gz | |
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
client/mysqldump.c:
Auto merged
sql/event_db_repository.cc:
Auto merged
sql/event_queue.cc:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
sql/sql_yacc.yy:
Manual merge with 5.1 main tree.
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index bd3a53c5f1e..8b9896870c0 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -555,8 +555,8 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables, table->file->ha_index_or_rnd_end(); table->file->ha_index_init(keyno, 1); key_copy(key, table->record[0], table->key_info + keyno, key_len); - error= table->file->index_read(table->record[0], - key, keypart_map, ha_rkey_mode); + error= table->file->index_read_map(table->record[0], + key, keypart_map, ha_rkey_mode); mode=rkey_to_rnext[(int)ha_rkey_mode]; break; } |