Commit 07302c60 authored by unknown's avatar unknown
Browse files

Merge 


VC++Files/libmysqld/libmysqld.vcproj:
  Auto merged
VC++Files/mysqldemb/mysqldemb.vcproj:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
VC++Files/storage/bdb/bdb.vcproj:
  Auto merged
VC++Files/storage/innobase/innobase.vcproj:
  Auto merged
config/ac-macros/yassl.m4:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/item.cc:
  Auto merged
parents af66d20c b5ca7236

Docs/MySQLEULA.txt

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ Licensee. 
4.  Price and payment.

No later than thirty (30) days after submission of the Order Form, Licensee

shall remit one non-refundable license fee per Licensed Copy as posted on

http://order.mysql.com on the date Licensee submitted the Order Form (the

http://shop.mysql.com on the date Licensee submitted the Order Form (the

"License Fee"). All payments shall be made in Euros or U.S. dollars. Licensee

shall be responsible for paying all local, state, federal and international

sales, value added, excise and other taxes and duties payable in connection

README

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ License information can be found in these files: 


For further information about MySQL or additional documentation, see:

- The latest information about MySQL: http://www.mysql.com

- The current MySQL documentation: http:/dev.mysql.com/doc

- The current MySQL documentation: http://dev.mysql.com/doc



Some manual sections of special interest:

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"