List:Commits« Previous MessageNext Message »
From:pkarthick Date:January 20 2006 3:05am
Subject:bk commit into 5.1 tree (pkarthick:1.2082)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of prem. When prem 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.2082 06/01/20 08:35:41 pkarthick@stripped +4 -0
  Merge bk://mysql.bkbits.net/mysql-5.1-new
  into  novell.com:/home/prem/bk/mysql-5.1

  sql/sql_class.cc
    1.239 06/01/20 08:35:35 pkarthick@stripped +0 -0
    Auto merged

  sql/set_var.cc
    1.160 06/01/20 08:35:35 pkarthick@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.522 06/01/20 08:35:35 pkarthick@stripped +0 -0
    Auto merged

  configure.in
    1.334 06/01/20 08:35:35 pkarthick@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:	pkarthick
# Host:	blr-naas-nwl04.blr.novell.com
# Root:	/home/prem/bk/mysql-5.1/RESYNC

--- 1.333/configure.in	2006-01-20 03:10:51 +05:30
+++ 1.334/configure.in	2006-01-20 08:35:35 +05:30
@@ -2546,14 +2546,16 @@
 case $SYSTEM_TYPE in
   *netware*)
     MAKE_BINARY_DISTRIBUTION_OPTIONS=--no-strip
+    CONF_ARGS=--host="$MACHINE_TYPE-$SYSTEM_TYPE"
     ;;
   *)
     MAKE_BINARY_DISTRIBUTION_OPTIONS=
+    CONF_ARGS=
     ;;
 esac
 
 for CONF in $other_configures; do
-  (cd `dirname $CONF`; ./`basename $CONF` --build=$build_alias)
+  (cd `dirname $CONF`; ./`basename $CONF` $CONF_ARGS --build=$build_alias)
 done
 
 AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)

--- 1.521/sql/mysqld.cc	2006-01-19 12:28:39 +05:30
+++ 1.522/sql/mysqld.cc	2006-01-20 08:35:35 +05:30
@@ -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>

--- 1.238/sql/sql_class.cc	2006-01-20 03:10:51 +05:30
+++ 1.239/sql/sql_class.cc	2006-01-20 08:35:35 +05:30
@@ -2261,6 +2261,7 @@
   return pending;              /* This is the current pending event */
 }
 
+#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
 /*
   Instansiate the versions we need, we have -fno-implicit-template as
   compiling option.
@@ -2279,6 +2280,7 @@
 THD::binlog_prepare_pending_rows_event(TABLE*, uint32, MY_BITMAP const*,
 				       my_size_t colcnt, my_size_t, bool,
 				       Update_rows_log_event *);
+#endif
 static char const* 
 field_type_name(enum_field_types type) 
 {

--- 1.159/sql/set_var.cc	2006-01-18 14:15:55 +05:30
+++ 1.160/sql/set_var.cc	2006-01-20 08:35:35 +05:30
@@ -109,7 +109,7 @@
 
 
 
-extern my_bool event_executor_running_global_var;
+extern volatile my_bool event_executor_running_global_var;
 
 static HASH system_variable_hash;
 const char *bool_type_names[]= { "OFF", "ON", NullS };
@@ -215,8 +215,8 @@
 						   &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",
-                                               &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);
Thread
bk commit into 5.1 tree (pkarthick:1.2082)pkarthick20 Jan