Commit 337ae797 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint-gca 

into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.1-new-maint


storage/innobase/srv/srv0start.c:
  Auto merged
parents e1f08634 6930d9d2

storage/innobase/srv/srv0start.c

+1 −1
Original line number Diff line number Diff line
@@ -1163,7 +1163,7 @@ innobase_start_or_create_for_mysql(void) 
	maximum number of threads that can wait in the 'srv_conc array' for

	their time to enter InnoDB. */



#if defined(__WIN__) || defined(__NETWARE__)

#if defined(__NETWARE__)



	/* Create less event semaphores because Win 98/ME had

	difficulty creating 40000 event semaphores.  Comment from