summaryrefslogtreecommitdiff
path: root/sql/sp_rcontext.h
diff options
context:
space:
mode:
authorpetr@mysql.com <>2005-08-18 11:23:54 +0200
committerpetr@mysql.com <>2005-08-18 11:23:54 +0200
commit4fb6f4dddf85d40f98086091b13c5fec39600b90 (patch)
treefd960682f9ed076d0614c2f4de630337c54c2517 /sql/sp_rcontext.h
parentde8058630db5f8abedebe99695c673912eb47390 (diff)
downloadmariadb-git-4fb6f4dddf85d40f98086091b13c5fec39600b90.tar.gz
Fix for Bug#11247 Stored procedures: Function calls in long loops leak memory
and Bug#12297 SP crashes the server if data inserted inside a lon loop Third commit attempt. With fixes to the issues, showed up after full rebuild and tests on other hosts.
Diffstat (limited to 'sql/sp_rcontext.h')
-rw-r--r--sql/sp_rcontext.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sp_rcontext.h b/sql/sp_rcontext.h
index 856beb13f6d..dedbc7bdef1 100644
--- a/sql/sp_rcontext.h
+++ b/sql/sp_rcontext.h
@@ -48,8 +48,14 @@ class sp_rcontext : public Sql_alloc
public:
- MEM_ROOT *callers_mem_root; // Used to store result fields
bool in_handler;
+ /*
+ Arena used to (re) allocate items on . E.g. reallocate INOUT/OUT
+ SP parameters when they don't fit into prealloced items. This
+ is common situation with String items. It is used mainly in
+ sp_eval_func_item().
+ */
+ Query_arena *callers_arena;
sp_rcontext(uint fsize, uint hmax, uint cmax);