From 1d6bc0f01f58cacc1d31975eb5579a197f451a41 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Tue, 26 Jun 2018 17:53:11 +0400 Subject: [PATCH] Removing sp_head::is_stored_procedure. This code was dead after MDEV-15991 --- sql/sp_head.cc | 1 - sql/sql_class.cc | 1 - sql/sql_class.h | 7 +------ 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 3b90c1af604..40e5a71de21 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -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)); diff --git a/sql/sql_class.cc b/sql/sql_class.cc index d2e4f66dd59..718d2424463 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -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; } diff --git a/sql/sql_class.h b/sql/sql_class.h index 5adb5bf3823..ddb14195b87 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -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