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

cleanup TABLE_LIST

Browse Source
This commit is contained in:
Eugene Kosov
2018-05-22 22:32:14 +03:00
committed by Sergey Vojtovich
parent 611488e3d9
commit c13e3c37be
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_insert.cc
View File

@@ -749,12 +749,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
table_list->table_name.str);
DBUG_RETURN(TRUE);
}
/*
mark the table_list as a target for insert, to skip the DT/view prepare phase
for correct access rights checks
TODO: remove this hack
*/
table_list->skip_prepare_derived= TRUE;
if (table_list->lock_type == TL_WRITE_DELAYED)
{

5
sql/table.cc
View File

@@ -8275,7 +8275,10 @@ bool TABLE_LIST::change_refs_to_fields()
if (!used_items.elements)
return FALSE;
materialized_items= (Item**)thd->calloc(sizeof(void*) * table->s->fields);
Item **materialized_items=
(Item **)thd->calloc(sizeof(void *) * table->s->fields);
if (!materialized_items)
return TRUE;
while ((ref= (Item_direct_ref*)li++))
{

5
sql/table.h
View File

@@ -2268,7 +2268,7 @@ struct TABLE_LIST
/* TABLE_TYPE_UNKNOWN if any type is acceptable */
Table_type required_type;
handlerton *db_type; /* table_type for handler */
char timestamp_buffer[20]; /* buffer for timestamp (19+1) */
char timestamp_buffer[MAX_DATETIME_WIDTH + 1];
/*
This TABLE_LIST object is just placeholder for prelocking, it will be
used for implicit LOCK TABLES only and won't be used in real statement.
@@ -2300,8 +2300,6 @@ struct TABLE_LIST
/* TODO: replace with derived_type */
bool merged;
bool merged_for_insert;
/* TRUE <=> don't prepare this derived table/view as it should be merged.*/
bool skip_prepare_derived;
bool sequence; /* Part of NEXTVAL/CURVAL/LASTVAL */
/*
@@ -2311,7 +2309,6 @@ struct TABLE_LIST
List<Item> used_items;
/* Sublist (tail) of persistent used_items */
List<Item> persistent_used_items;
Item **materialized_items;
/* View creation context. */