Commit 3702ae2d authored by unknown's avatar unknown
Browse files

Merge mysqldev@production.mysql.com:my/mysql-5.0-release 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
parents 84e72c2b 9ecc01a9

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'

tests/Makefile.am

+6 −0
Original line number Diff line number Diff line
@@ -42,8 +42,14 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ 
LIBS =			@CLIENT_LIBS@

LDADD =			@CLIENT_EXTRA_LDFLAGS@ \

                        $(top_builddir)/libmysql/libmysqlclient.la

if HAVE_NETWARE

mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS)

mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) \

			../mysys/my_memmem.c

else

mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys

mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix)

endif

insert_test_SOURCES=       insert_test.c $(yassl_dummy_link_fix)

select_test_SOURCES=       select_test.c $(yassl_dummy_link_fix)

insert_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)