From 533c5cc42cb050d746ef9ee4f767945f6b4db417 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 8 Jan 2008 05:41:31 +0000 Subject: [PATCH] Sigh ... this code is even more fragile than it appears. Try setting STACK_MIN_SIZE to 24K, not either 16K nor 32K, each of which fail for different reasons. --- mysql-stack.patch | 6 ++++-- mysql.spec | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mysql-stack.patch b/mysql-stack.patch index 1fe2b67..3a37afa 100644 --- a/mysql-stack.patch +++ b/mysql-stack.patch @@ -2,7 +2,9 @@ Talk about silly byte-shaving ... the "stock" value does not work on s390x, and probably not on some other platforms either. Knock it up to twice the pre-5.0.33 value to have some margin for future changes in compiler, glibc, etc. Suspect this number if "execution_constants" regression test fails. -As of 5.0.45 and F9, it seems 16384 isn't enough either. + +As of 5.0.45 and F9, it seems 16384 isn't enough anymore (ppc fails); +while 32768 is too much as it makes other regression tests fail. diff -Naur mysql-5.0.38.orig/sql/mysql_priv.h mysql-5.0.38/sql/mysql_priv.h @@ -13,7 +15,7 @@ diff -Naur mysql-5.0.38.orig/sql/mysql_priv.h mysql-5.0.38/sql/mysql_priv.h "execution_constants" test to pass. */ -#define STACK_MIN_SIZE 12000 // Abort if less stack during eval. -+#define STACK_MIN_SIZE 32768 // Abort if less stack during eval. ++#define STACK_MIN_SIZE 24576 // Abort if less stack during eval. #define STACK_MIN_SIZE_FOR_OPEN 1024*80 #define STACK_BUFF_ALLOC 256 // For stack overrun checks diff --git a/mysql.spec b/mysql.spec index 4856f38..1f92b04 100644 --- a/mysql.spec +++ b/mysql.spec @@ -482,7 +482,7 @@ fi %{_mandir}/man1/mysql_client_test.1* %changelog -* Mon Jan 7 2008 Tom Lane 5.0.45-7 +* Tue Jan 8 2008 Tom Lane 5.0.45-7 - Unbelievable ... upstream still thinks that it's a good idea to have a regression test that is guaranteed to begin failing come January 1. - ... and it seems we need to raise STACK_MIN_SIZE again too.