Commit 835d2286 authored Apr 01, 2006 by unknown

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new


VC++Files/libmysqld/libmysqld.vcproj:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged

parents ab96fa07 0ad405f9

VC++Files/bdb/bdb.vcproj

+0 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@
		ATLMinimizesCRunTimeLibraryUsage="FALSE">
		<Tool
		Name="VCCLCompilerTool"
		AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max"
		Optimization="2"
		InlineFunctionExpansion="1"
		OptimizeForProcessor="2"

VC++Files/innobase/innobase.vcproj

+0 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@
		CharacterSet="2">
		<Tool
		Name="VCCLCompilerTool"
		AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt-max"
		Optimization="2"
		InlineFunctionExpansion="1"
		OptimizeForProcessor="2"
		@@ -175,7 +174,6 @@
		CharacterSet="2">
		<Tool
		Name="VCCLCompilerTool"
		AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt"
		Optimization="2"
		InlineFunctionExpansion="1"
		OptimizeForProcessor="2"

VC++Files/libmysqld/libmysqld.vcproj

+0 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@
		CharacterSet="2">
		<Tool
		Name="VCCLCompilerTool"
		AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro"
		Optimization="2"
		InlineFunctionExpansion="1"
		OptimizeForProcessor="2"

VC++Files/mysqldemb/mysqldemb.vcproj

+0 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,6 @@
		CharacterSet="2">
		<Tool
		Name="VCCLCompilerTool"
		AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro"
		Optimization="2"
		InlineFunctionExpansion="1"
		AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib"

VC++Files/mysys/mysys.vcproj

+0 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,6 @@
		ATLMinimizesCRunTimeLibraryUsage="FALSE">
		<Tool
		Name="VCCLCompilerTool"
		AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max"
		Optimization="2"
		InlineFunctionExpansion="1"
		OptimizeForProcessor="2"