get stacksize from mysql variable if not available from thread info o…

…n OS * modified: Makefile.am * modified: Makefile.in * modified: preg.c
mysqludf · Aug 14, 2013 · 54777e8 · 54777e8
1 parent 9276576
commit 54777e8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -33,7 +33,8 @@ SUBDIRS=test doc
 DIFFPROGRAM:=kompare -
 
 lib_mysqludf_preg_la_CFLAGS = -DSTANDARD -DMYSQL_SERVER @MYSQL_CFLAGS@ @MYSQL_HEADERS@ @PCRE_CFLAGS@ @GHMYSQL_CFLAGS@ @PTHREAD_CFLAGS@
-lib_mysqludf_preg_la_LDFLAGS = -module -avoid-version -no-undefined @PCRE_LIBS@ @PTHREAD_LIBS@
+#lib_mysqludf_preg_la_LDFLAGS = -module -avoid-version -no-undefined @PCRE_LIBS@ @PTHREAD_LIBS@
+lib_mysqludf_preg_la_LDFLAGS = -module -avoid-version @PCRE_LIBS@ @PTHREAD_LIBS@
 
 EXTRA_DIST = *.sql
 

diff --git a/Makefile.in b/Makefile.in
@@ -405,7 +405,8 @@ DLL_OBJS = $(CFILES:%.c=.libs/lib_mysqludf_preg_la-%.o)
 SUBDIRS = test doc
 DIFFPROGRAM := kompare -
 lib_mysqludf_preg_la_CFLAGS = -DSTANDARD -DMYSQL_SERVER @MYSQL_CFLAGS@ @MYSQL_HEADERS@ @PCRE_CFLAGS@ @GHMYSQL_CFLAGS@ @PTHREAD_CFLAGS@
-lib_mysqludf_preg_la_LDFLAGS = -module -avoid-version -no-undefined @PCRE_LIBS@ @PTHREAD_LIBS@
+#lib_mysqludf_preg_la_LDFLAGS = -module -avoid-version -no-undefined @PCRE_LIBS@ @PTHREAD_LIBS@
+lib_mysqludf_preg_la_LDFLAGS = -module -avoid-version @PCRE_LIBS@ @PTHREAD_LIBS@
 EXTRA_DIST = *.sql
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

diff --git a/preg.c b/preg.c
@@ -587,13 +587,24 @@ void pregSetLimits(pcre_extra *extra)
     thread_stack_avail = 0 ; 
 #endif
 
-    if (thread_stack_avail == 0) {
+    if (thread_stack_avail == 0) 
-        // Checks failed, assume the MySQL defaults (64/32 bit)
+    {
+        // Checks failed or OS (ie OSX) doesn't support getting current thread stack size
+        // Use information from mysqld global variable
+        //
+        extern unsigned long my_thread_stack_size;
+        thread_stack_size = my_thread_stack_size ; 
+
+        if( !thread_stack_size ) {
+            // Checks failed, assume the MySQL defaults (64/32 bit)
+            // Shouldn't ever really get here, though.
+            ghlogprintf( "Ignoring mysqld:thread_stack. Using mysql defaults.") ; 
 #ifdef _LP64
-        thread_stack_size  = 256*1024;
+            thread_stack_size  = 256*1024;
 #else
-        thread_stack_size  = 192*1024;
+            thread_stack_size  = 192*1024;
 #endif
+        }
         // And assume a current usage of 25% (_wild_ guess!)
         thread_stack_avail = thread_stack_size*0.75;
     }