summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-03-06 19:53:31 +0200
committerunknown <monty@hundin.mysql.fi>2002-03-06 19:53:31 +0200
commitb707a1ab6b3e1c1fed2570f91da0e22715542493 (patch)
tree2b4665ab89a9c440f5e2f451d1d745df1c15288d /sql/table.cc
parenta5deff2bc90a17f4c3c19937b08660a78a085060 (diff)
parentd6998363afc004fd92248af521ed40fa52027954 (diff)
downloadmariadb-git-b707a1ab6b3e1c1fed2570f91da0e22715542493.tar.gz
merge
BitKeeper/etc/logging_ok: auto-union Build-tools/Do-all-build-steps: Auto merged Build-tools/Do-compile: Auto merged Build-tools/Do-rpm: Auto merged Docs/manual.texi: Auto merged include/hash.h: Auto merged include/my_sys.h: Auto merged innobase/dict/dict0dict.c: Auto merged libmysql/libmysql.c: Auto merged mysql-test/t/type_date.test: Auto merged mysys/array.c: Auto merged mysys/hash.c: Auto merged mysys/mf_qsort.c: Auto merged scripts/mysqld_safe.sh: Auto merged scripts/mysqlhotcopy.sh: Auto merged sql/item_timefunc.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql-bench/server-cfg.sh: Auto merged strings/Makefile.am: Auto merged
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 9aae9e17e5a..b1cd63d465a 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -576,6 +576,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);