1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing sp_head::is_stored_procedure. This code was dead after MDEV-15991

Browse Source
This commit is contained in:
Alexander Barkov 2018-06-26 17:53:11 +04:00
parent fe76e68e0e
commit 1d6bc0f01f
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sp_head.cc
View File

@ -2736,7 +2736,6 @@ sp_head::restore_thd_mem_root(THD *thd)
Item *flist= free_list; // The old list
set_query_arena(thd); // Get new free_list and mem_root
state= STMT_INITIALIZED_FOR_SP;
is_stored_procedure= true;
DBUG_PRINT("info", ("mem_root %p returned from thd mem root %p",
&mem_root, &thd->mem_root));

1
sql/sql_class.cc
View File

@ -3809,7 +3809,6 @@ void Query_arena::set_query_arena(Query_arena *set)
mem_root= set->mem_root;
free_list= set->free_list;
state= set->state;
is_stored_procedure= set->is_stored_procedure;
}

7
sql/sql_class.h
View File

@ -974,10 +974,6 @@ public:
enum_state state;
protected:
friend class sp_head;
bool is_stored_procedure;
public:
/* We build without RTTI, so dynamic_cast can't be used. */
enum Type
@ -986,8 +982,7 @@ public:
};
Query_arena(MEM_ROOT *mem_root_arg, enum enum_state state_arg) :
free_list(0), mem_root(mem_root_arg), state(state_arg),
is_stored_procedure(state_arg == STMT_INITIALIZED_FOR_SP ? true : false)
free_list(0), mem_root(mem_root_arg), state(state_arg)
{ INIT_ARENA_DBUG_INFO; }
/*
This constructor is used only when Query_arena is created as