hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2017-03-22 15:20:21 +02:00
parent 039f6e3487 27d81cda6a
commit 7bd05d4581
107 changed files with 3365 additions and 3638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
avro/maxavro_record.c
View File

@ -98,10 +98,11 @@ static json_t* read_and_pack_value(MAXAVRO_FILE *file, MAXAVRO_SCHEMA_FIELD *fie
case MAXAVRO_TYPE_BYTES:
case MAXAVRO_TYPE_STRING:
{
char *str = maxavro_read_string(file);
size_t len;
char *str = maxavro_read_string(file, &len);
if (str)
{
value = json_string(str);
value = json_stringn(str, len);
MXS_FREE(str);
}
}