Commit dc6b96dd authored by unknown's avatar unknown
Browse files

some last minute Windows compile fixes and makefile corrections 


VC++Files/libmysqld/libmysqld.vcproj:
  don't recall exactly what this change was.
VC++Files/libmysqltest/myTest.vcproj:
  redirect to client_release and client_debug folders
VC++Files/mysql.sln:
  remove bdb from embedded classic target
VC++Files/mysqlserver/mysqlserver.vcproj:
  redirect to lib_release and lib_debug folders
server-tools/instance-manager/mysqlmanager.vcproj:
  redirect to proper folders
sql/ha_federated.cc:
  fix windows compile problems
sql/sql_acl.cc:
  fix windows compile problems
sql/table.cc:
  fix windows compile problems
sql/unireg.cc:
  fix windows compile problems
VC++Files/mysqlserver/dummy.cpp:
  added new file to make mysqlserver generate a lib
parent ef83979a

VC++Files/libmysqld/libmysqld.vcproj

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
				AdditionalIncludeDirectories="../include,../libmysqld,../sql,../regex,../extra/yassl/include,../bdb/build_win32,../zlib"

				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;SAFEMALLOC;HAVE_BERKELEY_DB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;__WIN__"

				BasicRuntimeChecks="3"

				RuntimeLibrary="0"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/libmysqld.pch"

				AssemblerListingLocation=".\debug/"

				ObjectFile=".\debug/"

VC++Files/libmysqltest/myTest.vcproj

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="libmysql.lib odbc32.lib odbccp32.lib"

				OutputFile=".\release/myTest.exe"

				OutputFile="..\client_release/myTest.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories="..\lib_release"
@@ -74,7 +74,7 @@ 
		</Configuration>

		<Configuration

			Name="Debug|Win32"

			OutputDirectory=".\debug"

			OutputDirectory="..\client_debug"

			IntermediateDirectory=".\debug"

			ConfigurationType="1"

			UseOfMFC="0"
@@ -100,7 +100,7 @@ 
			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="libmysql.lib odbc32.lib odbccp32.lib"

				OutputFile=".\debug/myTest.exe"

				OutputFile="../client_debug/myTest.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories="..\lib_debug"

VC++Files/mysql.sln

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmysqld", "libmysqld\libm 
		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113} = {207E9014-C4D1-4F6D-B76F-BC7DD7E31113}

		{13D37150-54D0-46C5-9519-03923243C7C7} = {13D37150-54D0-46C5-9519-03923243C7C7}

		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} = {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}

		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3} = {6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}

		{D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0} = {D8E4B489-C5DD-407D-99DB-FE7C7A5A83A0}

		{262280A8-37D5-4037-BDFB-242468DFB3D2} = {262280A8-37D5-4037-BDFB-242468DFB3D2}

		{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
@@ -310,7 +309,6 @@ Global 
		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Debug.ActiveCfg = Debug|Win32

		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Debug.Build.0 = Debug|Win32

		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Classic.ActiveCfg = Debug|Win32

		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Classic.Build.0 = Debug|Win32

		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Debug.ActiveCfg = Debug|Win32

		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Debug.Build.0 = Debug|Win32

		{6EEF697A-3772-48D8-A5BA-EF11B9AC46E3}.Embedded_Pro.ActiveCfg = Debug|Win32

VC++Files/mysqlserver/dummy.cpp

0 → 100755
+0 −0

Empty file added.

VC++Files/mysqlserver/mysqlserver.vcproj

+7 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
	<Configurations>

		<Configuration

			Name="Debug|Win32"

			OutputDirectory=".\Debug"

			OutputDirectory="..\lib_debug"

			IntermediateDirectory=".\Debug"

			ConfigurationType="4"

			UseOfMFC="0"
@@ -38,7 +38,7 @@ 
				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLibrarianTool"

				OutputFile=".\Debug\mysqlserver.lib"

				OutputFile="$(OutDir)\mysqlserver.lib"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCMIDLTool"/>
@@ -63,7 +63,7 @@ 
		</Configuration>

		<Configuration

			Name="Release|Win32"

			OutputDirectory=".\release"

			OutputDirectory="..\lib_release"

			IntermediateDirectory=".\release"

			ConfigurationType="4"

			UseOfMFC="0"
@@ -90,7 +90,7 @@ 
				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLibrarianTool"

				OutputFile=".\release\mysqlserver.lib"

				OutputFile="$(OutDir)\mysqlserver.lib"

				SuppressStartupBanner="TRUE"/>

			<Tool

				Name="VCMIDLTool"/>
@@ -117,6 +117,9 @@ 
	<References>

	</References>

	<Files>

		<File

			RelativePath=".\dummy.cpp">

		</File>

	</Files>

	<Globals>

	</Globals>