bk commit into 5.0 tree (kent:1.2216)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of mysqldev. When mysqldev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2216 06/07/03 10:56:19 kent@stripped +4 -0
  Makefile.am:
    Avoid duplicate symbol errors on Netware
  mwldnlm, mwccnlm, mwasmnlm:
    Filter garbage characters from output

  tests/Makefile.am
    1.26 06/07/03 10:55:58 kent@stripped +6 -0
    Avoid duplicate symbol errors on Netware

  netware/BUILD/mwldnlm
    1.5 06/07/03 10:51:00 kent@stripped +1 -1
    Filter garbage characters from output

  netware/BUILD/mwccnlm
    1.5 06/07/03 10:51:00 kent@stripped +1 -1
    Filter garbage characters from output

  netware/BUILD/mwasmnlm
    1.5 06/07/03 10:51:00 kent@stripped +1 -1
    Filter garbage characters from output

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	suse9-x86.mysql.com
# Root:	/data0/mydev/mysql-5.0.23-build

--- 1.25/tests/Makefile.am	2006-05-02 09:19:50 +02:00
+++ 1.26/tests/Makefile.am	2006-07-03 10:55:58 +02:00
@@ -42,8 +42,14 @@
 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)

--- 1.4/netware/BUILD/mwasmnlm	2003-07-08 15:29:13 +02:00
+++ 1.5/netware/BUILD/mwasmnlm	2006-07-03 10:51:00 +02:00
@@ -5,4 +5,4 @@
 
 args=" $*"
 
-wine --debugmsg -all -- mwasmnlm $args
+wine --debugmsg -all -- mwasmnlm $args 2>&1 | sed -e
's/^[[:cntrl:]].*[[:cntrl:]]>//'

--- 1.4/netware/BUILD/mwccnlm	2003-07-08 15:29:13 +02:00
+++ 1.5/netware/BUILD/mwccnlm	2006-07-03 10:51:00 +02:00
@@ -7,4 +7,4 @@
 # convert it to "-I../include"
 args=" "`echo $* | sed -e 's/-I.\/../-I../g'`
 
-wine --debugmsg -all -- mwccnlm $args
+wine --debugmsg -all -- mwccnlm $args 2>&1 | sed -e
's/^[[:cntrl:]].*[[:cntrl:]]>//'

--- 1.4/netware/BUILD/mwldnlm	2003-07-08 15:29:13 +02:00
+++ 1.5/netware/BUILD/mwldnlm	2006-07-03 10:51:00 +02:00
@@ -5,4 +5,4 @@
 
 args=" $*"
 
-wine --debugmsg -all -- mwldnlm $args
+wine --debugmsg -all -- mwldnlm $args 2>&1 | sed -e
's/^[[:cntrl:]].*[[:cntrl:]]>//'