diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2011-01-07 17:32:41 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2011-01-07 17:32:41 -0200 |
| commit | 0918a3a2abe81bb2bd28a1903cbc8eaf260a2bd6 (patch) | |
| tree | b9c2923b4073c154a26f0fc5819b9a75d4aa75a3 /sql/item.h | |
| parent | ff3f14db616444b020954b17cd35adc7fd0f4485 (diff) | |
| download | mariadb-git-0918a3a2abe81bb2bd28a1903cbc8eaf260a2bd6.tar.gz | |
Bug#58765: Warning in item.h on Windows
Truncate the maximum result length (64-bit wide type) to fit into
the item maximum length (32-bit wide type). This is possible as
this specific branch is only used if the maximum result length
is less than 0x1000000 (MAX_BLOB_WIDTH), which fits comfortably
in a 32-bit wide type.
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 6d10c6a6076..3fa11cfd8dd 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1231,7 +1231,7 @@ public: maybe_null= 1; } else - max_length= max_result_length; + max_length= (uint32) max_result_length; } void fix_length_and_charset_datetime(uint32 max_char_length_arg) { |