From eaa8c154e81cb3a9a2623f53482fe2bbd9ffa459 Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Thu, 4 Dec 2014 17:42:32 +0400 Subject: [PATCH] MDEV-7004 - Merge scalability fixes from 10.0-power Preallocate dynamic array on THD mem_root to avoid expensive malloc. --- sql/sql_select.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 4474a42b5e6..e3b34e8afc5 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5247,8 +5247,9 @@ update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse,JOIN_TAB *join_tab, /* set a barrier for the array of SARGABLE_PARAM */ (*sargables)[0].field= 0; - if (my_init_dynamic_array(keyuse,sizeof(KEYUSE),20,64, - MYF(MY_THREAD_SPECIFIC))) + if (my_init_dynamic_array2(keyuse, sizeof(KEYUSE), + thd->alloc(sizeof(KEYUSE) * 20), 20, 64, + MYF(MY_THREAD_SPECIFIC))) return TRUE; if (cond)