From df602ff7fa5ed9424a1d7ebaba67b665e2f6d1f6 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Thu, 16 Jan 2025 23:04:59 +0100 Subject: [PATCH] Fix main.stack on Windows A part of the test, that tests that a frame of recursive SP takes the same amount of stack, relies on the fact that 3 calls to that SP are executed in the same OS thread. This is not guaranteed with threadpool(not with Windows native threadpool, anyway) Fix the test to execute SP calls in the same thread, as semicolon-separated batched command. --- mysql-test/main/stack.result | 1 + mysql-test/main/stack.test | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mysql-test/main/stack.result b/mysql-test/main/stack.result index 5444381327d..d30a55cd21a 100644 --- a/mysql-test/main/stack.result +++ b/mysql-test/main/stack.result @@ -37,6 +37,7 @@ $$ call recursion(0,2,@s1); call recursion(0,3,@s2); call recursion(0,4,@s3); +$$ select @s1 > 0 && @s2 > 0 && @s3 > 0; @s1 > 0 && @s2 > 0 && @s3 > 0 1 diff --git a/mysql-test/main/stack.test b/mysql-test/main/stack.test index 2277b0f48ff..8884ad45572 100644 --- a/mysql-test/main/stack.test +++ b/mysql-test/main/stack.test @@ -40,11 +40,13 @@ begin end; $$ -delimiter ;$$ - call recursion(0,2,@s1); call recursion(0,3,@s2); call recursion(0,4,@s3); +$$ + +delimiter ;$$ + select @s1 > 0 && @s2 > 0 && @s3 > 0; if (`select @s2-@s1 <> @s3 - @s2`)