From be71f3ccb61d3c4f1ebc096ba4e5e1563f578681 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 16 Dec 2007 20:37:22 +0200 Subject: Fixed after-merge problems. --- storage/maria/ma_sort.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'storage/maria/ma_sort.c') diff --git a/storage/maria/ma_sort.c b/storage/maria/ma_sort.c index 874d6fcd6e0..64f451982a9 100644 --- a/storage/maria/ma_sort.c +++ b/storage/maria/ma_sort.c @@ -653,8 +653,8 @@ static int write_keys(MARIA_SORT_PARAM *info, register uchar **sort_keys, uint sort_length=info->key_length; DBUG_ENTER("write_keys"); - qsort2((uchar*) sort_keys,count,sizeof(uchar*),(qsort2_cmp) info->key_cmp, - info); + my_qsort2((uchar*) sort_keys,count,sizeof(uchar*),(qsort2_cmp) info->key_cmp, + info); if (!my_b_inited(tempfile) && open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST", DISK_BUFFER_SIZE, info->sort_info->param->myf_rw)) @@ -696,8 +696,8 @@ static int write_keys_varlen(MARIA_SORT_PARAM *info, int err; DBUG_ENTER("write_keys_varlen"); - qsort2((uchar*) sort_keys,count,sizeof(uchar*),(qsort2_cmp) info->key_cmp, - info); + my_qsort2((uchar*) sort_keys,count,sizeof(uchar*),(qsort2_cmp) info->key_cmp, + info); if (!my_b_inited(tempfile) && open_cached_file(tempfile, my_tmpdir(info->tmpdir), "ST", DISK_BUFFER_SIZE, info->sort_info->param->myf_rw)) @@ -740,8 +740,8 @@ static int write_index(MARIA_SORT_PARAM *info, { DBUG_ENTER("write_index"); - qsort2((uchar*) sort_keys,(size_t) count,sizeof(uchar*), - (qsort2_cmp) info->key_cmp,info); + my_qsort2((uchar*) sort_keys,(size_t) count,sizeof(uchar*), + (qsort2_cmp) info->key_cmp,info); while (count--) { if ((*info->key_write)(info, *sort_keys++)) -- cgit v1.2.1