From 5109313e664edb0e99fcf2d7afcba5cfc00f6b66 Mon Sep 17 00:00:00 2001
From: Davi Arnaut <Davi.Arnaut@Sun.COM>
Date: Wed, 2 Sep 2009 08:45:48 -0300
Subject: [PATCH 1/2] Increase thread stack size on HP-UX when built with
 debug.

---
 storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
index 5300d5bbfd9..c107baca39f 100644
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
@@ -106,8 +106,13 @@ void
 AsyncFile::doStart() 
 {
   // Stacksize for filesystem threads
-  // An 8k stack should be enough
+#if !defined(DBUG_OFF) && defined (__hpux)
+  // Empirical evidence indicates at least 32k
+  const NDB_THREAD_STACKSIZE stackSize = 32768;
+#else
+  // Otherwise an 8k stack should be enough
   const NDB_THREAD_STACKSIZE stackSize = 8192;
+#endif
 
   char buf[16];
   numAsyncFiles++;

From ca96ac53518f97655e34b590463887a3e166a266 Mon Sep 17 00:00:00 2001
From: Davi Arnaut <Davi.Arnaut@Sun.COM>
Date: Wed, 2 Sep 2009 09:02:22 -0300
Subject: [PATCH 2/2] Post-merge fix. Observe C declaration placement rules.

---
 mysys/mf_iocache.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
index 3aab904a6e0..c4c48f9c121 100644
--- a/mysys/mf_iocache.c
+++ b/mysys/mf_iocache.c
@@ -228,18 +228,20 @@ int init_io_cache(IO_CACHE *info, File file, uint cachesize,
     for (;;)
     {
       uint buffer_block;
+      /*
+        Unset MY_WAIT_IF_FULL bit if it is set, to prevent conflict with
+        MY_ZEROFILL.
+      */
+      myf flags= (myf) (cache_myflags & ~(MY_WME | MY_WAIT_IF_FULL));
+
       if (cachesize < min_cache)
 	cachesize = min_cache;
       buffer_block = cachesize;
       if (type == SEQ_READ_APPEND)
 	buffer_block *= 2;
-      /*
-        Unset MY_WAIT_IF_FULL bit if it is set, to prevent conflict with
-        MY_ZEROFILL.
-      */
-      myf flag = MYF((cache_myflags & ~ (MY_WME | MY_WAIT_IF_FULL)) |
-                (cachesize == min_cache ? MY_WME : 0));
-      if ((info->buffer= (byte*) my_malloc(buffer_block, flag)) != 0)
+      if (cachesize == min_cache)
+        flags|= (myf) MY_WME;
+      if ((info->buffer= (byte*) my_malloc(buffer_block, flags)) != 0)
       {
 	info->write_buffer=info->buffer;
 	if (type == SEQ_READ_APPEND)