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 '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2018-05-10 13:01:42 +02:00
parent 92a13148e8 ff579bc814
commit 9b1824dcd2
145 changed files with 2320 additions and 2653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/connect/jsonudf.cpp
View File

@ -41,8 +41,6 @@ static PJSON JsonNew(PGLOBAL g, JTYP type);
static PJVAL JvalNew(PGLOBAL g, JTYP type, void *vp = NULL);
static PJSNX JsnxNew(PGLOBAL g, PJSON jsp, int type, int len = 64);
void json_array_deinit(UDF_INIT* initid);
static uint JsonGrpSize = 10;
/*********************************************************************************/