diff options
| -rw-r--r-- | mysys/mf_keycache.c | 2 | ||||
| -rw-r--r-- | sql/records.cc | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index b02d0928325..87f6ca2717c 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -169,7 +169,7 @@ void end_key_cache(void) } } key_cache_inited=0; - _my_hash_blocks=my_blocks_used=0; + _my_hash_blocks=_my_blocks_used=0; DBUG_PRINT("status", ("used: %d changed: %d w_requests: %ld writes: %ld r_requests: %ld reads: %ld", _my_blocks_used,_my_blocks_changed,_my_cache_w_requests, diff --git a/sql/records.cc b/sql/records.cc index 0f49b3fa45e..5edbd6896b5 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -51,12 +51,7 @@ void init_read_record(READ_RECORD *info,THD *thd, TABLE *table, tempfile= &select->file; else tempfile= table->io_cache; - if (select && select->quick && (! tempfile || !tempfile->buffer)) - { - DBUG_PRINT("info",("using rr_quick")); - info->read_record=rr_quick; - } - else if (tempfile && my_b_inited(tempfile)) // Test if ref-records was used + if (tempfile && my_b_inited(tempfile)) // Test if ref-records was used { DBUG_PRINT("info",("using rr_from_tempfile")); info->read_record=rr_from_tempfile; @@ -84,6 +79,11 @@ void init_read_record(READ_RECORD *info,THD *thd, TABLE *table, } } } + else if (select && select->quick) + { + DBUG_PRINT("info",("using rr_quick")); + info->read_record=rr_quick; + } else if (table->record_pointers) { table->file->rnd_init(0); |