my_alloc.cmariadb-10.1.2

- Changed 0x%lx -> %p
array.c:
- Static (preallocated) buffer can now be anywhere
my_sys.h
- Define MY_INIT_BUFFER_USED
sql_delete.cc & sql_lex.cc
- Use memroot when allocating classes (avoids call to current_thd)
sql_explain.h:
- Use preallocated buffers
sql_explain.cc:
- Use preallocated buffers and memroot
sql_select.cc:
- Use multi_alloc_root() instead of many alloc_root()
- Update calls to Explain

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 65c748cc590..b32d2257a21 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -54,7 +54,7 @@
 
 void Delete_plan::save_explain_data(MEM_ROOT *mem_root, Explain_query *query)
 {
-  Explain_delete* explain= new Explain_delete;
+  Explain_delete *explain= new (mem_root) Explain_delete(mem_root);
 
   if (deleting_all_rows)
   {
@@ -74,7 +74,7 @@ void Delete_plan::save_explain_data(MEM_ROOT *mem_root, Explain_query *query)
 
 void Update_plan::save_explain_data(MEM_ROOT *mem_root, Explain_query *query)
 {
-  Explain_update* explain= new Explain_update;
+  Explain_update* explain= new (mem_root) Explain_update(mem_root);
   save_explain_data_intern(mem_root, query, explain);
   query->add_upd_del_plan(explain);
 }