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_rcontext.h | |
| 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_rcontext.h')
| -rw-r--r-- | sql/sp_rcontext.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sp_rcontext.h b/sql/sp_rcontext.h index cae5c5467c9..d54188aa96f 100644 --- a/sql/sp_rcontext.h +++ b/sql/sp_rcontext.h @@ -66,6 +66,14 @@ class sp_rcontext : public Sql_alloc */ Query_arena *callers_arena; +#ifndef DBUG_OFF + /* + Routine to which this Item_splocal belongs. Used for checking if correct + runtime context is used for variable handling. + */ + sp_head *owner; +#endif + sp_rcontext(sp_rcontext *prev, uint fsize, uint hmax, uint cmax); ~sp_rcontext() |