MDEV-7004 - Merge scalability fixes from 10.0-power

Preallocate dynamic array on THD mem_root to avoid expensive malloc.

MDEV-7004 - Merge scalability fixes from 10.0-power
Preallocate dynamic array on THD mem_root to avoid expensive malloc.
eaa8c154 · Sergey Vojtovich · 070a6e7a · eaa8c154
Commit eaa8c154 authored Dec 04, 2014 by Sergey Vojtovich
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

sql/sql_select.cc sql/sql_select.cc +3 -2

No files found.
--- 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)