database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.6' into 10.7

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-02-04 14:11:46 +01:00
parent 3351dfaab0 d87979b48c
commit 9ed8deb656
910 changed files with 20135 additions and 6204 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;