summaryrefslogtreecommitdiff
path: root/merge
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 /merge
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 'merge')
-rw-r--r--merge/extra.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/merge/extra.c b/merge/extra.c
index c20241228a2..343806dbfad 100644
--- a/merge/extra.c
+++ b/merge/extra.c
@@ -32,9 +32,9 @@ enum ha_extra_function function;
info->cache_in_use=1;
else
{
- if (function == HA_EXTRA_NO_CACHE)
+ if (function == HA_EXTRA_NO_CACHE || function == HA_EXTRA_RESET)
info->cache_in_use=0;
- if (function == HA_EXTRA_RESET)
+ if (function == HA_EXTRA_RESET || function == HA_EXTRA_RESET_STATE)
{
info->current_table=0;
info->last_used_table=info->open_tables;