diff options
author | unknown <kaa@polly.(none)> | 2007-10-18 14:32:43 +0400 |
---|---|---|
committer | unknown <kaa@polly.(none)> | 2007-10-18 14:32:43 +0400 |
commit | ddaecb2161271bd5122f22712822301ec7885ff0 (patch) | |
tree | 6093857b315df33ac892b0402efa41119c250147 /mysys/mf_sort.c | |
parent | 9014e8e951df75086520fe7c47cb26a299f3b23f (diff) | |
parent | 85f9df837c88fe748a300bd9db8d8c28fdc72cb6 (diff) | |
download | mariadb-git-ddaecb2161271bd5122f22712822301ec7885ff0.tar.gz |
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
include/my_sys.h:
Auto merged
libmysql/Makefile.shared:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/records.cc:
Auto merged
sql/sql_array.h:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/myisam/ft_boolean_search.c:
Auto merged
storage/myisam/ft_nlq_search.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
mysys/mf_keycache.c:
Manual merge.
mysys/mf_sort.c:
Manual merge.
mysys/my_lib.c:
Manual merge.
mysys/queues.c:
Manual merge.
sql/sql_acl.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
storage/csv/ha_tina.cc:
Manual merge.
storage/myisam/sort.c:
Manual merge.
Diffstat (limited to 'mysys/mf_sort.c')
-rw-r--r-- | mysys/mf_sort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/mf_sort.c b/mysys/mf_sort.c index 741c8f42327..686ebbc1d14 100644 --- a/mysys/mf_sort.c +++ b/mysys/mf_sort.c @@ -34,8 +34,8 @@ void my_string_ptr_sort(uchar *base, uint items, size_t size) { if (size && items) { - qsort2(base,items, sizeof(uchar*), get_ptr_compare(size), - (void*) &size); + my_qsort2(base,items, sizeof(uchar*), get_ptr_compare(size), + (void*) &size); } } } |