MDEV-7004 - Merge scalability fixes from 10.0-power

Preallocate dynamic array on THD mem_root to avoid expensive malloc.
MariaDB · Dec 5, 2014 · eaa8c15 · eaa8c15
1 parent 070a6e7
commit eaa8c15
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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)