summaryrefslogtreecommitdiff
path: root/innobase/dict/dict0mem.c
diff options
context:
space:
mode:
authorunknown <aivanov@mysql.com>2006-04-20 23:09:49 +0400
committerunknown <aivanov@mysql.com>2006-04-20 23:09:49 +0400
commit66ee876ba3b50fba4ed159eb23587bf02fc2d44b (patch)
treec521f14ae71f3ca4157aef4b3a2b63f929314bf6 /innobase/dict/dict0mem.c
parent5a19f3bc71b9db630fac01561ffc6f37434ac509 (diff)
downloadmariadb-git-66ee876ba3b50fba4ed159eb23587bf02fc2d44b.tar.gz
Applied innodb-4.1-ss22 snapshot.
Fix BUG#16814: "SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR section" Add a missing newline to the LAST FOREIGN KEY ERROR section in SHOW INNODB STATUS output. Fix BUG#18934: "InnoDB crashes when table uses column names like DB_ROW_ID". Refuse tables that use reserved column names. innobase/dict/dict0dict.c: Applied innodb-4.1-ss22 snapshot. dict_foreign_error_report(): Always print a newline after invoking dict_print_info_on_foreign_key_in_create_format() (Bug#16814). Refuse tables that use reserved column names (Bug#18934). innobase/dict/dict0mem.c: Applied innodb-4.1-ss22 snapshot. Refuse tables that use reserved column names (Bug#18934). innobase/include/dict0dict.h: Applied innodb-4.1-ss22 snapshot. Refuse tables that use reserved column names (Bug#18934). innobase/include/dict0mem.h: Applied innodb-4.1-ss22 snapshot. Refuse tables that use reserved column names (Bug#18934). innobase/include/univ.i: Applied innodb-4.1-ss22 snapshot. innobase/row/row0mysql.c: Applied innodb-4.1-ss22 snapshot. Refuse tables that use reserved column names (Bug#18934).
Diffstat (limited to 'innobase/dict/dict0mem.c')
-rw-r--r--innobase/dict/dict0mem.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/innobase/dict/dict0mem.c b/innobase/dict/dict0mem.c
index 1d45585aac1..5a2b2e005d0 100644
--- a/innobase/dict/dict0mem.c
+++ b/innobase/dict/dict0mem.c
@@ -94,6 +94,21 @@ dict_mem_table_create(
return(table);
}
+/********************************************************************
+Free a table memory object. */
+
+void
+dict_mem_table_free(
+/*================*/
+ dict_table_t* table) /* in: table */
+{
+ ut_ad(table);
+ ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
+
+ mutex_free(&(table->autoinc_mutex));
+ mem_heap_free(table->heap);
+}
+
/**************************************************************************
Creates a cluster memory object. */