Commit f000604a authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1 

into mysql.com:/home/jonas/src/wl1744


configure.in:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/common/mgmcommon/Makefile.am:
  Auto merged
ndb/src/common/mgmcommon/NdbConfig.c:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/Makefile.am:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents 8eae81ba b7a44f59

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ Administrador@light. 
Administrator@co3064164-a.

Administrator@co3064164-a.rochd1.qld.optushome.com.au

Administrator@fred.

Administrator@w2k.

Greg@greg-laptop.

Miguel@light.local

Sinisa@sinisa.nasamreza.org

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -3153,6 +3153,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl 
 support-files/MacOSX/Makefile mysql-test/Makefile dnl

 netware/Makefile dnl

 include/mysql_version.h dnl

 ndb/include/ndb_version.h dnl

 cmd-line-utils/Makefile dnl

 cmd-line-utils/libedit/Makefile dnl

 zlib/Makefile dnl

ndb/Makefile.am

+8 −0
Original line number Diff line number Diff line
@@ -17,3 +17,11 @@ dist-hook: 
	    done; \

	  fi; \

	done



windoze:

	for i in `find . -name 'Makefile.am'`; do make -C `dirname $$i` windoze-dsp; done



windoze-dsp:



all-windoze-dsp: windoze

	tar cvfz ndb-win-dsp.tar.gz `find . -name '*.dsp'`

ndb/config/win-includes

0 → 100755
+8 −0
Original line number Diff line number Diff line 
#!/bin/sh



dst=$1

shift



out=`echo $* | sed 's/-I\([^ ]*\)/\/I "\1"/g'` 

sed -e "s!@includes@!$out!g" $dst > /tmp/$dst.$$

mv /tmp/$dst.$$ $dst

ndb/config/win-lib.am

0 → 100644
+159 −0
Original line number Diff line number Diff line 
# Microsoft Developer Studio Project File - Name="@name@" - Package Owner=<4>

# Microsoft Developer Studio Generated Build File, Format Version 6.00

# ** DO NOT EDIT **



# TARGTYPE "Win32 (x86) Static Library" 0x0104



CFG=@name@ - Win32 Debug

!MESSAGE This is not a valid makefile. To build this project using NMAKE,

!MESSAGE use the Export Makefile command and run

!MESSAGE

!MESSAGE NMAKE /f "@name@.mak".

!MESSAGE

!MESSAGE You can specify a configuration when running NMAKE

!MESSAGE by defining the macro CFG on the command line. For example:

!MESSAGE

!MESSAGE NMAKE /f "@name@.mak" CFG="@name@ - Win32 Debug"

!MESSAGE

!MESSAGE Possible choices for configuration are:

!MESSAGE

!MESSAGE "@name@ - Win32 Release" (based on "Win32 (x86) Static Library")

!MESSAGE "@name@ - Win32 Debug" (based on "Win32 (x86) Static Library")

!MESSAGE "@name@ - Win32 TLS_DEBUG" (based on "Win32 (x86) Static Library")

!MESSAGE "@name@ - Win32 TLS" (based on "Win32 (x86) Static Library")

!MESSAGE



# Begin Project

# PROP AllowPerConfigDependencies 0

# PROP Scc_ProjName ""

# PROP Scc_LocalPath ""

CPP=xicl6.exe

RSC=rc.exe



!IF  "$(CFG)" == "@name@ - Win32 Release"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0

# PROP BASE Output_Dir "Release"

# PROP BASE Intermediate_Dir "Release"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 0

# PROP Output_Dir "release"

# PROP Intermediate_Dir "release"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /D "WIN32" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c

# ADD BASE CPP @includes@

# ADD CPP @includes@

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409

# ADD RSC /l 0x409

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LIB32=xilink6.exe -lib

# ADD BASE LIB32 /nologo

# ADD LIB32 /nologo /out:"..\lib_release\@name@.lib"

@release_libs@



!ELSEIF  "$(CFG)" == "@name@ - Win32 Debug"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 1

# PROP BASE Output_Dir "Debug"

# PROP BASE Intermediate_Dir "Debug"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 1

# PROP Output_Dir "debug"

# PROP Intermediate_Dir "debug"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /D "WIN32" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c

# ADD BASE CPP @includes@

# ADD CPP @includes@

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409

# ADD RSC /l 0x409

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LIB32=xilink6.exe -lib

# ADD BASE LIB32 /nologo

# ADD LIB32 /nologo /out:"..\lib_debug\@name@.lib"

@debug_libs@



!ELSEIF  "$(CFG)" == "@name@ - Win32 TLS_DEBUG"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 1

# PROP BASE Output_Dir "@name@___Win32_TLS_DEBUG"

# PROP BASE Intermediate_Dir "@name@___Win32_TLS_DEBUG"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 1

# PROP Output_Dir "@name@___Win32_TLS_DEBUG"

# PROP Intermediate_Dir "@name@___Win32_TLS_DEBUG"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /D "WIN32" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /D "WIN32" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /FD /c

# ADD BASE CPP @includes@

# ADD CPP @includes@

# ADD BASE RSC /l 0x409

# ADD RSC /l 0x409

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LIB32=link.exe -lib

# ADD BASE LIB32 /nologo /out:"..\lib_debug\@name@_tls.lib"

# ADD LIB32 /nologo /out:"..\lib_debug\@name@_tls.lib"

@tls_debug_libs@



!ELSEIF  "$(CFG)" == "@name@ - Win32 TLS"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0

# PROP BASE Output_Dir "@name@___Win32_TLS"

# PROP BASE Intermediate_Dir "@name@___Win32_TLS"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 0

# PROP Output_Dir "@name@___Win32_TLS"

# PROP Intermediate_Dir "@name@___Win32_TLS"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /D "WIN32" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /D "WIN32" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /FD /c

# ADD BASE CPP @includes@

# ADD CPP @includes@

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409

# ADD RSC /l 0x409

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LIB32=link.exe -lib

# ADD BASE LIB32 /nologo /out:"..\lib_release\@name@_tls.lib"

# ADD LIB32 /nologo /out:"..\lib_release\@name@_tls.lib"

@tls_release_libs@



!ENDIF



# Begin Target



# Name "@name@ - Win32 Release"

# Name "@name@ - Win32 Debug"

# Name "@name@ - Win32 TLS_DEBUG"

# Name "@name@ - Win32 TLS"



# Begin Group "Source Files"

# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"



@sources@



# End Group



# End Target

# End Project