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

Merge branch '10.1' into 10.2

This commit is contained in:
Sergei Golubchik
2018-05-10 13:01:42 +02:00
145 changed files with 2320 additions and 2653 deletions

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;
/*********************************************************************************/