List:Commits« Previous MessageNext Message »
From:pkarthick Date:January 18 2006 2:21pm
Subject:bk commit into 5.1 tree (pkarthick:1.2078)
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.2078 06/01/18 19:51:06 pkarthick@stripped[prem] +2 -0
  5.1_event.h.patch

  sql/mysqld.cc
    1.520 06/01/18 18:02:29 pkarthick@stripped[prem] +2 -1
    Import patch 5.1_event.h.patch

  include/config-netware.h
    1.16 06/01/18 18:02:29 pkarthick@stripped[prem] +3 -2
    Import patch 5.1_event.h.patch

# 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

--- 1.519/sql/mysqld.cc	2006-01-17 13:54:49 +05:30
+++ 1.520/sql/mysqld.cc	2006-01-18 18:02:29 +05:30
@@ -133,7 +133,8 @@
 #define zVOLSTATE_ACTIVE 6
 #define zVOLSTATE_DEACTIVE 2
 #define zVOLSTATE_MAINTENANCE 3
-
+#undef  __event_h__
+#include <include/event.h>
 #include <nks/netware.h>
 #include <nks/vm.h>
 #include <library.h>

--- 1.15/include/config-netware.h	2006-01-04 11:36:45 +05:30
+++ 1.16/include/config-netware.h	2006-01-18 18:02:29 +05:30
@@ -18,7 +18,8 @@
 
 #ifndef _config_netware_h
 #define _config_netware_h
-
+#define __event_h__
+#define _EVENT_H_
 /* required headers */
 #include <unistd.h>
 #include <stdio.h>
@@ -34,7 +35,7 @@
 #include <sys/time.h>
 #include <pthread.h>
 #include <termios.h>
-
+#undef  _EVENT_H_
 #ifdef __cplusplus
 extern "C" {
 #endif
Thread
bk commit into 5.1 tree (pkarthick:1.2078)pkarthick18 Jan