diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-10-27 19:21:58 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-10-27 19:21:58 +0000 |
| commit | 769f0603986eee045efffe002609672682b96068 (patch) | |
| tree | 08ee349ba544814cdf9355098209f31fcfef9702 /sql | |
| parent | a81ea75390f159dfa7ae4ee6f2dc1c337975935b (diff) | |
| download | mariadb-git-769f0603986eee045efffe002609672682b96068.tar.gz | |
Fix some warnings
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field_comp.cc | 6 | ||||
| -rw-r--r-- | sql/sys_vars.ic | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sql/field_comp.cc b/sql/field_comp.cc index 473d470940d..9a7b3a7c7e0 100644 --- a/sql/field_comp.cc +++ b/sql/field_comp.cc @@ -62,6 +62,7 @@ static int uncompress_zlib(String *to, const uchar *from, uint from_length, z_stream stream; uchar original_pack_length; int wbits; + ulonglong avail_out; original_pack_length= *from & 0x07; wbits= *from & 8 ? -MAX_WBITS : MAX_WBITS; @@ -75,14 +76,15 @@ static int uncompress_zlib(String *to, const uchar *from, uint from_length, return 1; } - stream.avail_out= read_bigendian(from, original_pack_length); + avail_out= (ulonglong)read_bigendian(from, original_pack_length); - if (stream.avail_out > field_length) + if (avail_out > field_length) { my_error(ER_ZLIB_Z_DATA_ERROR, MYF(0)); return 1; } + stream.avail_out= (uint)avail_out; if (to->alloc(stream.avail_out)) return 1; diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic index da6d902a167..706240727c5 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -1767,7 +1767,7 @@ public: option.var_type|= GET_BIT; reverse_semantics= my_count_bits(bitmask_arg) > 1; bitmask= reverse_semantics ? ~bitmask_arg : bitmask_arg; - option.block_size= reverse_semantics ? -(long) bitmask : bitmask; + option.block_size= reverse_semantics ? -(long) bitmask : (long)bitmask; set(global_var_ptr(), def_val); SYSVAR_ASSERT(def_val < 2); SYSVAR_ASSERT(size == sizeof(ulonglong)); |