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 branch 'connect/10.2' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2018-08-07 16:54:53 +02:00
parent 4ddcb4eb46 9644415fa9
commit 26e2dd39c5
12 changed files with 144 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/connect/jsonudf.cpp
View File

@ -4631,7 +4631,7 @@ char *jbin_array(UDF_INIT *initid, UDF_ARGS *args, char *result,
bsp = NULL;
if (!bsp && (bsp = JbinAlloc(g, args, initid->max_length, NULL)))
strncpy(bsp->Msg, g->Message, 139);
strncpy(bsp->Msg, g->Message, BMX);
// Keep result of constant function
g->Xchk = (initid->const_item) ? bsp : NULL;