diff options
| author | Monty <monty@mariadb.org> | 2018-01-27 15:20:01 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-27 15:20:01 +0200 |
| commit | 84514ec643aafe74b7ac256fa485013e222f942e (patch) | |
| tree | 6f77ba0109d6764bd1fcae51dde8eec75e7ebc67 /sql/create_options.cc | |
| parent | 071f52839937bada46c53af23eb220e993c1e12d (diff) | |
| parent | 95f393394442437eea403d91c3c4bd68ec24fdf9 (diff) | |
| download | mariadb-git-84514ec643aafe74b7ac256fa485013e222f942e.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
sql/table.cc
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 22e58f8801b..2aab99dc47a 100644 --- a/sql/create_options.cc +++ b/sql/create_options.cc @@ -612,7 +612,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)); |