diff options
| author | unknown <kaa@polly.(none)> | 2007-10-18 15:17:21 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-10-18 15:17:21 +0400 |
| commit | 89810417ae8321b4cf44e1321e776cb2e29ec538 (patch) | |
| tree | 6d2f030551bc5a1c0ace579dc75025e78bceb582 | |
| parent | ddaecb2161271bd5122f22712822301ec7885ff0 (diff) | |
| download | mariadb-git-89810417ae8321b4cf44e1321e776cb2e29ec538.tar.gz | |
Post-merge changes for bug #31207: Test "join_nested" shows different strategy on IA64 CPUs / Intel's ICC compiler.
| -rw-r--r-- | include/my_sys.h | 2 | ||||
| -rw-r--r-- | sql/partition_info.cc | 4 | ||||
| -rw-r--r-- | sql/set_var.cc | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index e919ed75541..638b1f4a2d4 100644 --- a/include/my_sys.h +++ b/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); diff --git a/sql/partition_info.cc b/sql/partition_info.cc index ab887d5dda0..86d50cdf524 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -666,8 +666,8 @@ 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), - &list_part_cmp); + my_qsort((void*)list_array, no_list_values, sizeof(LIST_PART_ENTRY), + &list_part_cmp); i= 0; LINT_INIT(prev_value); diff --git a/sql/set_var.cc b/sql/set_var.cc index ec82b56d793..9a6ad9ce662 100644 --- a/sql/set_var.cc +++ b/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)); |