mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-04 22:25:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.7' into 10.8

Browse source
This commit is contained in:
Oleksandr Byelkin 2022-02-04 14:50:25 +01:00
commit 4fb2cb1a30
907 changed files with 20188 additions and 6217 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/json_lib.h
View file

@ -224,6 +224,7 @@ typedef struct st_json_engine_t
int stack[JSON_DEPTH_LIMIT]; /* Keeps the stack of nested JSON structures. */
int stack_p; /* The 'stack' pointer. */
volatile uchar *killed_ptr;
} json_engine_t;