diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 09:01:01 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 09:01:01 +0300 |
| commit | 80ed136e6dd4a021b1fc9b7bd7077bf989c3d247 (patch) | |
| tree | cc24f0e4e9241920329865a1b66c1d086aaeaa9a /mysys | |
| parent | 675c22c065110be03a5fab82442d2c3dc32aefff (diff) | |
| parent | a0588d54a20488b17a178244989e1abc5151a88a (diff) | |
| download | mariadb-git-80ed136e6dd4a021b1fc9b7bd7077bf989c3d247.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/ma_dyncol.c | 6 | ||||
| -rw-r--r-- | mysys/mf_iocache.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c index b3d3777d922..8e8ac8a98a4 100644 --- a/mysys/ma_dyncol.c +++ b/mysys/ma_dyncol.c @@ -865,7 +865,7 @@ dynamic_column_uint_read(DYNAMIC_COLUMN_VALUE *store_it_here, static size_t dynamic_column_sint_bytes(longlong val) { - return dynamic_column_uint_bytes((val << 1) ^ + return dynamic_column_uint_bytes((((ulonglong) val) << 1) ^ (val < 0 ? 0xffffffffffffffffull : 0)); } @@ -883,8 +883,8 @@ static enum enum_dyncol_func_result dynamic_column_sint_store(DYNAMIC_COLUMN *str, longlong val) { return dynamic_column_uint_store(str, - (val << 1) ^ - (val < 0 ? 0xffffffffffffffffULL : 0)); + (((ulonglong) val) << 1) ^ + (val < 0 ? 0xffffffffffffffffULL : 0)); } diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 82ab6f20646..2d6031fa8cd 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2011, Oracle and/or its affiliates - Copyright (c) 2010, 2020, MariaDB + Copyright (c) 2010, 2021, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |