Commit 0e1005a4 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into  mysql.com:/data0/knielsen/tmp-5.0


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
parents 05348e41 520cd485

VC++Files/sql/mysqld.vcproj

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"

				PreprocessorDefinitions="__NT__;NDEBUG;DBUG_OFF;USE_SYMDIR;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="USE_SYMDIR;NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				StringPooling="TRUE"

				RuntimeLibrary="0"

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

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"

				PreprocessorDefinitions="NDEBUG;__NT__;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				PreprocessorDefinitions="__NT__;NDEBUG;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ extern gptr _my_memdup(const byte *from,uint length, 
		       const char *sFile, uint uLine,myf MyFlag);

extern my_string _my_strdup(const char *from, const char *sFile, uint uLine,

			    myf MyFlag);

extern char *_my_strdup_with_length(const byte *from, uint length,

extern char *_my_strdup_with_length(const char *from, uint length,

				    const char *sFile, uint uLine,

				    myf MyFlag);

netware/BUILD/mwasmnlm

+4 −1
Original line number Diff line number Diff line
@@ -5,4 +5,7 @@ set -e 


args=" $*"



wine --debugmsg -all -- mwasmnlm $args
 
# NOTE: Option 'pipefail' is not standard sh

set -o pipefail

wine --debugmsg -all -- mwasmnlm $args | \

perl -pe 's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g'

netware/BUILD/mwccnlm

+4 −1
Original line number Diff line number Diff line
@@ -7,4 +7,7 @@ set -e 
# convert it to "-I../include"

args=" "`echo $* | sed -e 's/-I.\/../-I../g'`



wine --debugmsg -all -- mwccnlm $args
 
# NOTE: Option 'pipefail' is not standard sh

set -o pipefail

wine --debugmsg -all -- mwccnlm $args | \

perl -pe 's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g'

netware/BUILD/mwldnlm

+4 −1
Original line number Diff line number Diff line
@@ -5,4 +5,7 @@ set -e 


args=" $*"



wine --debugmsg -all -- mwldnlm $args
 
# NOTE: Option 'pipefail' is not standard sh

set -o pipefail

wine --debugmsg -all -- mwldnlm $args | \

perl -pe 's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g'