diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-08-21 19:03:28 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-08-21 19:03:28 +0300 |
| commit | b8381eb964cb8a357406353f5000d06261881885 (patch) | |
| tree | b11162ac1a6ea4a0f6b04559f50d2c6e44e51b38 /sql/sql_handler.cc | |
| parent | 0ece5608fc93d761387a0c081a255d06646a691a (diff) | |
| parent | 10ef77fc3bad3ccbcff22ce1e622f2ae96f72f82 (diff) | |
| download | mariadb-git-b8381eb964cb8a357406353f5000d06261881885.tar.gz | |
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
mysql-test/mysql-test-run.pl:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/status.result:
Manual merge with main 5.0 tree.
mysql-test/t/status.test:
Manual merge with main 5.0 tree.
sql/log_event.cc:
Manual merge with main 5.0 tree.
sql/log_event.h:
Manual merge with main 5.0 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 715fffe2ead..9a6660111b7 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -541,8 +541,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; } |