Commit a15ac506 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
parents 97d8da57 462a43e1

.bzrignore

+12 −6
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ client/my_decimal.h 
client/my_user.c

client/mysql

client/mysql.cpp

client/mysql_upgrade

client/mysqladmin

client/mysqladmin.c

client/mysqladmin.cpp
@@ -321,6 +322,7 @@ cmd-line-utils/libedit/makelist 
comon.h

comp_err/*.ds?

comp_err/*.vcproj

compile

config.cache

config.guess

config.h
@@ -367,6 +369,9 @@ extra/resolve_stack_dump 
extra/resolveip

extra/sql_state.h

extra/tztime.cc

extra/yassl/taocrypt/benchmark/benchmark

extra/yassl/taocrypt/test/test

extra/yassl/testsuite/testsuite

fcns.c

fcns.h

gdbinit
@@ -549,6 +554,7 @@ libmysqld/spatial.cc 
libmysqld/sql_acl.cc

libmysqld/sql_analyse.cc

libmysqld/sql_base.cc

libmysqld/sql_builtin.cc

libmysqld/sql_cache.cc

libmysqld/sql_class.cc

libmysqld/sql_command
@@ -679,6 +685,7 @@ mysql-test/mysql-test-run.log 
mysql-test/mysql_test_run_new

mysql-test/ndb/ndbcluster

mysql-test/r/*.err

mysql-test/r/*.log

mysql-test/r/*.out

mysql-test/r/*.reject

mysql-test/r/alter_table.err
@@ -1174,6 +1181,7 @@ sql/share/gmon.out 
sql/share/mysql

sql/share/norwegian-ny/errmsg.sys

sql/share/norwegian/errmsg.sys

sql/sql_builtin.cc

sql/sql_select.cc.orig

sql/sql_yacc.cc

sql/sql_yacc.h
@@ -1747,6 +1755,10 @@ tools/mysqlmanager 
tools/mysqlmngd

tools/mysqltestmanager

tools/mysys_priv.h

unittest/examples/*.t

unittest/mysys/*.t

unittest/mytap/t/*.t

unittest/unit

vi.h

vio/*.ds?

vio/*.vcproj
@@ -1758,9 +1770,3 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj
 
mysql-test/r/*.log

client/mysql_upgrade

unittest/examples/*.t

unittest/mysys/*.t

unittest/mytap/t/*.t

unittest/unit

BUILD/SETUP.sh

+3 −12
Original line number Diff line number Diff line
@@ -147,18 +147,9 @@ static_link="$static_link --with-client-ldflags=-all-static" 
local_infile_configs="--enable-local-infile"





max_configs="--with-innodb --with-berkeley-db"

max_configs="$max_configs --with-archive-storage-engine"

max_configs="$max_configs --with-big-tables"

max_configs="$max_configs --with-blackhole-storage-engine"

max_configs="$max_configs --with-federated-storage-engine"

max_configs="$max_configs --with-csv-storage-engine"

max_configs="$max_configs --with-example-storage-engine"

max_configs="$max_configs --with-partition $SSL_LIBRARY"



max_no_embedded_configs="$max_configs --with-ndbcluster"

max_no_ndb_configs="$max_configs --without-ndbcluster --with-embedded-server"

max_configs="$max_configs --with-ndbcluster --with-embedded-server"

max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max"

max_no_ndb_configs="$SSL_LIBRARY --with-plugins=max-no-ndb --with-embedded-server"

max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server"



#

# CPU and platform specific compilation flags.

Makefile.am

+2 −3
Original line number Diff line number Diff line
@@ -24,12 +24,11 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ 
SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \

			@readline_topdir@ sql-common \

			@thread_dirs@ pstack \

			@sql_union_dirs@ storage \

			@sql_union_dirs@ storage plugin \

			@sql_server@ scripts @man_dirs@ tests \

			@mysql_se_plugins@ \

			netware @libmysqld_dirs@ \

			mysql-test support-files @tools_dirs@ \

			plugin unittest win

			unittest win



DIST_SUBDIRS =		$(SUBDIRS) BUILD

VC++Files/client/mysql_upgrade.dsp

+79 −26
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


# TARGTYPE "Win32 (x86) Console Application" 0x0103



CFG=mysql_upgrade - Win32 Release

CFG=mysql_upgrade - Win32 Debug

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

!MESSAGE use the Export Makefile command and run

!MESSAGE
@@ -13,59 +13,112 @@ CFG=mysql_upgrade - Win32 Release 
!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 "mysql_upgrade.mak" CFG="mysql_upgrade - Win32 Release"

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

!MESSAGE

!MESSAGE Possible choices for configuration are:

!MESSAGE

!MESSAGE "mysql_upgrade - Win32 Release" (based on "Win32 (x86) Console Application")

!MESSAGE "mysql_upgrade - Win32 Debug" (based on "Win32 (x86) Console Application")

!MESSAGE "mysql_upgrade - Win32 classic" (based on "Win32 (x86) Console Application")

!MESSAGE



# Begin Project

# PROP AllowPerConfigDependencies 0

# PROP Scc_ProjName ""

# PROP Scc_LocalPath ""

CPP=cl.exe

CPP=xicl6.exe

RSC=rc.exe



!IF  "$(CFG)" == "mysql_upgrade - Win32 Release"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0

# PROP BASE Output_Dir "mysql_upgrade___Win32_Release"

# PROP BASE Intermediate_Dir "mysql_upgrade___Win32_Release"

# 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 "mysql_upgrade___Win32_Release"

# PROP Intermediate_Dir "mysql_upgrade___Win32_Release"

# PROP Output_Dir "release"

# PROP Intermediate_Dir "release"

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

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

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /Fp"Release/mysql_upgrade.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c

# ADD BASE RSC /l 0x416 /d "NDEBUG"

# ADD RSC /l 0x416 /d "NDEBUG"

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib zlib.lib /nologo /subsystem:console /pdb:"release/mysql_upgrade.pdb" /machine:I386 /out:"../client_release/mysql_upgrade.exe" /libpath:"..\lib_release\\"

# SUBTRACT LINK32 /pdb:none

LINK32=xilink6.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

# ADD LINK32 mysqlclient.lib mysys.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib zlib.lib ..\extra\yassl\Release\yassl.lib /nologo /subsystem:console /machine:I386 /out:"../client_release/mysql_upgrade.exe" /libpath:"..\lib_release\\"

# SUBTRACT LINK32 /incremental:yes



!ELSEIF  "$(CFG)" == "mysql_upgrade - Win32 Debug"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 1

# PROP BASE Output_Dir "mysqlimp"

# PROP BASE Intermediate_Dir "mysqlimp"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 1

# PROP Output_Dir "debug"

# PROP Intermediate_Dir "debug"

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "_DEBUG"

# ADD RSC /l 0x409 /d "_DEBUG"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=xilink6.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

# ADD LINK32 mysqlclient.lib mysys.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib zlib.lib setargv.obj ..\extra\yassl\Debug\yassl.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysql_upgrade.exe" /pdbtype:sept /libpath:"..\lib_debug\\"



!ELSEIF  "$(CFG)" == "mysql_upgrade - Win32 classic"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0

# PROP BASE Output_Dir "mysql_upgrade___Win32_classic"

# PROP BASE Intermediate_Dir "mysql_upgrade___Win32_classic"

# PROP BASE Ignore_Export_Lib 0

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 0

# PROP Output_Dir "classic"

# PROP Intermediate_Dir "classic"

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG"  /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD  /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=xilink6.exe

# ADD BASE LINK32 mysqlclient.lib mysys.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../client_release/mysql_upgrade.exe" /libpath:"..\lib_release\\"

# SUBTRACT BASE LINK32 /incremental:yes

# ADD LINK32 mysqlclient.lib mysys.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib zlib.lib ..\extra\yassl\Release\yassl.lib /nologo /subsystem:console /machine:I386 /out:"../client_classic/mysql_upgrade.exe" /libpath:"..\lib_release\\"

# SUBTRACT LINK32 /incremental:yes



!ENDIF



# Begin Target



# Name "mysql_upgrade - Win32 Release"

# Begin Group "Source Files"



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

# Name "mysql_upgrade - Win32 Debug"

# Name "mysql_upgrade - Win32 classic"

# Begin Source File



SOURCE=.\mysql_upgrade.c

# End Source File

# End Group

# Begin Group "Header Files"



# PROP Default_Filter "h;hpp;hxx;hm;inl"

# End Group

# Begin Group "Resource Files"



# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

# End Group

# End Target

# End Project

VC++Files/client/mysql_upgrade.vcproj

0 → 100644
+232 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="Windows-1252"?>

<VisualStudioProject

	ProjectType="Visual C++"

	Version="7.10"

	Name="mysql_upgrade"

	SccProjectName=""

	SccLocalPath="">

	<Platforms>

		<Platform

			Name="Win32"/>

	</Platforms>

	<Configurations>

		<Configuration

			Name="Debug|Win32"

			OutputDirectory=".\debug"

			IntermediateDirectory=".\debug"

			ConfigurationType="1"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"

			CharacterSet="2">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/mysql_upgrade.pch"

				AssemblerListingLocation=".\debug/"

				ObjectFile=".\debug/"

				ProgramDataBaseFileName=".\debug/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="1"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib setargv.obj"

				OutputFile="../client_debug/mysql_upgrade.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile=".\debug/mysql_upgrade.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\debug/mysql_upgrade.tlb"

				HeaderFileName=""/>

			<Tool

				Name="VCPostBuildEventTool"/>

			<Tool

				Name="VCPreBuildEventTool"/>

			<Tool

				Name="VCPreLinkEventTool"/>

			<Tool

				Name="VCResourceCompilerTool"

				PreprocessorDefinitions="_DEBUG"

				Culture="1033"/>

			<Tool

				Name="VCWebServiceProxyGeneratorTool"/>

			<Tool

				Name="VCXMLDataGeneratorTool"/>

			<Tool

				Name="VCWebDeploymentTool"/>

			<Tool

				Name="VCManagedWrapperGeneratorTool"/>

			<Tool

				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

		<Configuration

			Name="Release|Win32"

			OutputDirectory=".\release"

			IntermediateDirectory=".\release"

			ConfigurationType="1"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"

			CharacterSet="2">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../"

				PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				PrecompiledHeaderFile=".\release/mysql_upgrade.pch"

				AssemblerListingLocation=".\release/"

				ObjectFile=".\release/"

				ProgramDataBaseFileName=".\release/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"

				OutputFile="../client_release/mysql_upgrade.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				ProgramDatabaseFile=".\release/mysql_upgrade.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\release/mysql_upgrade.tlb"

				HeaderFileName=""/>

			<Tool

				Name="VCPostBuildEventTool"/>

			<Tool

				Name="VCPreBuildEventTool"/>

			<Tool

				Name="VCPreLinkEventTool"/>

			<Tool

				Name="VCResourceCompilerTool"

				PreprocessorDefinitions="NDEBUG"

				Culture="1033"/>

			<Tool

				Name="VCWebServiceProxyGeneratorTool"/>

			<Tool

				Name="VCXMLDataGeneratorTool"/>

			<Tool

				Name="VCWebDeploymentTool"/>

			<Tool

				Name="VCManagedWrapperGeneratorTool"/>

			<Tool

				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

		<Configuration

			Name="classic|Win32"

			OutputDirectory=".\classic"

			IntermediateDirectory=".\classic"

			ConfigurationType="1"

			UseOfMFC="0"

			ATLMinimizesCRunTimeLibraryUsage="FALSE"

			CharacterSet="2">

			<Tool

				Name="VCCLCompilerTool"

				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../"

				PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

				PrecompiledHeaderFile=".\classic/mysql_upgrade.pch"

				AssemblerListingLocation=".\classic/"

				ObjectFile=".\classic/"

				ProgramDataBaseFileName=".\classic/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"

				OutputFile="../client_classic/mysql_upgrade.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				ProgramDatabaseFile=".\classic/mysql_upgrade.pdb"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

				Name="VCMIDLTool"

				TypeLibraryName=".\classic/mysql_upgrade.tlb"

				HeaderFileName=""/>

			<Tool

				Name="VCPostBuildEventTool"/>

			<Tool

				Name="VCPreBuildEventTool"/>

			<Tool

				Name="VCPreLinkEventTool"/>

			<Tool

				Name="VCResourceCompilerTool"

				PreprocessorDefinitions="NDEBUG"

				Culture="1033"/>

			<Tool

				Name="VCWebServiceProxyGeneratorTool"/>

			<Tool

				Name="VCXMLDataGeneratorTool"/>

			<Tool

				Name="VCWebDeploymentTool"/>

			<Tool

				Name="VCManagedWrapperGeneratorTool"/>

			<Tool

				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

		</Configuration>

	</Configurations>

	<References>

	</References>

	<Files>

		<File

			RelativePath="mysql_upgrade.c">

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

	</Files>

	<Globals>

	</Globals>

</VisualStudioProject>