From 748aac23cd6a1889ba1695289d7054d3d38e2b39 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 5 Mar 2002 17:38:16 +0200 Subject: Corrected fix for not freed memory when using corrupted tables Docs/manual.texi: Changelog configure.in: Version change sql/sql_base.cc: Correct fix for not freed memory when using corrupted tables sql/table.cc: Correct fix for not freed memory when using corrupted tables --- sql/sql_base.cc | 1 - sql/table.cc | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'sql') diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 1c281163b5a..656758623bc 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -277,7 +277,6 @@ void intern_close_table(TABLE *table) free_io_cache(table); if (table->file) VOID(closefrm(table)); // close file - hash_free(&table->name_hash); } diff --git a/sql/table.cc b/sql/table.cc index ce7d185a7a1..7510e6bcce8 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -573,6 +573,7 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, delete outparam->file; outparam->file=0; // For easyer errorchecking outparam->db_stat=0; + hash_free(&outparam->name_hash); free_root(&outparam->mem_root,MYF(0)); my_free(outparam->table_name,MYF(MY_ALLOW_ZERO_PTR)); DBUG_RETURN (error); @@ -600,6 +601,7 @@ int closefrm(register TABLE *table) } delete table->file; table->file=0; /* For easyer errorchecking */ + hash_free(&outparam->name_hash); free_root(&table->mem_root,MYF(0)); DBUG_RETURN(error); } -- cgit v1.2.1