diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 17:32:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 17:32:23 +0200 |
| commit | 8ee9d19607d84aeebf97b704a19453f6a772299b (patch) | |
| tree | 75e597dde9dc38b7fa3352abec7e88edddce2182 /storage/innobase/dict/dict0load.cc | |
| parent | 08f3280235efbaf20988b81653fced604de1a90f (diff) | |
| parent | 60aba058b116c1d2fa4106fc8de92daf10152480 (diff) | |
| download | mariadb-git-8ee9d19607d84aeebf97b704a19453f6a772299b.tar.gz | |
innodb 5.6.17
Diffstat (limited to 'storage/innobase/dict/dict0load.cc')
| -rw-r--r-- | storage/innobase/dict/dict0load.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index c8defc1d021..f18859393ee 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -1065,7 +1065,8 @@ loop: bool is_temp = false; bool discarded = false; - ib_uint32_t flags2 = mach_read_from_4(field); + ib_uint32_t flags2 = static_cast<ib_uint32_t>( + mach_read_from_4(field)); /* Check that the tablespace (the .ibd file) really exists; print a warning to the .err log if not. |