List:Commits« Previous MessageNext Message »
From:sergeyv Date:January 26 2006 12:24pm
Subject:bk commit into 5.1 tree (SergeyV:1.2073)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of sergeyv. When sergeyv does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2073 06/01/26 15:23:53 SergeyV@selena. +2 -0
  Fixes a build problem of mysqlslap by adding a dependency to mysqlclient & mysys

  VC++Files/mysql.sln
    1.12 06/01/26 15:23:42 SergeyV@selena. +2 -0
    Dependency to mysqlclient & mysys is added for mysqlslap in mysql.sln

  VC++Files/client/mysqlslap.vcproj
    1.3 06/01/26 15:23:41 SergeyV@selena. +1 -1
    Explicit library specification removed from project file

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/src/#00000-mysql-5.1

--- 1.2/VC++Files/client/mysqlslap.vcproj	2006-01-16 19:34:49 +03:00
+++ 1.3/VC++Files/client/mysqlslap.vcproj	2006-01-26 15:23:41 +03:00
@@ -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"

--- 1.11/VC++Files/mysql.sln	2006-01-20 18:39:55 +03:00
+++ 1.12/VC++Files/mysql.sln	2006-01-26 15:23:42 +03:00
@@ -290,6 +290,8 @@
 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}"
Thread
bk commit into 5.1 tree (SergeyV:1.2073)sergeyv26 Jan