Merge mysql.com:/home/jimw/my/mysql-5.0-17043

zlib/*.vcproj

scripts/mysql_upgrade

include/openssl

mysql-test/r/bdb.log

mysql-test/r/im_client_port.log

mysql-test/r/udf.log

export AM_MAKEFLAGS

AM_MAKEFLAGS="-j 4"

# SSL library to use. Should be changed to --with-yassl

SSL_LIBRARY=--with-openssl

# SSL library to use.

SSL_LIBRARY=--with-yassl

# If you are not using codefusion add "-Wpointer-arith" to WARNINGS

# The following warning flag will give too many warnings:

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

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:

			ATLMinimizesCRunTimeLibraryUsage="FALSE">

			<Tool

				Name="VCCLCompilerTool"

				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max"

				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"