Commit 2762eeab authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.1 

into  mysql.com:/home/mydev/mysql-5.1-bug11527


mysql-test/r/innodb.result:
  Auto merged
parents e83ccfa4 613d1721

.bzrignore

+1 −1
Original line number Diff line number Diff line
@@ -934,6 +934,7 @@ scripts/mysql_install_db 
scripts/mysql_secure_installation

scripts/mysql_setpermission

scripts/mysql_tableinfo

scripts/mysql_upgrade

scripts/mysql_zap

scripts/mysqlaccess

scripts/mysqlbug
@@ -1613,4 +1614,3 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj
 
scripts/mysql_upgrade

VC++Files/client/mysqlclient.vcproj

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../,../extra/yassl/include"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;MYSQL_CLIENT;NDEBUG"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;__WIN__;_WINDOWS;USE_TLS;MYSQL_CLIENT"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -73,7 +73,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../,../extra/yassl/include"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;USE_TLS;MYSQL_CLIENT;NDEBUG;CHECK_LICENSE;LICENSE=Commercial"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;__WIN__;_WINDOWS;USE_TLS;MYSQL_CLIENT;CHECK_LICENSE;LICENSE=Commercial"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -122,7 +122,7 @@ 
				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../,../extra/yassl/include"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS;MYSQL_CLIENT"

				PreprocessorDefinitions="_DEBUG;__WIN__;_WINDOWS;SAFEMALLOC;SAFE_MUTEX;USE_TLS;MYSQL_CLIENT"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/mysqlclient.pch"

				AssemblerListingLocation=".\debug/"

VC++Files/dbug/dbug.vcproj

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include"

				PreprocessorDefinitions="__WIN32__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS"

				PreprocessorDefinitions="__WIN__;_WINDOWS;_DEBUG;SAFEMALLOC;SAFE_MUTEX;USE_TLS"

				StringPooling="TRUE"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\dbug___Win32_TLS_DEBUG/dbug.pch"
@@ -72,7 +72,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG"

				PreprocessorDefinitions="__WIN__;_WINDOWS;NDEBUG;DBUG_OFF"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"
@@ -121,7 +121,7 @@ 
				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include"

				PreprocessorDefinitions="__WIN32__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS"

				PreprocessorDefinitions="__WIN__;_WINDOWS;_DEBUG;SAFEMALLOC;SAFE_MUTEX"

				StringPooling="TRUE"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/dbug.pch"

VC++Files/libmysql/libmysql.vcproj

+226 −226

File changed.

Preview size limit exceeded, changes collapsed.

VC++Files/libmysqld/libmysqld.vcproj

+492 −492

File changed.

Preview size limit exceeded, changes collapsed.