mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-21174: Fix the 32-bit build

Browse source 
mtr_t::write(): Add explicit narrowing type casts to avoid warnings
about lossy implicit conversions.
This commit is contained in:
Marko Mäkelä 2019-12-03 12:22:58 +02:00
parent af5947f433
commit 2ac0e64cad
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
storage/innobase/include/mtr0log.h
View file

@ -109,17 +109,20 @@ inline void mtr_t::write(const buf_block_t &block, byte *ptr, V val)
case 1: case 1:
if (w == OPT && mach_read_from_1(ptr) == val) return; if (w == OPT && mach_read_from_1(ptr) == val) return;
ut_ad(w != NORMAL || mach_read_from_1(ptr) != val); ut_ad(w != NORMAL || mach_read_from_1(ptr) != val);
mach_write_to_1(ptr, val); ut_ad(val == static_cast<byte>(val));
*ptr= static_cast<byte>(val);
break; break;
case 2: case 2:
ut_ad(val == static_cast<uint16_t>(val));
if (w == OPT && mach_read_from_2(ptr) == val) return; if (w == OPT && mach_read_from_2(ptr) == val) return;
ut_ad(w != NORMAL || mach_read_from_2(ptr) != val); ut_ad(w != NORMAL || mach_read_from_2(ptr) != val);
mach_write_to_2(ptr, val); mach_write_to_2(ptr, static_cast<uint16_t>(val));
break; break;
case 4: case 4:
ut_ad(val == static_cast<uint32_t>(val));
if (w == OPT && mach_read_from_4(ptr) == val) return; if (w == OPT && mach_read_from_4(ptr) == val) return;
ut_ad(w != NORMAL || mach_read_from_4(ptr) != val); ut_ad(w != NORMAL || mach_read_from_4(ptr) != val);
mach_write_to_4(ptr, val); mach_write_to_4(ptr, static_cast<uint32_t>(val));
break; break;
case 8: case 8:
if (w == OPT && mach_read_from_8(ptr) == val) return; if (w == OPT && mach_read_from_8(ptr) == val) return;