diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-02 08:30:18 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-02 08:30:18 +0300 |
| commit | 97d16c7544c40430facda441dab89fa4b23468a0 (patch) | |
| tree | 4f5d68c37bce654c8d9e8dfe114ef1617f44a34f /sql/json_table.cc | |
| parent | 3330f8d15641e04242e85dd3ddb3ea5e088755c2 (diff) | |
| parent | 212994f704496d01881f377e34e04bd007e5e298 (diff) | |
| download | mariadb-git-97d16c7544c40430facda441dab89fa4b23468a0.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'sql/json_table.cc')
| -rw-r--r-- | sql/json_table.cc | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/sql/json_table.cc b/sql/json_table.cc index 4d07cf0d367..cfc90bb06db 100644 --- a/sql/json_table.cc +++ b/sql/json_table.cc @@ -118,10 +118,12 @@ int get_disallowed_table_deps_for_list(MEM_ROOT *mem_root, NESTED_JOIN *nested_join; List_iterator<TABLE_LIST> li(*join_list); - long arbitrary_var; - long stack_used_up= (available_stack_size(current_thd->thread_stack, &arbitrary_var)); DBUG_EXECUTE_IF("json_check_min_stack_requirement", - {ALLOCATE_MEM_ON_STACK(my_thread_stack_size-stack_used_up-STACK_MIN_SIZE);}); + { + long arbitrary_var; + long stack_used_up= (available_stack_size(current_thd->thread_stack, &arbitrary_var)); + ALLOCATE_MEM_ON_STACK(my_thread_stack_size-stack_used_up-STACK_MIN_SIZE); + }); if (check_stack_overrun(current_thd, STACK_MIN_SIZE , NULL)) return 1; @@ -1328,10 +1330,12 @@ static void add_extra_deps(List<TABLE_LIST> *join_list, table_map deps) TABLE_LIST *table; List_iterator<TABLE_LIST> li(*join_list); - long arbitrary_var; - long stack_used_up= (available_stack_size(current_thd->thread_stack, &arbitrary_var)); DBUG_EXECUTE_IF("json_check_min_stack_requirement", - {ALLOCATE_MEM_ON_STACK(my_thread_stack_size-stack_used_up-STACK_MIN_SIZE);}); + { + long arbitrary_var; + long stack_used_up= (available_stack_size(current_thd->thread_stack, &arbitrary_var)); + ALLOCATE_MEM_ON_STACK(my_thread_stack_size-stack_used_up-STACK_MIN_SIZE); + }); if (check_stack_overrun(current_thd, STACK_MIN_SIZE , NULL)) return; @@ -1423,10 +1427,12 @@ table_map add_table_function_dependencies(List<TABLE_LIST> *join_list, table_map res= 0; List_iterator<TABLE_LIST> li(*join_list); - long arbitrary_var; - long stack_used_up= (available_stack_size(current_thd->thread_stack, &arbitrary_var)); DBUG_EXECUTE_IF("json_check_min_stack_requirement", - {ALLOCATE_MEM_ON_STACK(my_thread_stack_size-stack_used_up-STACK_MIN_SIZE);}); + { + long arbitrary_var; + long stack_used_up= (available_stack_size(current_thd->thread_stack, &arbitrary_var)); + ALLOCATE_MEM_ON_STACK(my_thread_stack_size-stack_used_up-STACK_MIN_SIZE); + }); if ((res=check_stack_overrun(current_thd, STACK_MIN_SIZE , NULL))) return res; |