database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-9488 - Table cache cleanups

Browse Source 
Cleanup now unused arguments of tdc_open_view().
This commit is contained in:
Sergey Vojtovich
2015-12-29 19:09:11 +04:00
parent c1d1c59888
commit 3692bd3238
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_base.cc
View File

@ -2300,8 +2300,7 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx)
DBUG_RETURN(true); DBUG_RETURN(true);
} }
if (!tdc_open_view(thd, table_list, alias, key, key_length, if (!tdc_open_view(thd, table_list, CHECK_METADATA_VERSION))
CHECK_METADATA_VERSION))
{ {
DBUG_ASSERT(table_list->view != 0); DBUG_ASSERT(table_list->view != 0);
DBUG_RETURN(FALSE); // VIEW DBUG_RETURN(FALSE); // VIEW
@ -3269,9 +3268,6 @@ check_and_update_routine_version(THD *thd, Sroutine_hash_entry *rt,
@param thd Thread handle @param thd Thread handle
@param table_list TABLE_LIST with db, table_name & belong_to_view @param table_list TABLE_LIST with db, table_name & belong_to_view
@param alias Alias name
@param cache_key Key for table definition cache
@param cache_key_length Length of cache_key
@param flags Flags which modify how we open the view @param flags Flags which modify how we open the view
@todo This function is needed for special handling of views under @todo This function is needed for special handling of views under
@ -3280,9 +3276,7 @@ check_and_update_routine_version(THD *thd, Sroutine_hash_entry *rt,
@return FALSE if success, TRUE - otherwise. @return FALSE if success, TRUE - otherwise.
*/ */
bool tdc_open_view(THD *thd, TABLE_LIST *table_list, const char *alias, bool tdc_open_view(THD *thd, TABLE_LIST *table_list, uint flags)
const char *cache_key, uint cache_key_length,
uint flags)
{ {
TABLE not_used; TABLE not_used;
TABLE_SHARE *share; TABLE_SHARE *share;

11
sql/sql_base.h
View File

@ -305,16 +305,7 @@ void close_all_tables_for_name(THD *thd, TABLE_SHARE *share,
ha_extra_function extra, ha_extra_function extra,
TABLE *skip_table); TABLE *skip_table);
OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *db, const char *wild); OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *db, const char *wild);
bool tdc_open_view(THD *thd, TABLE_LIST *table_list, const char *alias, bool tdc_open_view(THD *thd, TABLE_LIST *table_list, uint flags);
const char *cache_key, uint cache_key_length, uint flags);
static inline bool tdc_open_view(THD *thd, TABLE_LIST *table_list,
const char *alias, uint flags)
{
const char *key;
uint key_length= get_table_def_key(table_list, &key);
return tdc_open_view(thd, table_list, alias, key, key_length, flags);
}
TABLE *find_table_for_mdl_upgrade(THD *thd, const char *db, TABLE *find_table_for_mdl_upgrade(THD *thd, const char *db,
const char *table_name, const char *table_name,

2
sql/sql_view.cc
View File

@ -215,7 +215,7 @@ fill_defined_view_parts (THD *thd, TABLE_LIST *view)
TABLE_LIST decoy; TABLE_LIST decoy;
memcpy (&decoy, view, sizeof (TABLE_LIST)); memcpy (&decoy, view, sizeof (TABLE_LIST));
if (tdc_open_view(thd, &decoy, decoy.alias, OPEN_VIEW_NO_PARSE)) if (tdc_open_view(thd, &decoy, OPEN_VIEW_NO_PARSE))
return TRUE; return TRUE;
if (!lex->definer) if (!lex->definer)