summaryrefslogtreecommitdiff
path: root/myisammrg
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-12-05 19:38:42 +0200
committermonty@mashka.mysql.fi <>2002-12-05 19:38:42 +0200
commit859b68847666823baa328c5c7f3da96787807bb3 (patch)
tree56f9dc35fe3c9e6c4f341e577ff3db68855d9e81 /myisammrg
parent564487d7c00098e8a37c8e675197414667685452 (diff)
parent496a0e1630f9dc4047fb5244cb87ee5ca03b409e (diff)
downloadmariadb-git-859b68847666823baa328c5c7f3da96787807bb3.tar.gz
Merge with 4.0.6
Diffstat (limited to 'myisammrg')
-rw-r--r--myisammrg/myrg_extra.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/myisammrg/myrg_extra.c b/myisammrg/myrg_extra.c
index ad17b0f82f2..d375b45df99 100644
--- a/myisammrg/myrg_extra.c
+++ b/myisammrg/myrg_extra.c
@@ -38,7 +38,8 @@ int myrg_extra(MYRG_INFO *info,enum ha_extra_function function,
}
else
{
- if (function == HA_EXTRA_NO_CACHE || function == HA_EXTRA_RESET)
+ if (function == HA_EXTRA_NO_CACHE || function == HA_EXTRA_RESET ||
+ function == HA_EXTRA_PREPARE_FOR_UPDATE)
info->cache_in_use=0;
if (function == HA_EXTRA_RESET || function == HA_EXTRA_RESET_STATE)
{