diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-09-29 17:51:10 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-09-29 17:52:07 +0300 |
| commit | 9062385c20b62a7231b256f3f7af44ea9b1f5ad9 (patch) | |
| tree | ef3dbec0b5543230b352955107fbb59ac4650396 /sql/sp_head.cc | |
| parent | 5e42511ce169d6883499d00072c309647f303aee (diff) | |
| download | mariadb-git-9062385c20b62a7231b256f3f7af44ea9b1f5ad9.tar.gz | |
SQL: invalidate current SP at archive substitution [closes #127]
Related to #125
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index f470ca3f283..d3310578225 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1589,10 +1589,7 @@ sp_head::execute_trigger(THD *thd, goto err_with_cleanup; } -#ifndef DBUG_OFF nctx->sp= this; -#endif - thd->spcont= nctx; err_status= execute(thd, FALSE); @@ -1713,9 +1710,7 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, */ thd->restore_active_arena(&call_arena, &backup_arena); -#ifndef DBUG_OFF nctx->sp= this; -#endif /* Pass arguments. */ for (arg_no= 0; arg_no < argcount; arg_no++) @@ -1919,9 +1914,7 @@ sp_head::execute_procedure(THD *thd, List<Item> *args) DBUG_RETURN(TRUE); } -#ifndef DBUG_OFF octx->sp= 0; -#endif thd->spcont= octx; /* set callers_arena to thd, for upper-level function to work */ @@ -1934,9 +1927,8 @@ sp_head::execute_procedure(THD *thd, List<Item> *args) thd->spcont= save_spcont; DBUG_RETURN(TRUE); } -#ifndef DBUG_OFF + nctx->sp= this; -#endif if (params > 0) { |