Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
1d6bc0f0
Commit
1d6bc0f0
authored
Jun 26, 2018
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removing sp_head::is_stored_procedure. This code was dead after MDEV-15991
parent
fe76e68e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
8 deletions
+1
-8
sql/sp_head.cc
sql/sp_head.cc
+0
-1
sql/sql_class.cc
sql/sql_class.cc
+0
-1
sql/sql_class.h
sql/sql_class.h
+1
-6
No files found.
sql/sp_head.cc
View file @
1d6bc0f0
...
@@ -2736,7 +2736,6 @@ sp_head::restore_thd_mem_root(THD *thd)
...
@@ -2736,7 +2736,6 @@ sp_head::restore_thd_mem_root(THD *thd)
Item
*
flist
=
free_list
;
// The old list
Item
*
flist
=
free_list
;
// The old list
set_query_arena
(
thd
);
// Get new free_list and mem_root
set_query_arena
(
thd
);
// Get new free_list and mem_root
state
=
STMT_INITIALIZED_FOR_SP
;
state
=
STMT_INITIALIZED_FOR_SP
;
is_stored_procedure
=
true
;
DBUG_PRINT
(
"info"
,
(
"mem_root %p returned from thd mem root %p"
,
DBUG_PRINT
(
"info"
,
(
"mem_root %p returned from thd mem root %p"
,
&
mem_root
,
&
thd
->
mem_root
));
&
mem_root
,
&
thd
->
mem_root
));
...
...
sql/sql_class.cc
View file @
1d6bc0f0
...
@@ -3809,7 +3809,6 @@ void Query_arena::set_query_arena(Query_arena *set)
...
@@ -3809,7 +3809,6 @@ void Query_arena::set_query_arena(Query_arena *set)
mem_root
=
set
->
mem_root
;
mem_root
=
set
->
mem_root
;
free_list
=
set
->
free_list
;
free_list
=
set
->
free_list
;
state
=
set
->
state
;
state
=
set
->
state
;
is_stored_procedure
=
set
->
is_stored_procedure
;
}
}
...
...
sql/sql_class.h
View file @
1d6bc0f0
...
@@ -974,10 +974,6 @@ class Query_arena
...
@@ -974,10 +974,6 @@ class Query_arena
enum_state
state
;
enum_state
state
;
protected:
friend
class
sp_head
;
bool
is_stored_procedure
;
public:
public:
/* We build without RTTI, so dynamic_cast can't be used. */
/* We build without RTTI, so dynamic_cast can't be used. */
enum
Type
enum
Type
...
@@ -986,8 +982,7 @@ class Query_arena
...
@@ -986,8 +982,7 @@ class Query_arena
};
};
Query_arena
(
MEM_ROOT
*
mem_root_arg
,
enum
enum_state
state_arg
)
:
Query_arena
(
MEM_ROOT
*
mem_root_arg
,
enum
enum_state
state_arg
)
:
free_list
(
0
),
mem_root
(
mem_root_arg
),
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
)
{
INIT_ARENA_DBUG_INFO
;
}
{
INIT_ARENA_DBUG_INFO
;
}
/*
/*
This constructor is used only when Query_arena is created as
This constructor is used only when Query_arena is created as
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment