bk commit into 5.1 tree (jani:1.2129)

[jani]

Below is the list of changes that have just been committed into a local
5.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.2129 06/02/02 20:14:48 jani@stripped +2 -0
  Merge jamppa@stripped:/home/bk/mysql-5.1-new
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new

  sql/set_var.cc
    1.165 06/02/02 20:14:37 jani@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.529 06/02/02 20:14:37 jani@stripped +0 -0
    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-5.1-new/RESYNC

--- 1.528/sql/mysqld.cc	2006-02-02 16:19:02 +02:00
+++ 1.529/sql/mysqld.cc	2006-02-02 20:14:37 +02:00
@@ -134,6 +134,13 @@
 #define zVOLSTATE_DEACTIVE 2
 #define zVOLSTATE_MAINTENANCE 3
 
+#undef __event_h__
+#include <../include/event.h>
+/*
+  This #undef exists here because both libc of NetWare and MySQL have
+  files named event.h which causes compilation errors.
+*/
+
 #include <nks/netware.h>
 #include <nks/vm.h>
 #include <library.h>
@@ -3305,6 +3312,10 @@
       mysql_bin_log.purge_logs_before_date(purge_time);
   }
 #endif
+#ifdef __NETWARE__
+  /* Increasing stacksize of threads on NetWare */
+  pthread_attr_setstacksize(&connection_attrib, NW_THD_STACKSIZE);
+#endif
 
   if (opt_myisam_log)
     (void) mi_log(1);
@@ -3538,7 +3549,6 @@
 #endif
 #ifdef __NETWARE__
   /* Increasing stacksize of threads on NetWare */
-  
   pthread_attr_setstacksize(&connection_attrib, NW_THD_STACKSIZE);
 #endif
 

--- 1.164/sql/set_var.cc	2006-02-02 16:19:11 +02:00
+++ 1.165/sql/set_var.cc	2006-02-02 20:14:37 +02:00
@@ -215,8 +215,9 @@
 						   &delayed_insert_timeout);
 sys_var_long_ptr	sys_delayed_queue_size("delayed_queue_size",
 					       &delayed_queue_size);
-sys_var_event_executor        sys_event_executor("event_scheduler",
-                                               (my_bool *)&event_executor_running_global_var);
+sys_var_event_executor  sys_event_executor("event_scheduler",
+					   (my_bool *)
+					   &event_executor_running_global_var);
 sys_var_long_ptr	sys_expire_logs_days("expire_logs_days",
 					     &expire_logs_days);
 sys_var_bool_ptr	sys_flush("flush", &myisam_flush);