summaryrefslogtreecommitdiff
path: root/sql/filesort.cc
diff options
context:
space:
mode:
authorunknown <monty@tik.mysql.com>2000-10-15 18:45:53 +0300
committerunknown <monty@tik.mysql.com>2000-10-15 18:45:53 +0300
commitd78f9840978cf60b73f13f6a5201ed5593636573 (patch)
tree51edb97a7ba1e486acf5bdba590984b73c775b29 /sql/filesort.cc
parent31ed959ba37ae81b9b0eb2079f1576f34f1241c7 (diff)
downloadmariadb-git-d78f9840978cf60b73f13f6a5201ed5593636573.tar.gz
Changed meaning of HA_EXTRA_RESET and start of hidden primary keys for BDB tables
heap/hp_extra.c: Changed meaning of HA_EXTRA_RESET include/my_base.h: Added HA_EXTRA_RESET_STATE isam/extra.c: Changed meaning of HA_EXTRA_RESET isam/pack_isam.c: Addapt to changed HA_EXTRA_RESET merge/extra.c: Changed meaning of HA_EXTRA_RESET myisam/mi_extra.c: Changed meaning of HA_EXTRA_RESET myisam/myisampack.c: Addapt to changed HA_EXTRA_RESET myisammrg/myrg_extra.c: Addapt to changed HA_EXTRA_RESET sql/filesort.cc: Addapt to changed HA_EXTRA_RESET sql/ha_berkeley.cc: Hidden primary key sql/ha_berkeley.h: Hidden primary key BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/filesort.cc')
-rw-r--r--sql/filesort.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc
index 32947a06ba1..08aca12d5b8 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -330,7 +330,9 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select,
next_pos=ref_pos;
if (! indexfile && ! quick_select)
{
- file->reset();
+ file->reset(); // QQ; Shouldn't be needed
+ if (table->keyread) // QQ Can be removed after the reset
+ file->extra(HA_EXTRA_KEYREAD); // QQ is removed
next_pos=(byte*) 0; /* Find records in sequence */
file->rnd_init();
file->extra(HA_EXTRA_CACHE); /* Quicker reads */