summaryrefslogtreecommitdiff
path: root/include/my_sys.h
diff options
context:
space:
mode:
authorkaa@polly.(none) <>2007-10-18 14:32:43 +0400
committerkaa@polly.(none) <>2007-10-18 14:32:43 +0400
commit97226f10270476a7c2fc0ace51093e6cb5685274 (patch)
tree6093857b315df33ac892b0402efa41119c250147 /include/my_sys.h
parent9727b6dcac81cbdde1db46e1ce0d6b83939c80e6 (diff)
parent3af902ec47042c1e8cd78172c2544cb83bcb8a27 (diff)
downloadmariadb-git-97226f10270476a7c2fc0ace51093e6cb5685274.tar.gz
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
Diffstat (limited to 'include/my_sys.h')
-rw-r--r--include/my_sys.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index 2ce36760032..e919ed75541 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -710,8 +710,10 @@ extern sig_handler my_set_alarm_variable(int signo);
extern void my_string_ptr_sort(uchar *base, uint items, size_t size);
extern void radixsort_for_str_ptr(uchar* base[], uint number_of_elements,
size_t size_of_element,uchar *buffer[]);
-extern qsort_t qsort2(void *base_ptr, size_t total_elems, size_t size,
- qsort2_cmp cmp, void *cmp_argument);
+extern qsort_t my_qsort(void *base_ptr, size_t total_elems, size_t size,
+ qsort_cmp cmp);
+extern qsort_t my_qsort2(void *base_ptr, size_t total_elems, size_t size,
+ qsort2_cmp cmp, void *cmp_argument);
extern qsort2_cmp get_ptr_compare(size_t);
void my_store_ptr(uchar *buff, size_t pack_length, my_off_t pos);
my_off_t my_get_ptr(uchar *ptr, size_t pack_length);