1 files changed, 3 insertions, 38 deletions

diff --git a/storage/innobase/include/dict0priv.ic b/storage/innobase/include/dict0priv.ic
index f717ddd313a..68b228c9102 100644
--- a/storage/innobase/include/dict0priv.ic
+++ b/storage/innobase/include/dict0priv.ic
@@ -25,7 +25,6 @@ Created  Wed 13 Oct 2010 16:10:14 EST Sunny Bains
 
 #include "dict0dict.h"
 #include "dict0load.h"
-#include "dict0priv.h"
 
 /**********************************************************************//**
 Gets a table; loads it to the dictionary cache if necessary. A low-level
@@ -40,7 +39,7 @@ dict_table_get_low(
 	dict_table_t*	table;
 
 	ut_ad(table_name);
-	ut_ad(mutex_own(&dict_sys->mutex));
+	ut_ad(mutex_own(&dict_sys.mutex));
 
 	table = dict_table_check_if_in_cache_low(table_name);
 
@@ -64,40 +63,6 @@ dict_table_get_low(
 }
 
 /**********************************************************************//**
-Returns a table object based on table id.
-@return table, NULL if does not exist */
-UNIV_INLINE
-dict_table_t*
-dict_table_open_on_id_low(
-/*======================*/
-	table_id_t		table_id,	/*!< in: table id */
-	dict_err_ignore_t	ignore_err,	/*!< in: errors to ignore
-						when loading the table */
-	ibool			open_only_if_in_cache)
-{
-	dict_table_t*	table;
-	ulint		fold;
-
-	ut_ad(mutex_own(&dict_sys->mutex));
-
-	/* Look for the table name in the hash table */
-	fold = ut_fold_ull(table_id);
-
-	HASH_SEARCH(id_hash, dict_sys->table_id_hash, fold,
-		    dict_table_t*, table, ut_ad(table->cached),
-		    table->id == table_id);
-	if (table == NULL && !open_only_if_in_cache) {
-		table = dict_load_table_on_id(table_id, ignore_err);
-	}
-
-	ut_ad(!table || table->cached);
-
-	/* TODO: should get the type information from MySQL */
-
-	return(table);
-}
-
-/**********************************************************************//**
 Checks if a table is in the dictionary cache.
 @return table, NULL if not found */
 UNIV_INLINE
@@ -114,12 +79,12 @@ dict_table_check_if_in_cache_low(
 		   ("table: '%s'", table_name));
 
 	ut_ad(table_name);
-	ut_ad(mutex_own(&dict_sys->mutex));
+	ut_ad(mutex_own(&dict_sys.mutex));
 
 	/* Look for the table name in the hash table */
 	table_fold = ut_fold_string(table_name);
 
-	HASH_SEARCH(name_hash, dict_sys->table_hash, table_fold,
+	HASH_SEARCH(name_hash, dict_sys.table_hash, table_fold,
 		    dict_table_t*, table, ut_ad(table->cached),
 		    !strcmp(table->name.m_name, table_name));
 	DBUG_RETURN(table);