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/event_db_repository.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/event_db_repository.cc')
| -rw-r--r-- | sql/event_db_repository.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/event_db_repository.cc b/sql/event_db_repository.cc index 37afbabad43..705bd8b2704 100644 --- a/sql/event_db_repository.cc +++ b/sql/event_db_repository.cc @@ -395,8 +395,9 @@ Event_db_repository::index_read_for_db_for_i_s(THD *thd, TABLE *schema_table, } key_copy(key_buf, event_table->record[0], key_info, key_len); - if (!(ret= event_table->file->index_read(event_table->record[0], key_buf, - (key_part_map)1, HA_READ_PREFIX))) + if (!(ret= event_table->file->index_read_map(event_table->record[0], key_buf, + (key_part_map)1, + HA_READ_PREFIX))) { DBUG_PRINT("info",("Found rows. Let's retrieve them. ret=%d", ret)); do @@ -844,8 +845,8 @@ Event_db_repository::find_named_event(LEX_STRING db, LEX_STRING name, key_copy(key, table->record[0], table->key_info, table->key_info->key_length); - if (table->file->index_read_idx(table->record[0], 0, key, HA_WHOLE_KEY, - HA_READ_KEY_EXACT)) + if (table->file->index_read_idx_map(table->record[0], 0, key, HA_WHOLE_KEY, + HA_READ_KEY_EXACT)) { DBUG_PRINT("info", ("Row not found")); DBUG_RETURN(TRUE); |