Commit 9c81773b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.1-release 

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/t/alter_table.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/show_check.result:
  Resolve conflict
sql/authors.h:
  Resolve conflicts, update replication/backup developers
parents 8486e64f b6547d09

VC++Files/libmysqld/libmysqld.vcproj

+624 −476

File changed.

Preview size limit exceeded, changes collapsed.

VC++Files/myisam_ftdump/myisam_ftdump.vcproj

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				AdditionalIncludeDirectories="../include,../myisam"

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

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/myisam_ftdump.pch"
@@ -83,7 +83,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				AdditionalIncludeDirectories="../include,../myisam"

				PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG"

				StringPooling="TRUE"

				RuntimeLibrary="0"

VC++Files/myisamchk/myisamchk.vcproj

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				AdditionalIncludeDirectories="../include,../myisam"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -84,7 +84,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				AdditionalIncludeDirectories="../include,../myisam"

				PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -146,7 +146,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				AdditionalIncludeDirectories="../include,../myisam"

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

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/myisamchk.pch"

VC++Files/myisamlog/myisamlog.vcproj

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				AdditionalIncludeDirectories="../include,../myisam"

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

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\Debug/myisamlog.pch"
@@ -83,7 +83,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				AdditionalIncludeDirectories="../include,../myisam"

				PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -146,7 +146,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				AdditionalIncludeDirectories="../include,../myisam"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS"

				StringPooling="TRUE"

				RuntimeLibrary="0"

VC++Files/myisampack/myisampack.vcproj

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				AdditionalIncludeDirectories="../include,../myisam"

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

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/myisampack.pch"
@@ -83,7 +83,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				AdditionalIncludeDirectories="../include,../myisam"

				PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -144,7 +144,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../storage/myisam"

				AdditionalIncludeDirectories="../include,../myisam"

				PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"

				StringPooling="TRUE"

				RuntimeLibrary="0"