diff options
| author | unknown <kaa@polly.(none)> | 2007-10-18 13:47:35 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-10-18 13:47:35 +0400 |
| commit | c636fbbd4bcc5ee5c679909f08e69effa75cf2d8 (patch) | |
| tree | dc3c1e3e5d9a50be6f46d86dbb366417a111716c /sql/sql_array.h | |
| parent | 2a65aba52411bd300c82d30073bc2289cd99f3ad (diff) | |
| parent | 56aad3367640122dbe69e7a638cd837782522d97 (diff) | |
| download | mariadb-git-c636fbbd4bcc5ee5c679909f08e69effa75cf2d8.tar.gz | |
Merge polly.(none):/home/kaa/src/maint/bug31207/my50-bug31174
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
myisam/sort.c:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_array.h')
| -rw-r--r-- | sql/sql_array.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_array.h b/sql/sql_array.h index e2e12bee241..dcef457dce7 100644 --- a/sql/sql_array.h +++ b/sql/sql_array.h @@ -62,7 +62,7 @@ public: void sort(CMP_FUNC cmp_func) { - qsort(array.buffer, array.elements, sizeof(Elem), (qsort_cmp)cmp_func); + my_qsort(array.buffer, array.elements, sizeof(Elem), (qsort_cmp)cmp_func); } }; |