diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-09-29 06:08:18 -0700 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-09-29 06:08:18 -0700 |
| commit | 13e71d2f06993c07b5b45f8d1ea75e87c767fb2e (patch) | |
| tree | 96b07f56caa91eceb1ac80a12e25c3f7c0b188c4 /sql/log_event.cc | |
| parent | 4102363f370f834a6c641a6adec560408c2d619d (diff) | |
| parent | 8d3d35ea5715739ac94785b8c9ff1a185699a84a (diff) | |
| download | mariadb-git-13e71d2f06993c07b5b45f8d1ea75e87c767fb2e.tar.gz | |
auto-merge
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index d91b09d90c9..d7921ad3c27 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -8842,11 +8842,11 @@ int Rows_log_event::find_row(const Relay_log_info *rli) */ store_record(table,record[1]); - if (table->s->keys > 0) + if (table->s->keys > 0 && table->s->keys_in_use.is_set(0)) { DBUG_PRINT("info",("locating record using primary key (index_read)")); - /* We have a key: search the table using the index */ + /* The 0th key is active: search the table using the index */ if (!table->file->inited && (error= table->file->ha_index_init(0, FALSE))) { DBUG_PRINT("info",("ha_index_init returns error %d",error)); |