Merge bk-internal:/home/bk/mysql-5.0-maint

into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023: Auto merged BitKeeper/deleted/.del-test_db.sql: Auto merged mysql-test/install_test_db.sh: Auto merged mysql-test/mysql-test-run.pl: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.h: Auto merged netware/Makefile.am: Manual merge

Merge bk-internal:/home/bk/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023: Auto merged BitKeeper/deleted/.del-test_db.sql: Auto merged mysql-test/install_test_db.sh: Auto merged mysql-test/mysql-test-run.pl: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.h: Auto merged netware/Makefile.am: Manual merge
eedbddb6 · unknown · 610943a1 · 95f3675c · eedbddb6 · eedbddb6
Commit eedbddb6 authored Mar 21, 2007 by unknown
178 changed files
--- a/.bzrignore
+++ b/.bzrignore
@@ -1068,7 +1068,9 @@ ndbcluster-1186/ndb_3.pid
 ndbcluster-1186/ndb_3_cluster.log
 ndbcluster-1186/ndb_3_out.log
 ndbcluster-1186/ndbcluster.pid
+netware/init_db.sql
 netware/libmysql.imp
+netware/test_db.sql
 pack_isam/*.ds?
 perror/*.ds?
 perror/*.vcproj
@@ -1337,5 +1339,3 @@ win/vs71cache.txt
 win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
-netware/init_db.sql
-netware/test_db.sql
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -114,6 +114,10 @@ check_cpu () {
    *i386*i486*)
      cpu_arg="pentium-m";
      ;;
+    #Core 2 Duo  
+    *Intel*Core\(TM\)2*)
+      cpu_arg="nocona";
+      ;;

    # Intel ia64
    *Itanium*)

--- a/EXCEPTIONS-CLIENT
+++ b/EXCEPTIONS-CLIENT
@@ -4,7 +4,7 @@ The MySQL AB Exception for Free/Libre and Open Source
 Software-only Applications Using MySQL Client Libraries (the
 "FLOSS Exception").

-Version 0.5, 30 August 2006
+Version 0.6, 7 March 2007

 Exception Intent

@@ -59,10 +59,12 @@ Apache Software License 1.0/1.1/2.0
 Apple Public Source License 2.0
 Artistic license From Perl 5.8.0
 BSD license "July 22 1999"
+Common Development and Distribution License (CDDL) 1.0
 Common Public License 1.0
+Eclipse Public License 1.0
 GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1
 Jabber Open Source License 1.0
-MIT license ---
+MIT license (As listed in file MIT-License.txt) ---
 Mozilla Public License (MPL) 1.0/1.1
 Open Software License 2.0
 OpenSSL license (with original SSLeay license) "2003" ("1998")

--- a/Makefile.am
+++ b/Makefile.am
@@ -112,7 +112,9 @@ tags:
 .PHONY:	init-db bin-dist \
  test    test-force    test-full    test-force-full    test-force-mem \
  test-pl test-force-pl test-full-pl test-force-full-pl test-force-pl-mem \
-  test-ps test-ns
+  test-ps test-ns test-ext-funcs test-ext \
+  test-fast test-fast-cursor test-fast-view test-fast-prepare \
+  test-full-qa

 # Target 'test' will run the regression test suite using the built server.
 #
@@ -124,11 +126,11 @@ tags:

 test-ps:
 	cd mysql-test ; \
-	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol
+	@PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol

 test-ns:
 	cd mysql-test ; \
-	@PERL@ ./mysql-test-run.pl $(force)
+	@PERL@ ./mysql-test-run.pl $(force) $(mem)

 test:	test-ns test-ps

@@ -143,7 +145,7 @@ test-force-full:

 #used by autopush.pl to run memory based tests
 test-force-mem:
-	$(MAKE) 'force=--force --mem' test
+	$(MAKE) force=--force mem=--mem test

 # Keep these for a while
 test-pl:	test
@@ -152,5 +154,31 @@ test-force-pl:	test-force
 test-force-pl-mem:  test-force-mem
 test-force-full-pl: test-force-full

+test-ext-funcs:
+	cd mysql-test ; \
+	@PERL@ ./mysql-test-run.pl --force --suite=funcs_1 ; \
+	@PERL@ ./mysql-test-run.pl --force --suite=funcs_2
+
+test-ext:	test-ext-funcs
+
+test-fast:
+	cd mysql-test ; \
+	@PERL@ ./mysql-test-run.pl $(subset) --force --skip-ndb --skip-innodb --skip-im --skip-rpl ; \
+	@PERL@ ./mysql-test-run.pl $(subset) --force --suite=funcs_1 --do-test=myisam
+
+test-fast-view:
+	$(MAKE) subset=--view-protocol test-fast
+
+test-fast-cursor:
+	$(MAKE) subset=--cursor-protocol test-fast
+
+test-fast-prepare:
+	$(MAKE) subset=--ps-protocol test-fast
+
+test-full-qa:
+	$(MAKE) force=--force test-pl \
+	test-ext test-fast-view \
+	test-fast-cursor
+
 # Don't update the files from bitkeeper
 %::SCCS/s.%
--- a/VC++Files/bdb/bdb.vcproj
+++ b/VC++Files/bdb/bdb.vcproj
--- a/VC++Files/client/mysql.vcproj
+++ b/VC++Files/client/mysql.vcproj
@@ -10,74 +10,10 @@
 			Name="Win32"/>
 	</Platforms>
 	<Configurations>
-		<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,../,../extra/yassl/include"
-				PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\classic/mysql.pch"
-				AssemblerListingLocation=".\classic/"
-				ObjectFile=".\classic/"
-				ProgramDataBaseFileName=".\classic/"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
-				OutputFile="../client_classic/mysql.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\classic/mysql.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\classic/mysql.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="Release|Win32"
-			OutputDirectory=".\release"
-			IntermediateDirectory=".\release"
+			OutputDirectory=".\release_obj"
+			IntermediateDirectory=".\release_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -92,19 +28,20 @@
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\release/mysql.pch"
-				AssemblerListingLocation=".\release/"
-				ObjectFile=".\release/"
-				ProgramDataBaseFileName=".\release/"
+				PrecompiledHeaderFile=".\release_obj/mysql.pch"
+				AssemblerListingLocation=".\release_obj/"
+				ObjectFile=".\release_obj/"
+				ProgramDataBaseFileName=".\release_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
-				OutputFile="../client_release/mysql.exe"
+				OutputFile=".\release/mysql.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
@@ -114,7 +51,7 @@
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\release/mysql.tlb"
+				TypeLibraryName=".\release_obj/mysql.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -139,8 +76,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\debug"
-			IntermediateDirectory=".\debug"
+			OutputDirectory=".\debug_obj"
+			IntermediateDirectory=".\debug_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -151,11 +88,12 @@
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="../include,../,../extra/yassl/include"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
+				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\debug/mysql.pch"
-				AssemblerListingLocation=".\debug/"
-				ObjectFile=".\debug/"
-				ProgramDataBaseFileName=".\debug/"
+				PrecompiledHeaderFile=".\debug_obj/mysql.pch"
+				AssemblerListingLocation=".\debug_obj/"
+				ObjectFile=".\debug_obj/"
+				ProgramDataBaseFileName=".\debug_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="1"
@@ -165,7 +103,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
-				OutputFile="../client_debug/mysql.exe"
+				OutputFile=".\debug/mysql.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
@@ -175,7 +113,7 @@
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\debug/mysql.tlb"
+				TypeLibraryName=".\debug_obj/mysql.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -204,113 +142,15 @@
 	<Files>
 		<File
 			RelativePath="completion_hash.cpp">
-			<FileConfiguration
-				Name="classic|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="mysql.cpp">
-			<FileConfiguration
-				Name="classic|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-					DebugInformationFormat="3"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-					DebugInformationFormat="3"/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="readline.cpp">
-			<FileConfiguration
-				Name="classic|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="sql_string.cpp">
-			<FileConfiguration
-				Name="classic|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
 		</File>
 	</Files>
 	<Globals>

--- a/VC++Files/client/mysql_upgrade.vcproj
+++ b/VC++Files/client/mysql_upgrade.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\debug"
-			IntermediateDirectory=".\debug"
+			OutputDirectory=".\debug_obj"
+			IntermediateDirectory=".\debug_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -24,11 +24,12 @@
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="../include,../"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
+				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\debug/mysql_upgrade.pch"
-				AssemblerListingLocation=".\debug/"
-				ObjectFile=".\debug/"
-				ProgramDataBaseFileName=".\debug/"
+				PrecompiledHeaderFile=".\debug_obj/mysql_upgrade.pch"
+				AssemblerListingLocation=".\debug_obj/"
+				ObjectFile=".\debug_obj/"
+				ProgramDataBaseFileName=".\debug_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="1"
@@ -38,7 +39,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib setargv.obj"
-				OutputFile="../client_debug/mysql_upgrade.exe"
+				OutputFile=".\debug/mysql_upgrade.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
@@ -48,7 +49,7 @@
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\debug/mysql_upgrade.tlb"
+				TypeLibraryName=".\debug_obj/mysql_upgrade.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -73,8 +74,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\release"
-			IntermediateDirectory=".\release"
+			OutputDirectory=".\release_obj"
+			IntermediateDirectory=".\release_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -85,23 +86,24 @@
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="../include,../"
-				PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG"
+				PreprocessorDefinitions="DBUG_OFF;NDEBUG;_CONSOLE;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\release/mysql_upgrade.pch"
-				AssemblerListingLocation=".\release/"
-				ObjectFile=".\release/"
-				ProgramDataBaseFileName=".\release/"
+				PrecompiledHeaderFile=".\release_obj/mysql_upgrade.pch"
+				AssemblerListingLocation=".\release_obj/"
+				ObjectFile=".\release_obj/"
+				ProgramDataBaseFileName=".\release_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
-				OutputFile="../client_release/mysql_upgrade.exe"
+				OutputFile=".\release/mysql_upgrade.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
@@ -110,69 +112,7 @@
 				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"
+				TypeLibraryName=".\release_obj/mysql_upgrade.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -201,30 +141,6 @@
 	<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>

--- a/VC++Files/client/mysqladmin.vcproj
+++ b/VC++Files/client/mysqladmin.vcproj
@@ -10,72 +10,10 @@
 			Name="Win32"/>
 	</Platforms>
 	<Configurations>
-		<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/mysqladmin.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/mysqladmin.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile=".\classic/mysqladmin.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\classic/mysqladmin.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="Release|Win32"
-			OutputDirectory=".\release"
-			IntermediateDirectory=".\release"
+			OutputDirectory=".\release_obj"
+			IntermediateDirectory=".\release_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -86,23 +24,24 @@
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="../include,../"
-				PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG"
+				PreprocessorDefinitions="DBUG_OFF;NDEBUG;_CONSOLE;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\release/mysqladmin.pch"
-				AssemblerListingLocation=".\release/"
-				ObjectFile=".\release/"
-				ProgramDataBaseFileName=".\release/"
+				PrecompiledHeaderFile=".\release_obj/mysqladmin.pch"
+				AssemblerListingLocation=".\release_obj/"
+				ObjectFile=".\release_obj/"
+				ProgramDataBaseFileName=".\release_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
-				OutputFile="../client_release/mysqladmin.exe"
+				OutputFile=".\release/mysqladmin.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
@@ -111,7 +50,7 @@
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\release/mysqladmin.tlb"
+				TypeLibraryName=".\release_obj/mysqladmin.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -136,8 +75,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\debug"
-			IntermediateDirectory=".\debug"
+			OutputDirectory=".\debug_obj"
+			IntermediateDirectory=".\debug_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -148,11 +87,12 @@
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="../include,../"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
+				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\debug/mysqladmin.pch"
-				AssemblerListingLocation=".\debug/"
-				ObjectFile=".\debug/"
-				ProgramDataBaseFileName=".\debug/"
+				PrecompiledHeaderFile=".\debug_obj/mysqladmin.pch"
+				AssemblerListingLocation=".\debug_obj/"
+				ObjectFile=".\debug_obj/"
+				ProgramDataBaseFileName=".\debug_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="1"
@@ -162,7 +102,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
-				OutputFile="../client_debug/mysqladmin.exe"
+				OutputFile=".\debug/mysqladmin.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
@@ -172,7 +112,7 @@
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\debug/mysqladmin.tlb"
+				TypeLibraryName=".\debug_obj/mysqladmin.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -201,30 +141,6 @@
 	<Files>
 		<File
 			RelativePath="mysqladmin.cpp">
-			<FileConfiguration
-				Name="classic|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
 		</File>
 	</Files>
 	<Globals>

--- a/VC++Files/client/mysqlclient.vcproj
+++ b/VC++Files/client/mysqlclient.vcproj
--- a/VC++Files/client/mysqldump.vcproj
+++ b/VC++Files/client/mysqldump.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\debug"
-			IntermediateDirectory=".\debug"
+			OutputDirectory=".\debug_obj"
+			IntermediateDirectory=".\debug_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -24,11 +24,12 @@
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="../include,../"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
+				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\debug/mysqldump.pch"
-				AssemblerListingLocation=".\debug/"
-				ObjectFile=".\debug/"
-				ProgramDataBaseFileName=".\debug/"
+				PrecompiledHeaderFile=".\debug_obj/mysqldump.pch"
+				AssemblerListingLocation=".\debug_obj/"
+				ObjectFile=".\debug_obj/"
+				ProgramDataBaseFileName=".\debug_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="1"
@@ -38,17 +39,17 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
-				OutputFile="../client_debug/mysqldump.exe"
+				OutputFile=".\debug/mysqldump.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories=".\debug"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\debug/mysqldump.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\debug/mysqldump.tlb"
+				TypeLibraryName=".\debug_obj/mysqldump.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -73,8 +74,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\release"
-			IntermediateDirectory=".\release"
+			OutputDirectory=".\release_obj"
+			IntermediateDirectory=".\release_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -85,94 +86,33 @@
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="../include,../"
-				PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG"
+				PreprocessorDefinitions="DBUG_OFF;NDEBUG;_CONSOLE;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\release/mysqldump.pch"
-				AssemblerListingLocation=".\release/"
-				ObjectFile=".\release/"
-				ProgramDataBaseFileName=".\release/"
+				PrecompiledHeaderFile=".\release_obj/mysqldump.pch"
+				AssemblerListingLocation=".\release_obj/"
+				ObjectFile=".\release_obj/"
+				ProgramDataBaseFileName=".\release_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
-				OutputFile="../client_release/mysqldump.exe"
+				OutputFile=".\release/mysqldump.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories=".\release"
 				ProgramDatabaseFile=".\release/mysqldump.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\release/mysqldump.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/mysqldump.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/mysqldump.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile=".\classic/mysqldump.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\classic/mysqldump.tlb"
+				TypeLibraryName=".\release_obj/mysqldump.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -200,58 +140,10 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="mysqldump.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>
+			RelativePath="my_user.c">
 		</File>
 		<File
-			RelativePath="my_user.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>
+			RelativePath="mysqldump.c">
 		</File>
 	</Files>
 	<Globals>

--- a/VC++Files/client/mysqlimport.vcproj
+++ b/VC++Files/client/mysqlimport.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\debug"
-			IntermediateDirectory=".\debug"
+			OutputDirectory=".\debug_obj"
+			IntermediateDirectory=".\debug_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -24,11 +24,12 @@
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="../include,../"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
+				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\debug/mysqlimport.pch"
-				AssemblerListingLocation=".\debug/"
-				ObjectFile=".\debug/"
-				ProgramDataBaseFileName=".\debug/"
+				PrecompiledHeaderFile=".\debug_obj/mysqlimport.pch"
+				AssemblerListingLocation=".\debug_obj/"
+				ObjectFile=".\debug_obj/"
+				ProgramDataBaseFileName=".\debug_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="1"
@@ -38,7 +39,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib setargv.obj"
-				OutputFile="../client_debug/mysqlimport.exe"
+				OutputFile=".\debug/mysqlimport.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
@@ -48,7 +49,7 @@
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\debug/mysqlimport.tlb"
+				TypeLibraryName=".\debug_obj/mysqlimport.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -73,8 +74,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\release"
-			IntermediateDirectory=".\release"
+			OutputDirectory=".\release_obj"
+			IntermediateDirectory=".\release_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -85,23 +86,24 @@
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="../include,../"
-				PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG"
+				PreprocessorDefinitions="DBUG_OFF;NDEBUG;_CONSOLE;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\release/mysqlimport.pch"
-				AssemblerListingLocation=".\release/"
-				ObjectFile=".\release/"
-				ProgramDataBaseFileName=".\release/"
+				PrecompiledHeaderFile=".\release_obj/mysqlimport.pch"
+				AssemblerListingLocation=".\release_obj/"
+				ObjectFile=".\release_obj/"
+				ProgramDataBaseFileName=".\release_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
-				OutputFile="../client_release/mysqlimport.exe"
+				OutputFile=".\release/mysqlimport.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
@@ -110,69 +112,7 @@
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\release/mysqlimport.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/mysqlimport.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/mysqlimport.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile=".\classic/mysqlimport.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\classic/mysqlimport.tlb"
+				TypeLibraryName=".\release_obj/mysqlimport.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -201,30 +141,6 @@
 	<Files>
 		<File
 			RelativePath="mysqlimport.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>

--- a/VC++Files/client/mysqlshow.vcproj
+++ b/VC++Files/client/mysqlshow.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\release"
-			IntermediateDirectory=".\release"
+			OutputDirectory=".\release_obj"
+			IntermediateDirectory=".\release_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -24,23 +24,24 @@
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="../include,../"
-				PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG"
+				PreprocessorDefinitions="DBUG_OFF;NDEBUG;_CONSOLE;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\release/mysqlshow.pch"
-				AssemblerListingLocation=".\release/"
-				ObjectFile=".\release/"
-				ProgramDataBaseFileName=".\release/"
+				PrecompiledHeaderFile=".\release_obj/mysqlshow.pch"
+				AssemblerListingLocation=".\release_obj/"
+				ObjectFile=".\release_obj/"
+				ProgramDataBaseFileName=".\release_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
-				OutputFile="../client_release/mysqlshow.exe"
+				OutputFile=".\release/mysqlshow.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
@@ -49,69 +50,7 @@
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\release/mysqlshow.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/mysqlshow.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/mysqlshow.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile=".\classic/mysqlshow.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\classic/mysqlshow.tlb"
+				TypeLibraryName=".\release_obj/mysqlshow.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -136,8 +75,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\debug"
-			IntermediateDirectory=".\debug"
+			OutputDirectory=".\debug_obj"
+			IntermediateDirectory=".\debug_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -148,11 +87,12 @@
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="../include,../"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
+				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\debug/mysqlshow.pch"
-				AssemblerListingLocation=".\debug/"
-				ObjectFile=".\debug/"
-				ProgramDataBaseFileName=".\debug/"
+				PrecompiledHeaderFile=".\debug_obj/mysqlshow.pch"
+				AssemblerListingLocation=".\debug_obj/"
+				ObjectFile=".\debug_obj/"
+				ProgramDataBaseFileName=".\debug_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="1"
@@ -162,7 +102,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
-				OutputFile="../client_debug/mysqlshow.exe"
+				OutputFile=".\debug/mysqlshow.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
@@ -172,7 +112,7 @@
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\debug/mysqlshow.tlb"
+				TypeLibraryName=".\debug_obj/mysqlshow.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -201,30 +141,6 @@
 	<Files>
 		<File
 			RelativePath="mysqlshow.c">
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="classic|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
 		</File>
 	</Files>
 	<Globals>

--- a/VC++Files/client/mysqltest.vcproj
+++ b/VC++Files/client/mysqltest.vcproj
@@ -12,35 +12,36 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\release"
-			IntermediateDirectory=".\release"
+			OutputDirectory=".\release_obj"
+			IntermediateDirectory=".\release_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="4"
+				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="../extra,../include,../regex,../extra/yassl/include,../"
-				PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG"
+				PreprocessorDefinitions="DBUG_OFF;NDEBUG;_CONSOLE;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\release/mysqltest.pch"
-				AssemblerListingLocation=".\release/"
-				ObjectFile=".\release/"
-				ProgramDataBaseFileName=".\release/"
+				PrecompiledHeaderFile=".\release_obj/mysqltest.pch"
+				AssemblerListingLocation=".\release_obj/"
+				ObjectFile=".\release_obj/"
+				ProgramDataBaseFileName=".\release_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
-				OutputFile="..\client_release\mysqltest.exe"
+				OutputFile=".\release/mysqltest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
@@ -51,71 +52,7 @@
 				Name="VCMIDLTool"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName=".\release/mysqltest.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="4"
-				InlineFunctionExpansion="1"
-				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../extra,../include,../regex,../extra/yassl/include,../"
-				PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\classic/mysqltest.pch"
-				AssemblerListingLocation=".\classic/"
-				ObjectFile=".\classic/"
-				ProgramDataBaseFileName=".\classic/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
-				OutputFile="..\client_classic\mysqltest.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
-				ProgramDatabaseFile=".\classic/mysqltest.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\classic/mysqltest.tlb"
+				TypeLibraryName=".\release_obj/mysqltest.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -140,8 +77,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\debug"
-			IntermediateDirectory=".\debug"
+			OutputDirectory=".\debug_obj"
+			IntermediateDirectory=".\debug_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -154,10 +91,10 @@
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\debug/mysqltest.pch"
-				AssemblerListingLocation=".\debug/"
-				ObjectFile=".\debug/"
-				ProgramDataBaseFileName=".\debug/"
+				PrecompiledHeaderFile=".\debug_obj/mysqltest.pch"
+				AssemblerListingLocation=".\debug_obj/"
+				ObjectFile=".\debug_obj/"
+				ProgramDataBaseFileName=".\debug_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="1"
@@ -167,7 +104,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
-				OutputFile="..\client_debug\mysqltest.exe"
+				OutputFile=".\debug/mysqltest.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
@@ -179,7 +116,7 @@
 				Name="VCMIDLTool"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName=".\debug/mysqltest.tlb"
+				TypeLibraryName=".\debug_obj/mysqltest.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -208,55 +145,9 @@
 	<Files>
 		<File
 			RelativePath="..\libmysql\manager.c">
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="classic|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-					BasicRuntimeChecks="3"/>
-			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="mysqltest.c">
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="classic|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="0"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""
-					BasicRuntimeChecks="3"/>
-			</FileConfiguration>
 		</File>
 	</Files>
 	<Globals>

--- a/VC++Files/comp_err/comp_err.vcproj
+++ b/VC++Files/comp_err/comp_err.vcproj
@@ -10,10 +10,73 @@
 			Name="Win32"/>
 	</Platforms>
 	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\debug_obj"
+			IntermediateDirectory=".\debug_obj"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				OptimizeForProcessor="2"
+				AdditionalIncludeDirectories="../include"
+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_WINDOWS;__WIN__;_MT"
+				StringPooling="TRUE"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\debug_obj/comp_err.pch"
+				AssemblerListingLocation=".\debug_obj/"
+				ObjectFile=".\debug_obj/"
+				ProgramDataBaseFileName=".\debug_obj/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
+				OutputFile="../extra/debug/comp_err.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="LIBCD.lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="../extra/debug/comp_err.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\debug_obj/comp_err.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1046"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\release"
-			IntermediateDirectory=".\release"
+			OutputDirectory=".\release_obj"
+			IntermediateDirectory=".\release_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@@ -25,13 +88,13 @@
 				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MBCSN;DBUG_OFF;_WINDOWS;__WIN__;_MT"
 				StringPooling="TRUE"
-				RuntimeLibrary="4"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\release/comp_err.pch"
-				AssemblerListingLocation=".\release/"
-				ObjectFile=".\release/"
-				ProgramDataBaseFileName=".\release/"
+				PrecompiledHeaderFile=".\release_obj/comp_err.pch"
+				AssemblerListingLocation=".\release_obj/"
+				ObjectFile=".\release_obj/"
+				ProgramDataBaseFileName=".\release_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				CompileAs="0"/>
@@ -40,16 +103,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
-				OutputFile="../client_release/comp-err.exe"
+				OutputFile="../extra/release/comp_err.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				IgnoreDefaultLibraryNames="LIBC.lib"
-				ProgramDatabaseFile=".\release/comp-err.pdb"
+				ProgramDatabaseFile="../extra/release/comp_err.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\release/comp_err.tlb"
+				TypeLibraryName=".\release_obj/comp_err.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -78,14 +141,6 @@
 	<Files>
 		<File
 			RelativePath="..\extra\comp_err.c">
-			<FileConfiguration
-				Name="Release|Win32">
-				<Tool
-					Name="VCCLCompilerTool"
-					Optimization="2"
-					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
-			</FileConfiguration>
 		</File>
 	</Files>
 	<Globals>

--- a/VC++Files/dbug/dbug.vcproj
+++ b/VC++Files/dbug/dbug.vcproj
--- a/VC++Files/heap/heap.vcproj
+++ b/VC++Files/heap/heap.vcproj
--- a/VC++Files/innobase/innobase.vcproj
+++ b/VC++Files/innobase/innobase.vcproj
--- a/VC++Files/libmysql/libmysql.vcproj
+++ b/VC++Files/libmysql/libmysql.vcproj
--- a/VC++Files/libmysqld/examples/test_libmysqld.vcproj
+++ b/VC++Files/libmysqld/examples/test_libmysqld.vcproj
@@ -10,10 +10,73 @@
 			Name="Win32"/>
 	</Platforms>
 	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\debug_obj"
+			IntermediateDirectory=".\debug_obj"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				OptimizeForProcessor="2"
+				AdditionalIncludeDirectories="..\..\include,../include,../../extra/yassl/include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DBUG_OFF"
+				StringPooling="TRUE"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\debug_obj/test_libmysqld.pch"
+				AssemblerListingLocation=".\debug_obj/"
+				ObjectFile=".\debug_obj/"
+				ProgramDataBaseFileName=".\debug_obj/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="odbc32.lib odbccp32.lib Wsock32.lib ..\..\extra\yassl\debug\yassl.lib"
+				OutputFile="..\test_libmysqld.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="LIBCMTD"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\debug_obj/test_libmysqld.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\debug_obj/test_libmysqld.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1046"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory=".\release_obj"
+			IntermediateDirectory=".\release_obj"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -22,16 +85,17 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
+				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="..\..\include,../include,../../extra/yassl/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DBUG_OFF"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/test_libmysqld.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PrecompiledHeaderFile=".\release_obj/test_libmysqld.pch"
+				AssemblerListingLocation=".\release_obj/"
+				ObjectFile=".\release_obj/"
+				ProgramDataBaseFileName=".\release_obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				CompileAs="0"/>
@@ -39,17 +103,17 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib Wsock32.lib ..\..\extra\yassl\Release\yassl.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib Wsock32.lib ..\..\extra\yassl\release\yassl.lib"
 				OutputFile="..\test_libmysqld.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				IgnoreDefaultLibraryNames="LIBCMTD"
-				ProgramDatabaseFile=".\Release/test_libmysqld.pdb"
+				ProgramDatabaseFile=".\release_obj/test_libmysqld.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/test_libmysqld.tlb"
+				TypeLibraryName=".\release_obj/test_libmysqld.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -81,47 +145,15 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
 				RelativePath="..\..\client\completion_hash.cpp">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\client\mysql.cpp">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\client\readline.cpp">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\client\sql_string.cpp">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>

--- a/VC++Files/libmysqld/libmysqld.vcproj
+++ b/VC++Files/libmysqld/libmysqld.vcproj
--- a/VC++Files/libmysqltest/myTest.vcproj
+++ b/VC++Files/libmysqltest/myTest.vcproj
--- a/VC++Files/my_print_defaults/my_print_defaults.vcproj
+++ b/VC++Files/my_print_defaults/my_print_defaults.vcproj
--- a/VC++Files/myisam/myisam.vcproj
+++ b/VC++Files/myisam/myisam.vcproj
--- a/VC++Files/myisam_ftdump/myisam_ftdump.vcproj
+++ b/VC++Files/myisam_ftdump/myisam_ftdump.vcproj
--- a/VC++Files/myisamchk/myisamchk.vcproj
+++ b/VC++Files/myisamchk/myisamchk.vcproj
--- a/VC++Files/myisamlog/myisamlog.vcproj
+++ b/VC++Files/myisamlog/myisamlog.vcproj
--- a/VC++Files/myisammrg/myisammrg.vcproj
+++ b/VC++Files/myisammrg/myisammrg.vcproj
--- a/VC++Files/myisampack/myisampack.vcproj
+++ b/VC++Files/myisampack/myisampack.vcproj
--- a/VC++Files/mysql.sln
+++ b/VC++Files/mysql.sln
--- a/VC++Files/mysqlbinlog/mysqlbinlog.vcproj
+++ b/VC++Files/mysqlbinlog/mysqlbinlog.vcproj
--- a/VC++Files/mysqlcheck/mysqlcheck.vcproj
+++ b/VC++Files/mysqlcheck/mysqlcheck.vcproj
--- a/VC++Files/mysqldemb/mysqldemb.vcproj
+++ b/VC++Files/mysqldemb/mysqldemb.vcproj
--- a/VC++Files/mysqlserver/mysqlserver.vcproj
+++ b/VC++Files/mysqlserver/mysqlserver.vcproj
--- a/VC++Files/mysys/mysys.dsp
+++ b/VC++Files/mysys/mysys.dsp
--- a/VC++Files/mysys/mysys.vcproj
+++ b/VC++Files/mysys/mysys.vcproj
--- a/VC++Files/mysys/mysys_ia64.dsp
+++ b/VC++Files/mysys/mysys_ia64.dsp
--- a/VC++Files/perror/perror.vcproj
+++ b/VC++Files/perror/perror.vcproj
--- a/VC++Files/regex/regex.vcproj
+++ b/VC++Files/regex/regex.vcproj
--- a/VC++Files/replace/replace.vcproj
+++ b/VC++Files/replace/replace.vcproj
--- a/VC++Files/sql/gen_lex_hash.vcproj
+++ b/VC++Files/sql/gen_lex_hash.vcproj
--- a/VC++Files/sql/mysqld.vcproj
+++ b/VC++Files/sql/mysqld.vcproj
--- a/VC++Files/strings/strings.vcproj
+++ b/VC++Files/strings/strings.vcproj
--- a/VC++Files/test1/test1.vcproj
+++ b/VC++Files/test1/test1.vcproj
--- a/VC++Files/tests/mysql_client_test.vcproj
+++ b/VC++Files/tests/mysql_client_test.vcproj
--- a/VC++Files/thr_test/thr_test.vcproj
+++ b/VC++Files/thr_test/thr_test.vcproj
--- a/VC++Files/vio/vio.vcproj
+++ b/VC++Files/vio/vio.vcproj
--- a/VC++Files/zlib/zlib.vcproj
+++ b/VC++Files/zlib/zlib.vcproj
--- a/client/echo.c
+++ b/client/echo.c
@@ -2,8 +2,7 @@

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of

--- a/configure.in
+++ b/configure.in
--- a/extra/yassl/taocrypt/taocrypt.vcproj
+++ b/extra/yassl/taocrypt/taocrypt.vcproj
--- a/extra/yassl/yassl.vcproj
+++ b/extra/yassl/yassl.vcproj
--- a/include/Makefile.am
+++ b/include/Makefile.am
--- a/include/my_semaphore.h
+++ b/include/my_semaphore.h
--- a/innobase/CMakeLists.txt
+++ b/innobase/CMakeLists.txt
--- a/myisam/mi_create.c
+++ b/myisam/mi_create.c
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
--- a/myisam/rt_index.c
+++ b/myisam/rt_index.c
--- a/myisam/rt_key.c
+++ b/myisam/rt_key.c
--- a/myisam/rt_split.c
+++ b/myisam/rt_split.c
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
--- a/mysql-test/r/delayed.result
+++ b/mysql-test/r/delayed.result
--- a/mysql-test/r/explain.result
+++ b/mysql-test/r/explain.result
--- a/mysql-test/r/func_default.result
+++ b/mysql-test/r/func_default.result
--- a/mysql-test/r/func_in.result
+++ b/mysql-test/r/func_in.result
--- a/mysql-test/r/func_regexp.result
+++ b/mysql-test/r/func_regexp.result
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
--- a/mysql-test/r/func_test.result
+++ b/mysql-test/r/func_test.result
--- a/mysql-test/r/gis-rtree.result
+++ b/mysql-test/r/gis-rtree.result
--- a/mysql-test/r/having.result
+++ b/mysql-test/r/having.result
--- a/mysql-test/r/insert_update.result
+++ b/mysql-test/r/insert_update.result
--- a/mysql-test/r/loaddata.result
+++ b/mysql-test/r/loaddata.result
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
--- a/mysql-test/r/ndb_single_user.result
+++ b/mysql-test/r/ndb_single_user.result
--- a/mysql-test/r/olap.result
+++ b/mysql-test/r/olap.result
--- a/mysql-test/r/order_by.result
+++ b/mysql-test/r/order_by.result
--- a/mysql-test/r/rpl_packet.result
+++ b/mysql-test/r/rpl_packet.result
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
--- a/mysql-test/r/skip_grants.result
+++ b/mysql-test/r/skip_grants.result
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
--- a/mysql-test/r/trigger.result
+++ b/mysql-test/r/trigger.result
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
--- a/mysql-test/r/update.result
+++ b/mysql-test/r/update.result
--- a/mysql-test/r/varbinary.result
+++ b/mysql-test/r/varbinary.result
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
--- a/mysql-test/t/alter_table.test
+++ b/mysql-test/t/alter_table.test
--- a/mysql-test/t/delayed.test
+++ b/mysql-test/t/delayed.test
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
--- a/mysql-test/t/explain.test
+++ b/mysql-test/t/explain.test
--- a/mysql-test/t/func_in.test
+++ b/mysql-test/t/func_in.test
--- a/mysql-test/t/func_str.test
+++ b/mysql-test/t/func_str.test
--- a/mysql-test/t/gis-rtree.test
+++ b/mysql-test/t/gis-rtree.test
--- a/mysql-test/t/init_connect.test
+++ b/mysql-test/t/init_connect.test
--- a/mysql-test/t/insert_update.test
+++ b/mysql-test/t/insert_update.test
--- a/mysql-test/t/loaddata.test
+++ b/mysql-test/t/loaddata.test
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
--- a/mysql-test/t/mysqlbinlog-cp932.test
+++ b/mysql-test/t/mysqlbinlog-cp932.test
--- a/mysql-test/t/ndb_single_user.test
+++ b/mysql-test/t/ndb_single_user.test
--- a/mysql-test/t/olap.test
+++ b/mysql-test/t/olap.test
--- a/mysql-test/t/order_by.test
+++ b/mysql-test/t/order_by.test
--- a/mysql-test/t/rpl_packet.test
+++ b/mysql-test/t/rpl_packet.test
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
--- a/mysql-test/t/skip_grants.test
+++ b/mysql-test/t/skip_grants.test
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
--- a/mysql-test/t/trigger.test
+++ b/mysql-test/t/trigger.test
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
--- a/mysql-test/t/update.test
+++ b/mysql-test/t/update.test
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
--- a/mysys/CMakeLists.txt
+++ b/mysys/CMakeLists.txt
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
--- a/mysys/my_semaphore.c
+++ b/mysys/my_semaphore.c
--- a/mysys/my_winsem.c
+++ b/mysys/my_winsem.c
--- a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj
+++ b/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj
--- a/ndb/src/kernel/blocks/ERROR_codes.txt
+++ b/ndb/src/kernel/blocks/ERROR_codes.txt
--- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
--- a/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
+++ b/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
--- a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+++ b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
--- a/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
--- a/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
--- a/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
+++ b/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
--- a/ndb/src/mgmclient/CommandInterpreter.cpp
+++ b/ndb/src/mgmclient/CommandInterpreter.cpp
--- a/ndb/src/mgmsrv/ConfigInfo.cpp
+++ b/ndb/src/mgmsrv/ConfigInfo.cpp
--- a/ndb/src/ndbapi/NdbBlob.cpp
+++ b/ndb/src/ndbapi/NdbBlob.cpp
--- a/ndb/src/ndbapi/NdbDictionaryImpl.cpp
+++ b/ndb/src/ndbapi/NdbDictionaryImpl.cpp
--- a/ndb/src/ndbapi/NdbRecAttr.cpp
+++ b/ndb/src/ndbapi/NdbRecAttr.cpp
--- a/ndb/src/ndbapi/NdbScanFilter.cpp
+++ b/ndb/src/ndbapi/NdbScanFilter.cpp
--- a/ndb/src/ndbapi/ndberror.c
+++ b/ndb/src/ndbapi/ndberror.c
--- a/ndb/test/include/NDBT_Test.hpp
+++ b/ndb/test/include/NDBT_Test.hpp
--- a/ndb/test/ndbapi/Makefile.am
+++ b/ndb/test/ndbapi/Makefile.am
--- a/ndb/test/ndbapi/testBlobs.cpp
+++ b/ndb/test/ndbapi/testBlobs.cpp
--- a/ndb/test/ndbapi/testNodeRestart.cpp
+++ b/ndb/test/ndbapi/testNodeRestart.cpp
--- a/ndb/test/ndbapi/testScanFilter.cpp
+++ b/ndb/test/ndbapi/testScanFilter.cpp
--- a/ndb/test/run-test/daily-basic-tests.txt
+++ b/ndb/test/run-test/daily-basic-tests.txt
--- a/ndb/test/src/NDBT_Test.cpp
+++ b/ndb/test/src/NDBT_Test.cpp
--- a/ndb/test/src/UtilTransactions.cpp
+++ b/ndb/test/src/UtilTransactions.cpp
--- a/ndb/tools/waiter.cpp
+++ b/ndb/tools/waiter.cpp
--- a/netware/Makefile.am
+++ b/netware/Makefile.am
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
--- a/server-tools/instance-manager/mysqlmanager.vcproj
+++ b/server-tools/instance-manager/mysqlmanager.vcproj
--- a/sql/field.cc
+++ b/sql/field.cc
--- a/sql/field.h
+++ b/sql/field.h
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
--- a/sql/ha_myisammrg.h
+++ b/sql/ha_myisammrg.h
--- a/sql/item.cc
+++ b/sql/item.cc
--- a/sql/item.h
+++ b/sql/item.h
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
--- a/sql/slave.cc
+++ b/sql/slave.cc
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
--- a/support-files/compiler_warnings.supp
+++ b/support-files/compiler_warnings.supp
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh