summaryrefslogtreecommitdiff
path: root/sql/sp_rcontext.h
diff options
context:
space:
mode:
authorunknown <monty@mishka.local>2004-09-15 22:36:57 +0300
committerunknown <monty@mishka.local>2004-09-15 22:36:57 +0300
commit6c3e66510c29abb4a935483a711b55f3ff8607ab (patch)
treec54782bf59455786d3d6b7abf02e40aaac69b1ff /sql/sp_rcontext.h
parentffc0d185da3c80f713b541cb52934712c24ce8cb (diff)
parent4ef01ca25c71ac59e751ea478a13dff480ebb98e (diff)
downloadmariadb-git-6c3e66510c29abb4a935483a711b55f3ff8607ab.tar.gz
Merge
BitKeeper/etc/logging_ok: auto-union sql/ha_berkeley.cc: Auto merged sql/ha_heap.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_help.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_class.h: SCCS merged sql/sql_parse.cc: SCCS merged
Diffstat (limited to 'sql/sp_rcontext.h')
-rw-r--r--sql/sp_rcontext.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sp_rcontext.h b/sql/sp_rcontext.h
index 15a2fe62138..f26b6760310 100644
--- a/sql/sp_rcontext.h
+++ b/sql/sp_rcontext.h
@@ -46,6 +46,8 @@ class sp_rcontext : public Sql_alloc
public:
+ bool in_handler;
+
sp_rcontext(uint fsize, uint hmax, uint cmax);
~sp_rcontext()