List:Commits« Previous MessageNext Message »
From:pkarthick Date:January 18 2006 3:01pm
Subject:bk commit into 5.1 tree (pkarthick:1.2073)
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.2073 06/01/18 20:31:00 pkarthick@stripped +2 -0
  NetWare specific change to fix the compilation errors caused by event.h

  sql/mysqld.cc
    1.520 06/01/18 20:30:55 pkarthick@stripped +7 -0
    NetWare specific change to fix the compilation errors caused by event.h

  include/config-netware.h
    1.15 06/01/18 20:30:55 pkarthick@stripped +14 -0
    NetWare specific change to fix the compilation errors caused by event.h

# 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 20:30:55 +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.14/include/config-netware.h	2006-01-12 23:37:03 +05:30
+++ 1.15/include/config-netware.h	2006-01-18 20:30:55 +05:30
@@ -19,6 +19,14 @@
 #ifndef _config_netware_h
 #define _config_netware_h
 
+#define __event_h__
+#define _EVENT_H_
+/* 
+  These two #define(s) are needed as both libc of NetWare and MySQL have 
+  files named event.h which causes compilation errors.
+*/
+
+
 /* required headers */
 #include <unistd.h>
 #include <stdio.h>
@@ -34,6 +42,12 @@
 #include <sys/time.h>
 #include <pthread.h>
 #include <termios.h>
+
+#undef _EVENT_H_
+/* 
+  This #undef exist here because both libc of NetWare and MySQL have 
+  files named event.h which causes compilation errors.
+*/
 
 #ifdef __cplusplus
 extern "C" {
Thread
bk commit into 5.1 tree (pkarthick:1.2073)pkarthick18 Jan