From: kent
Date: April 1 2006 12:22am
Subject: bk commit into 5.0 tree (kent:1.2128)
List-Archive: http://lists.mysql.com/commits/4380
Message-Id: <20060401002255.24979A766B2@boortz.dyndns.org>

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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.2128 06/04/01 02:21:50 kent@stripped +3 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

  VC++Files/sql/mysqld.vcproj
    1.5 06/04/01 02:21:33 kent@stripped +0 -0
    Auto merged

  VC++Files/mysys/mysys.vcproj
    1.3 06/04/01 02:21:33 kent@stripped +0 -0
    Auto merged

  VC++Files/libmysqld/libmysqld.vcproj
    1.3 06/04/01 02:21:32 kent@stripped +0 -0
    Auto merged

# 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:	kent
# Host:	c-4d4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0-new/RESYNC

--- 1.2/VC++Files/libmysqld/libmysqld.vcproj	2005-09-30 16:44:11 +02:00
+++ 1.3/VC++Files/libmysqld/libmysqld.vcproj	2006-04-01 02:21:32 +02:00
@@ -86,7 +86,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"

--- 1.2/VC++Files/mysys/mysys.vcproj	2005-09-30 16:44:11 +02:00
+++ 1.3/VC++Files/mysys/mysys.vcproj	2006-04-01 02:21:33 +02:00
@@ -67,7 +67,6 @@
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"

--- 1.4/VC++Files/sql/mysqld.vcproj	2006-01-16 09:55:46 +01:00
+++ 1.5/VC++Files/sql/mysqld.vcproj	2006-04-01 02:21:33 +02:00
@@ -20,7 +20,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-classic-nt"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
@@ -82,7 +81,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
@@ -143,7 +141,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt-max"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
@@ -207,7 +204,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
@@ -271,7 +267,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro-nt"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
@@ -393,7 +388,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
@@ -455,7 +449,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-classic"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"