mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 15:45:33 +02:00
MDEV-24909 JSON functions don't respect KILL QUERY / max_statement_time limit
pass the pointer to thd->killed down to the json library, check it while scanning, use thd->check_killed() to generate the proper error message
This commit is contained in:
parent
bae9fb5904
commit
bc10f58a58
5 changed files with 115 additions and 3 deletions
|
|
@ -222,6 +222,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;
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue