diff options
| -rw-r--r-- | strings/ctype-uca.c | 13 | ||||
| -rw-r--r-- | strings/strings_def.h | 7 |
2 files changed, 11 insertions, 9 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index 19ce17c3856..60de0a106a1 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -20902,12 +20902,21 @@ static void my_hash_sort_uca(CHARSET_INFO *cs, /* Add back that has for the space characters */ do { - MY_HASH_ADD_16(m1, m2, space_weight); + /* + We can't use MY_HASH_ADD_16() here as we, because of a misstake + in the original code, where we added the 16 byte variable the + opposite way. Changing this would cause old partitioned tables + to fail. + */ + MY_HASH_ADD(m1, m2, space_weight >> 8); + MY_HASH_ADD(m1, m2, space_weight & 0xFF); } while (--count != 0); } - MY_HASH_ADD_16(m1, m2, s_res); + /* See comment above why we can't use MY_HASH_ADD_16() */ + MY_HASH_ADD(m1, m2, s_res >> 8); + MY_HASH_ADD(m1, m2, s_res & 0xFF); } end: *nr1= m1; diff --git a/strings/strings_def.h b/strings/strings_def.h index d601f5ca697..fb280b6bb6b 100644 --- a/strings/strings_def.h +++ b/strings/strings_def.h @@ -109,11 +109,4 @@ static inline const uchar *skip_trailing_space(const uchar *ptr,size_t len) #define MY_HASH_ADD_16(A, B, value) \ do { MY_HASH_ADD(A, B, ((value) & 0xFF)) ; MY_HASH_ADD(A, B, ((value >>8 ))); } while(0) -/* - This one is needed to ensure we get the exact same hash as MariaDB 5.1 - This is needed to ensure that old partitioned tables still work as before. -*/ -#define MY_HASH_ADD_16_INV(A, B, value) \ - do { MY_HASH_ADD(A, B, ((value >> 8))) ; MY_HASH_ADD(A, B, ((value & 0xFF ))); } while(0) - #endif |