Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0

into  linux.site:/home/reggie/bk/mysql-5.0-new

2 files changed, 114 insertions, 36 deletions

diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc
index 0a373429d01..7f705bac1c1 100644
--- a/server-tools/instance-manager/instance.cc
+++ b/server-tools/instance-manager/instance.cc
@@ -40,7 +40,7 @@
 static void start_and_monitor_instance(Instance_options *old_instance_options,
                                        Instance_map *instance_map);
 
-#ifndef _WIN_
+#ifndef __WIN__
 typedef pid_t My_process_info;
 #else
 typedef PROCESS_INFORMATION My_process_info;
diff --git a/server-tools/instance-manager/mysqlmanager.vcproj b/server-tools/instance-manager/mysqlmanager.vcproj
index 2ab9a4878c1..a5ef7cb21e3 100644
--- a/server-tools/instance-manager/mysqlmanager.vcproj
+++ b/server-tools/instance-manager/mysqlmanager.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\include"
+				AdditionalIncludeDirectories="..\..\include,../../extra/yassl/include"
 				PreprocessorDefinitions="MYSQL_INSTANCE_MANAGER;MYSQL_SERVER;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;CONSOLE"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="FALSE"
@@ -69,7 +69,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\include"
+				AdditionalIncludeDirectories="..\..\include,../../extra/yassl/include"
 				PreprocessorDefinitions="MYSQL_INSTANCE_MANAGER;MYSQL_SERVER;_WINDOWS;CONSOLE"
 				ExceptionHandling="FALSE"
 				RuntimeLibrary="0"
@@ -119,94 +119,172 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath=".\buffer.cc">
+				RelativePath=".\buffer.cpp">
 			</File>
 			<File
-				RelativePath="..\sql\client.c">
+				RelativePath="..\..\sql\client.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\command.cc">
+				RelativePath=".\command.cpp">
 			</File>
 			<File
-				RelativePath=".\commands.cc">
+				RelativePath=".\commands.cpp">
 			</File>
 			<File
-				RelativePath=".\factory.cc">
+				RelativePath="..\..\libmysql\get_password.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\libmysql\get_password.c">
-			</File>
-			<File
-				RelativePath=".\guardian.cc">
+				RelativePath=".\guardian.cpp">
 			</File>
 			<File
 				RelativePath=".\IMService.cpp">
 			</File>
 			<File
-				RelativePath=".\instance.cc">
-			</File>
-			<File
-				RelativePath=".\instance_map.cc">
+				RelativePath=".\instance.cpp">
 			</File>
 			<File
-				RelativePath=".\instance_options.cc">
+				RelativePath=".\instance_map.cpp">
 			</File>
 			<File
-				RelativePath=".\listener.cc">
+				RelativePath=".\instance_options.cpp">
 			</File>
 			<File
-				RelativePath=".\log.cc">
+				RelativePath=".\listener.cpp">
 			</File>
 			<File
-				RelativePath=".\manager.cc">
+				RelativePath=".\log.cpp">
 			</File>
 			<File
-				RelativePath=".\messages.cc">
+				RelativePath=".\manager.cpp">
 			</File>
 			<File
-				RelativePath="..\sql\mini_client_errors.c">
+				RelativePath=".\messages.cpp">
 			</File>
 			<File
-				RelativePath=".\mysql_connection.cc">
+				RelativePath="..\..\sql\mini_client_errors.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\mysqlmanager.cc">
+				RelativePath=".\mysql_connection.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\sql\net_serv.cpp">
+				RelativePath=".\mysqlmanager.cpp">
 			</File>
 			<File
-				RelativePath=".\options.cc">
+				RelativePath="..\..\sql\net_serv.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\sql\pack.c">
+				RelativePath=".\options.cpp">
 			</File>
 			<File
-				RelativePath=".\parse.cc">
+				RelativePath="..\..\sql\pack.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\parse_output.cc">
+				RelativePath=".\parse.cpp">
 			</File>
 			<File
-				RelativePath="..\sql\password.c">
+				RelativePath=".\parse_output.cpp">
 			</File>
 			<File
-				RelativePath=".\priv.cc">
+				RelativePath="..\..\sql\password.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\protocol.cc">
+				RelativePath=".\priv.cpp">
 			</File>
 			<File
-				RelativePath=".\service_funcs.cpp">
+				RelativePath=".\protocol.cpp">
 			</File>
 			<File
-				RelativePath="..\sql\sql_state.c">
+				RelativePath="..\..\sql\sql_state.c">
 			</File>
 			<File
-				RelativePath=".\thread_registry.cc">
+				RelativePath=".\thread_registry.cpp">
 			</File>
 			<File
-				RelativePath=".\user_map.cc">
+				RelativePath=".\user_map.cpp">
 			</File>
 			<File
 				RelativePath=".\WindowsService.cpp">