diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-07-31 22:59:58 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-07-31 22:59:58 +0200 |
| commit | 7841a7eb09208f52fcbab7e80e38c7ca29b1339e (patch) | |
| tree | 7f9c4d80d3b86a33c54ff0090865ada4d4ed577d /mysys | |
| parent | 77992bc710bbc16798c12da7081769817f87791a (diff) | |
| parent | 1423cf5e3dcb3c50047f086a5933fe77006cf242 (diff) | |
| download | mariadb-git-7841a7eb09208f52fcbab7e80e38c7ca29b1339e.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_qsort.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_qsort.c b/mysys/mf_qsort.c index 3f91bb35354..b516639a341 100644 --- a/mysys/mf_qsort.c +++ b/mysys/mf_qsort.c @@ -114,7 +114,7 @@ qsort_t my_qsort(void *base_ptr, size_t count, size_t size, qsort_cmp cmp) stack[0].low=stack[0].high=0; #endif pivot = (char *) my_alloca((int) size); - ptr_cmp= size == sizeof(char*) && !((low - (char*) 0)& (sizeof(char*)-1)); + ptr_cmp= size == sizeof(char*) && (intptr_t)low % sizeof(char*) == 0; /* The following loop sorts elements between high and low */ do |