Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release

into  fedora.(none):/home/reggie/bk/mysql-5.0-release

VC++Files/libmysqld/libmysqld.vcproj

@@ -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

@@ -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

@@ -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/mysqlserver.vcproj

@@ -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>

server-tools/instance-manager/mysqlmanager.vcproj

@@ -12,7 +12,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
+			OutputDirectory="../../client_debug"
 			IntermediateDirectory="Debug"
 			ConfigurationType="1"
 			CharacterSet="2">
@@ -63,7 +63,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
+			OutputDirectory="../../client_release"
 			IntermediateDirectory="Release"
 			ConfigurationType="1"
 			CharacterSet="2">

sql/ha_federated.cc

@@ -591,9 +591,10 @@ static int parse_url(FEDERATED_SHARE *share, TABLE *table,
   DBUG_PRINT("info", ("Length %d \n", table->s->connect_string.length));
   DBUG_PRINT("info", ("String %.*s \n", table->s->connect_string.length, 
                       table->s->connect_string.str));
-  share->scheme= my_strdup_with_length(table->s->connect_string.str,
-		                       table->s->connect_string.length+1,
-				       MYF(0));
+  share->scheme= my_strdup_with_length(
+    (const byte*)table->s->connect_string.str, 
+    table->s->connect_string.length+1, MYF(0));
+
   // Add a null for later termination of table name
   share->scheme[table->s->connect_string.length]= 0;
   DBUG_PRINT("info",("parse_url alloced share->scheme %lx", share->scheme));
@@ -2626,7 +2627,8 @@ int ha_federated::stash_remote_error()
 {
   DBUG_ENTER("ha_federated::stash_remote_error()");
   remote_error_number= mysql_errno(mysql);
-  snprintf(remote_error_buf, FEDERATED_QUERY_BUFFER_SIZE, mysql_error(mysql));
+  my_snprintf(remote_error_buf, FEDERATED_QUERY_BUFFER_SIZE, 
+              mysql_error(mysql));
   DBUG_RETURN(HA_FEDERATED_ERROR_WITH_REMOTE_SYSTEM);
 }
 

sql/sql_acl.cc

@@ -1473,7 +1473,7 @@ bool is_acl_user(const char *host, const char *user)
 {
   bool res;
   VOID(pthread_mutex_lock(&acl_cache->lock));
-  res= find_acl_user(host, user, TRUE);
+  res= find_acl_user(host, user, TRUE) != NULL;
   VOID(pthread_mutex_unlock(&acl_cache->lock));
   return res;
 }

sql/table.cc

@@ -351,7 +351,7 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
     char *buff;
     if (!(buff= alloc_root(&outparam->mem_root, n_length)))
       goto err;
-    if (my_pread(file, buff, n_length, record_offset + share->reclength,
+    if (my_pread(file, (byte*)buff, n_length, record_offset + share->reclength,
                  MYF(MY_NABP)))
       goto err;
     share->connect_string.length= uint2korr(buff);

sql/unireg.cc

@@ -153,8 +153,8 @@ bool mysql_create_frm(THD *thd, my_string file_name,
   {
     char buff[2];
     int2store(buff,create_info->connect_string.length);
-    if (my_write(file, buff, sizeof(buff), MYF(MY_NABP)) ||
-        my_write(file, create_info->connect_string.str,
+    if (my_write(file, (const byte*)buff, sizeof(buff), MYF(MY_NABP)) ||
+        my_write(file, (const byte*)create_info->connect_string.str,
                  create_info->connect_string.length, MYF(MY_NABP)))
       goto err;
   }