diff options
| author | Alexander Barkov <bar@mariadb.org> | 2018-01-29 12:44:20 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2018-01-29 12:44:20 +0400 |
| commit | c7a2f23a7b751cd54dbdcff46a3e7bc1eabe4c02 (patch) | |
| tree | 5f884e1fdf15a1a7d3738b1dff17a91d2c26623f /sql/create_options.cc | |
| parent | b4a2baffa82e5c07b96a1c752228560dcac1359b (diff) | |
| parent | b12430adc716be51810953920448563c87fe0521 (diff) | |
| download | mariadb-git-c7a2f23a7b751cd54dbdcff46a3e7bc1eabe4c02.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/create_options.cc')
| -rw-r--r-- | sql/create_options.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/create_options.cc b/sql/create_options.cc index d010b73c222..d0a155c097f 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)); |