From 78d4276788e2ebad73c2a39e46675ef30dc322a8 Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Fri, 10 Jun 2016 14:52:41 -0400 Subject: [PATCH] Some trivial changes. --- sql/table.cc | 3 ++- sql/table_cache.cc | 5 ++--- sql/table_cache.h | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sql/table.cc b/sql/table.cc index 55bc918b3c2..6cbf2a4a917 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -279,7 +279,8 @@ TABLE_CATEGORY get_table_category(const LEX_STRING *db, const LEX_STRING *name) SYNOPSIS alloc_table_share() - TABLE_LIST Take database and table name from there + db Database name + table_name Table name key Table cache key (db \0 table_name \0...) key_length Length of key diff --git a/sql/table_cache.cc b/sql/table_cache.cc index bd50f5b4b3a..c7e95b4df14 100644 --- a/sql/table_cache.cc +++ b/sql/table_cache.cc @@ -741,10 +741,9 @@ void tdc_unlock_share(TDC_element *element) tdc_acquire_share() thd Thread handle - table_list Table that should be opened - key Table cache key - key_length Length of key + tl Table that should be opened flags operation: what to open table or view + out_table TABLE for the requested table IMPLEMENTATION Get a table definition from the table definition cache. diff --git a/sql/table_cache.h b/sql/table_cache.h index f20d763ea70..ceb7299b08a 100644 --- a/sql/table_cache.h +++ b/sql/table_cache.h @@ -1,3 +1,5 @@ +#ifndef TABLE_CACHE_H_INCLUDED +#define TABLE_CACHE_H_INCLUDED /* Copyright (c) 2000, 2012, Oracle and/or its affiliates. Copyright (c) 2010, 2011 Monty Program Ab Copyright (C) 2013 Sergey Vojtovich and MariaDB Foundation @@ -109,3 +111,4 @@ inline uint tdc_create_key(char *key, const char *db, const char *table_name) return (uint) (strmake(strmake(key, db, NAME_LEN) + 1, table_name, NAME_LEN) - key + 1); } +#endif /* TABLE_CACHE_H_INCLUDED */