From 8e52972a14bb87c0a3f6cd9f683c59a3fd3a06f6 Mon Sep 17 00:00:00 2001
From: unknown <SergeyV@selena.>
Date: Thu, 26 Jan 2006 15:23:53 +0300
Subject: [PATCH 1/2] Fixes a build problem of mysqlslap by adding a dependency
 to mysqlclient & mysys

VC++Files/client/mysqlslap.vcproj:
  Explicit library specification removed from project file
VC++Files/mysql.sln:
  Dependency to mysqlclient & mysys is added for mysqlslap in mysql.sln
---
 VC++Files/client/mysqlslap.vcproj | 2 +-
 VC++Files/mysql.sln               | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/VC++Files/client/mysqlslap.vcproj b/VC++Files/client/mysqlslap.vcproj
index 581a852b170..ff0d9a437ed 100644
--- a/VC++Files/client/mysqlslap.vcproj
+++ b/VC++Files/client/mysqlslap.vcproj
@@ -162,7 +162,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib mysqlclient.lib mysys.lib"
+				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
 				OutputFile="../client_debug/mysqlslap.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/VC++Files/mysql.sln b/VC++Files/mysql.sln
index e877ee653d8..44409aff48c 100644
--- a/VC++Files/mysql.sln
+++ b/VC++Files/mysql.sln
@@ -290,6 +290,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdb", "storage\bdb\bdb.vcpr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlslap", "client\mysqlslap.vcproj", "{2E9332CF-072A-4381-BF37-17C5AB4F8583}"
 	ProjectSection(ProjectDependencies) = postProject
+		{26383276-4843-494B-8BE0-8936ED3EBAAB} = {26383276-4843-494B-8BE0-8936ED3EBAAB}
+		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "archive", "storage\archive\archive.vcproj", "{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}"

From cc90212fc9730fc70b2eaccc0f3301d3b6132e06 Mon Sep 17 00:00:00 2001
From: unknown <reggie@linux.site>
Date: Thu, 26 Jan 2006 06:37:25 -0600
Subject: [PATCH 2/2] using const char * as the output of strrchr to make
 solaris compiler happy.

---
 sql/ha_partition.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 4bca3365cb2..84e9c779c7d 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -1780,7 +1780,7 @@ void ha_partition::set_up_table_before_create(TABLE *table,
     return;                                     // Fatal error
   table->s->max_rows= part_elem->part_max_rows;
   table->s->min_rows= part_elem->part_min_rows;
-  char *partition_name= strrchr(partition_name_with_path, FN_LIBCHAR);
+  const char *partition_name= strrchr(partition_name_with_path, FN_LIBCHAR);
   if (part_elem->index_file_name)
     append_file_to_dir(current_thd,
                        (const char**)&part_elem->index_file_name,