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

This commit is contained in:
unknown 2007-10-18 15:17:21 +04:00
commit 89810417ae
3 changed files with 5 additions and 4 deletions

View file

@ -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));