summaryrefslogtreecommitdiff
path: root/sql/create_options.cc
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2018-01-15 18:59:27 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2018-01-26 10:37:46 +0000
commit477a1bc42b318e93baa3de5dbbd20c90aeaddc28 (patch)
treee58785c5d299b0324121900b22463bde276f4015 /sql/create_options.cc
parentdb28f0f8da5c5847366e6caeec4bf3e81781d94f (diff)
downloadmariadb-git-477a1bc42b318e93baa3de5dbbd20c90aeaddc28.tar.gz
Windows : fix compile warnings C4267, on 32bit first
Diffstat (limited to 'sql/create_options.cc')
-rw-r--r--sql/create_options.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/create_options.cc b/sql/create_options.cc
index 96893aa172e..53258dac3fc 100644
--- a/sql/create_options.cc
+++ b/sql/create_options.cc
@@ -613,7 +613,8 @@ uchar *engine_option_value::frm_image(uchar *buff)
{
if (value.str)
{
- *buff++= name.length;
+ DBUG_ASSERT(name.length <= 0xff);
+ *buff++= (uchar)name.length;
memcpy(buff, name.str, name.length);
buff+= name.length;
int2store(buff, value.length | (quoted_value ? FRM_QUOTED_VALUE : 0));