CURRENT_TEST: main.execution_constants

mysqltest: At line 75: query '$query_head 0 $query_tail' failed with wrong errno <Unknown> (2013): 'Lost connection to server during query', instead of  (0)...

CURRENT_TEST: main.sp_notembedded

mysqltest: At line 191: query 'call bug10100p(255, @var)' failed with wrong errno <Unknown> (2013): 'Lost connection to server during query', instead of ER_STACK_OVERRUN_NEED_MORE (1436)...

CURRENT_TEST: main.sp-error

mysqltest: At line 2445: query 'call p1(1)' failed with wrong errno <Unknown> (2013): 'Lost connection to server during query', instead of  (0)...

CURRENT_TEST: main.json_debug_nonembedded

mysqltest: At line 16: query 'SELECT * from JSON_TABLE('[{"a": 1, "b": [11,111]}, {"a": 2, "b": [22,222]}]', '$[*]' COLUMNS( a INT PATH '$.a')) as tt' succeeded - should have failed with error ER_STACK_OVERRUN_NEED_MORE (1436)...

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc

index 655dde315aa..c8ac5f9c502 100644

--- a/sql/sql_parse.cc

+++ b/sql/sql_parse.cc

@@ -7438,20 +7438,21 @@ long max_stack_used;

 */

 bool

-#if defined __GNUC__ && !defined __clang__

 /*

   Do not optimize the function in order to preserve a stack variable creation.

   Otherwise, the variable pointed as "buf" can be removed due to a missing

   usage.

  */

-__attribute__((optimize("-O0")))

+#ifdef __clang__

+__attribute__((optnone))

+#elif defined __GNUC__

+__attribute__((optimize(0)))

 #endif

 check_stack_overrun(THD *thd, long margin, uchar *buf __attribute__((unused)))

 {

-  long stack_used;

   DBUG_ASSERT(thd == current_thd);

-  if ((stack_used= available_stack_size(thd->thread_stack, &stack_used)) >=

-      (long) (my_thread_stack_size - margin))

+  const long stack_used= -available_stack_size(thd->thread_stack, &stack_used);

+  if (stack_used < 0 || stack_used >= (long) (my_thread_stack_size - margin))

   {

     thd->is_fatal_error= 1;

     /*

CURRENT_TEST: main.json_debug_nonembedded

mysqltest: At line 17: query 'SELECT JSON_CONTAINS(@json1, @json2)' failed with wrong errno 2013: 'Lost connection to MySQL server during query', instead of 1436...

…

AddressSanitizer:DEADLYSIGNAL

=================================================================

==969262==ERROR: AddressSanitizer: SEGV on unknown address 0x7f3c95699000 (pc 0x7f3ca0770f0a bp 0x7f3c96a95e10 sp 0x7f3c953cdf38 T5)

==969262==The signal is caused by a WRITE memory access.

    #0 0x7f3ca0770f0a in __memset_avx2_unaligned_erms ../sysdeps/x86_64/multiarch/memset-vec-unaligned-erms.S:328

    #1 0x55ab7b559aac in check_contains /mariadb/10.5/sql/item_jsonfunc.cc:1174

    #2 0x55ab7b5665bb in Item_func_json_contains::val_int() /mariadb/10.5/sql/item_jsonfunc.cc:1374

static int check_contains(json_engine_t *js, json_engine_t *value)

{

  json_engine_t loc_js;

  bool set_js;

  DBUG_EXECUTE_IF("json_check_min_stack_requirement",

                  {

                    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;

# Cross building requires stack direction instruction

ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))

    ifneq (,$(filter $(DEB_HOST_ARCH_CPU),alpha amd64 arm arm64 i386 ia64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64))

        CMAKEFLAGS += -DSTACK_DIRECTION=-1

    endif

    ifneq (,$(filter $(DEB_HOST_ARCH_CPU),hppa))

        CMAKEFLAGS += -DSTACK_DIRECTION=1

    endif

endif

main.json_debug_nonembedded              w3 [ pass ]      1

main.sp-error                            w2 [ pass ]    203

main.execution_constants                 w1 [ pass ]    187

main.sp_notembedded                      w4 [ pass ]    208

main.json_debug_nonembedded              [ skipped ]  Requires debug build

main.sp-error                            w1 [ pass ]    188

main.execution_constants                 w3 [ pass ]    169

main.sp_notembedded                      w4 [ pass ]    184

  DBUG_EXECUTE_IF("json_check_min_stack_requirement", return 1;);

  if (check_stack_overrun(current_thd, STACK_MIN_SIZE , NULL))

    return 1;

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc

index abcd690ba8a..fdbc82e9ad9 100644

--- a/sql/sql_parse.cc

+++ b/sql/sql_parse.cc

@@ -7444,15 +7444,17 @@ long max_stack_used;

   - Passing to check_stack_overrun() prevents the compiler from removing it.

 */

-bool

-#if defined __GNUC__ && !defined __clang__

 /*

   Do not optimize the function in order to preserve a stack variable creation.

   Otherwise, the variable pointed as "buf" can be removed due to a missing

   usage.

  */

+#ifdef __clang__

+__attribute__((optnone))

+#elif defined __GNUC__

 __attribute__((optimize("-O0")))

 #endif

+bool

 check_stack_overrun(THD *thd, long margin, uchar *buf __attribute__((unused)))

 {

   long stack_used;