Commit 1665d237 authored by unknown's avatar unknown
Browse files

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0 

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


include/config-netware.h:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
netware/mysqld_safe.c:
  Merge from 4.0 to 4.1
sql/mysqld.cc:
  Merge from 4.0 to 4.1
parents 0fa2fdb9 2946f9a6

include/config-netware.h

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ extern "C" { 
/* 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

innobase/os/os0thread.c

+9 −0
Original line number Diff line number Diff line
@@ -147,6 +147,15 @@ os_thread_create( 
          "InnoDB: Error: pthread_attr_setstacksize returned %d\n", ret);

		 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++;

sql/mysqld.cc

+6 −0
Original line number Diff line number Diff line
@@ -3089,6 +3089,12 @@ int main(int argc, char **argv) 
    }

  }

#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

netware/mysqld_safe.c

+6 −6

File changed.

Contains only whitespace changes.