diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-27 10:47:17 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-27 10:47:17 +0300 |
| commit | f50eb0d398f5f5eb2110192be436e70acd44cb9d (patch) | |
| tree | 10474699ef727691212dda1cd07fb224c1198770 /mysys | |
| parent | 2575eaa502b4253181651decfda46beef7f3f026 (diff) | |
| parent | afe00bb7cce7de279e48a83ededc71b3f8cfafcf (diff) | |
| download | mariadb-git-f50eb0d398f5f5eb2110192be436e70acd44cb9d.tar.gz | |
Merge 10.2 into 10.3
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 |