Post-merge changes for bug #31207: Test "join_nested" shows different strategy...

Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.

include/my_sys.h

@@ -784,7 +784,7 @@ extern int  get_index_dynamic(DYNAMIC_ARRAY *array, uchar * element);
 #define dynamic_element(array,array_index,type) ((type)((array)->buffer) +(array_index))
 #define push_dynamic(A,B) insert_dynamic((A),(B))
 #define reset_dynamic(array) ((array)->elements= 0)
-#define sort_dynamic(A,cmp) qsort((A)->buffer, (A)->elements, (A)->size_of_element, (cmp))
+#define sort_dynamic(A,cmp) my_qsort((A)->buffer, (A)->elements, (A)->size_of_element, (cmp))
 
 extern my_bool init_dynamic_string(DYNAMIC_STRING *str, const char *init_str,
 				   size_t init_alloc,size_t alloc_increment);

sql/partition_info.cc

@@ -666,7 +666,7 @@ bool partition_info::check_list_constants()
   if (fixed && no_list_values)
   {
     bool first= TRUE;
-    qsort((void*)list_array, no_list_values, sizeof(LIST_PART_ENTRY), 
+    my_qsort((void*)list_array, no_list_values, sizeof(LIST_PART_ENTRY), 
              &list_part_cmp);
  
     i= 0;

sql/set_var.cc

@@ -2900,7 +2900,8 @@ SHOW_VAR* enumerate_sys_vars(THD *thd, bool sorted)
 
     /* sort into order */
     if (sorted)
-      qsort(result, count + fixed_count, sizeof(SHOW_VAR), (qsort_cmp)show_cmp);
+      my_qsort(result, count + fixed_count, sizeof(SHOW_VAR),
+               (qsort_cmp) show_cmp);
     
     /* make last element empty */
     bzero(show, sizeof(SHOW_VAR));