diff options
author | unknown <monty@hundin.mysql.fi> | 2001-11-25 14:38:43 +0200 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-11-25 14:38:43 +0200 |
commit | 7fbb09f4bbfb90e04a00d1b2ce327c2e5039081a (patch) | |
tree | 6124a556efc57ba10fb84981d289424264faf035 /sql/records.cc | |
parent | f2a42796d846398d38c74f0e324a09f351650500 (diff) | |
download | mariadb-git-7fbb09f4bbfb90e04a00d1b2ce327c2e5039081a.tar.gz |
Fixed typo in last changeset
mysys/mf_keycache.c:
Fixed typo.
sql/records.cc:
Cleanup
Diffstat (limited to 'sql/records.cc')
-rw-r--r-- | sql/records.cc | 12 |
1 files changed, 6 insertions, 6 deletions
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); |