diff --git a/mysql-stack.patch b/mysql-stack.patch
new file mode 100644
index 0000000..aa46472
--- /dev/null
+++ b/mysql-stack.patch
@@ -0,0 +1,18 @@
+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.
+
+
+diff -Naur mysql-5.0.33.orig/sql/mysql_priv.h mysql-5.0.33/sql/mysql_priv.h
+--- mysql-5.0.33.orig/sql/mysql_priv.h	2007-01-09 07:51:48.000000000 -0500
++++ mysql-5.0.33/sql/mysql_priv.h	2007-02-09 19:06:51.000000000 -0500
+@@ -154,7 +154,7 @@
+  Feel free to raise this by the smallest amount you can to get the
+  "execution_constants" test to pass.
+  */
+-#define STACK_MIN_SIZE          10788   // Abort if less stack during eval.
++#define STACK_MIN_SIZE          16384   // 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 d0ce2be..434cb1f 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -18,6 +18,7 @@ Source5: my_config.h
 Source999: filter-requires-mysql.sh 
 Patch1: mysql-libdir.patch
 Patch2: mysql-errno.patch
+Patch3: mysql-stack.patch
 Patch4: mysql-testing.patch
 Patch5: mysql-no-atomic.patch
 Patch6: mysql-rpl_ddl.patch
@@ -110,6 +111,7 @@ the MySQL sources.
 
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1