diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-11-23 00:58:13 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-11-23 00:58:13 +0200 |
| commit | a2c26aa7109182ede0ad1d06f53b46cc3b41e2c2 (patch) | |
| tree | 090d0e3fbda21d8ca03a84a74f8b011335f23efb /sql/sp_head.cc | |
| parent | 57e1c5aa9a56bbe75f3a0bc8344b3a1346438bbb (diff) | |
| parent | 6574612df871c5803fe79e547a20053470e39797 (diff) | |
| download | mariadb-git-a2c26aa7109182ede0ad1d06f53b46cc3b41e2c2.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
sql/item.h:
Auto merged
sql/protocol.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/sp.result:
merge
mysql-test/r/trigger.result:
merge
mysql-test/t/sp.test:
merge
mysql-test/t/trigger.test:
merge
sql/item.cc:
merge
sql/sp_rcontext.h:
merge
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 5161ad0f64b..601d41a0afe 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1175,6 +1175,9 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, Item **resp) // QQ Should have some error checking here? (types, etc...) if (!(nctx= new sp_rcontext(octx, csize, hmax, cmax))) goto end; +#ifndef DBUG_OFF + nctx->owner= this; +#endif for (i= 0 ; i < argcount ; i++) { sp_pvar_t *pvar = m_pcont->find_pvar(i); @@ -1319,6 +1322,9 @@ int sp_head::execute_procedure(THD *thd, List<Item> *args) { // Create a temporary old context if (!(octx= new sp_rcontext(octx, csize, hmax, cmax))) DBUG_RETURN(-1); +#ifndef DBUG_OFF + octx->owner= 0; +#endif thd->spcont= octx; /* set callers_arena to thd, for upper-level function to work */ @@ -1330,6 +1336,9 @@ int sp_head::execute_procedure(THD *thd, List<Item> *args) thd->spcont= save_spcont; DBUG_RETURN(-1); } +#ifndef DBUG_OFF + nctx->owner= this; +#endif if (csize > 0 || hmax > 0 || cmax > 0) { |