database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source 
Conflicts:
	sql/table.cc
This commit is contained in:
Monty
2018-01-27 15:20:01 +02:00
parent 071f528399 95f3933944
commit 84514ec643
41 changed files with 230 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/create_options.cc
View File

@ -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));