From d78f9840978cf60b73f13f6a5201ed5593636573 Mon Sep 17 00:00:00 2001
From: unknown <monty@tik.mysql.com>
Date: Sun, 15 Oct 2000 18:45:53 +0300
Subject: 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
---
merge/extra.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'merge')
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;
--
cgit v1.2.1