summaryrefslogtreecommitdiff
path: root/mysys/mf_keycache.c
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-01-24 19:41:42 +0100
committerunknown <serg@serg.mylan>2005-01-24 19:41:42 +0100
commita82fd1eaec9067bbed9cceb9294734a8d09b72da (patch)
tree0c73a61f5c88d003eae464001af7656745e9ba4e /mysys/mf_keycache.c
parent7eb825a07280dfeb1bae3def25a3bc0add544a74 (diff)
parent7109999b92ec8541a61ca5babc5b06f4315478a8 (diff)
downloadmariadb-git-a82fd1eaec9067bbed9cceb9294734a8d09b72da.tar.gz
merged
BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4: Auto merged client/mysql.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged myisam/ft_boolean_search.c: Auto merged myisam/mi_packrec.c: Auto merged myisam/sort.c: Auto merged mysql-test/r/fulltext.result: Auto merged sql/item_create.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/log.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.h: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_db.cc: Auto merged sql/tztime.cc: Auto merged tests/client_test.c: Auto merged
Diffstat (limited to 'mysys/mf_keycache.c')
-rw-r--r--mysys/mf_keycache.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index 5c9d1434b0c..4967b60cd68 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -352,6 +352,7 @@ int init_key_cache(KEY_CACHE *keycache, uint key_cache_block_size,
MYF(0))))
break;
my_large_free(keycache->block_mem, MYF(0));
+ keycache->block_mem= 0;
}
if (blocks < 8)
{