bk commit into 4.1 tree (jani:1.2478)

[jani]

Below is the list of changes that have just been committed into a local
4.1 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2478 06/01/12 17:47:58 jani@stripped +4 -0
  Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

  sql/mysqld.cc
    1.609 06/01/12 17:47:55 jani@stripped +6 -5
    Merge from 4.0 to 4.1

  netware/mysqld_safe.c
    1.9 06/01/12 17:47:54 jani@stripped +17 -15
    Merge from 4.0 to 4.1

  innobase/os/os0thread.c
    1.28 06/01/12 17:27:19 jani@stripped +0 -0
    Auto merged

  include/config-netware.h
    1.11 06/01/12 17:27:19 jani@stripped +1 -1
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	ua141d10.elisa.omakaista.fi
# Root:	/home/my/bk/mysql-4.1/RESYNC

--- 1.608/sql/mysqld.cc	2005-12-23 13:38:14 +02:00
+++ 1.609/sql/mysqld.cc	2006-01-12 17:47:55 +02:00
@@ -3089,6 +3089,12 @@
     }
   }
 #endif
+#ifdef __NETWARE__
+  /* Increasing stacksize of threads on NetWare */
+  
+  pthread_attr_setstacksize(&connection_attrib, NW_THD_STACKSIZE);
+#endif
+
   thread_stack_min=thread_stack - STACK_MIN_SIZE;
 
   (void) thr_setconcurrency(concurrency);	// 10 by default

--- 1.27/innobase/os/os0thread.c	2005-03-07 12:03:27 +02:00
+++ 1.28/innobase/os/os0thread.c	2006-01-12 17:27:19 +02:00
@@ -148,6 +148,15 @@
 		 exit(1);
 	}
 #endif
+#ifdef __NETWARE__
+	ret = pthread_attr_setstacksize(&attr,
+					(size_t) NW_THD_STACKSIZE);
+        if (ret) {
+	         fprintf(stderr,
+          "InnoDB: Error: pthread_attr_setstacksize returned %d\n", ret);
+		 exit(1);
+	}
+#endif
 	os_mutex_enter(os_sync_mutex);
 	os_thread_count++;
 	os_mutex_exit(os_sync_mutex);

--- 1.10/include/config-netware.h	2005-10-28 14:03:59 +03:00
+++ 1.11/include/config-netware.h	2006-01-12 17:27:19 +02:00
@@ -92,6 +92,9 @@
 /* On NetWare, stack grows towards lower address*/
 #define STACK_DIRECTION -1
 
+/* On NetWare, we need to set stack size for threads, otherwise default 16K is used */
+#define NW_THD_STACKSIZE 65536
+
 /* On NetWare, to fix the problem with the deletion of open files */
 #define CANT_DELETE_OPEN_FILES 1