mysql.spec.sh:

  Removed Berkeley DB
configure.in:
  Adjusted Netware support
basic.t.c:
  Change for Netware
Makefile.am:
  Use thread safe libmysqlclient_r if it was built
valgrind.supp:
  Hide report about strlen/_dl_init_paths
ha_tina.cc:
  Temporarely disable CSV engine on Netware,
  as the engine depends on mmap()
net_serv.cc:
  Include <sys/select.h> for Netware


sql/net_serv.cc:
  Include <sys/select.h> for Netware
storage/csv/ha_tina.cc:
  Temporarely disable CSV engine on Netware,
  as the engine depends on mmap()
mysql-test/valgrind.supp:
  Hide report about strlen/_dl_init_paths
tests/Makefile.am:
  Use thread safe libmysqlclient_r if it was built
unittest/mytap/t/basic.t.c:
  Change for Netware
configure.in:
  Adjusted Netware support
support-files/mysql.spec.sh:
  Removed Berkeley DB

7 files changed, 36 insertions, 26 deletions

diff --git a/configure.in b/configure.in
index e159a5803f1..71f6f9d89ab 100644
--- a/configure.in
+++ b/configure.in
@@ -1088,7 +1088,7 @@ dnl Is this the right match for DEC OSF on alpha?
     # Edit Makefile.in files.
     #
     echo -n "configuring Makefile.in files for NetWare... "
-    for file in sql/Makefile.in libmysql/Makefile.in libmysql_r/Makefile.in sql/share/Makefile.in strings/Makefile.in client/Makefile.in
+    for file in sql/Makefile.in extra/Makefile.in client/Makefile.in
     do
     # echo "#### $file ####"
       filedir="`dirname $file`"
@@ -1109,32 +1109,13 @@ dnl Is this the right match for DEC OSF on alpha?
           # Add library dependencies to mysqld_DEPENDENCIES
           lib_DEPENDENCIES="\$(pstack_libs) \$(openssl_libs) \$(yassl_libs)"
           cat > $filesed << EOF
-s,\(^.*\$(MAKE) gen_lex_hash\)\$(EXEEXT),#\1,
 s,\(\./gen_lex_hash\)\$(EXEEXT),\1.linux,
-s%\(mysqld_DEPENDENCIES = \) %\1$lib_DEPENDENCIES %
+s%\(mysqld_DEPENDENCIES = \)%\1$lib_DEPENDENCIES %
 EOF
           ;;
-        sql/share/Makefile.in)
+        extra/Makefile.in)
           cat > $filesed << EOF
-s,\(extra/comp_err\),\1.linux,
-EOF
-          ;;
-        libmysql/Makefile.in)
-          cat > $filesed << EOF
-s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,
-s,\(: conf_to_src\),\1.linux,
-EOF
-          ;;
-        libmysql_r/Makefile.in)
-          cat > $filesed << EOF
-s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,
-s,\(: conf_to_src\),\1.linux,
-EOF
-          ;;
-        strings/Makefile.in)
-          cat > $filesed << EOF
-s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,
-s,\(: conf_to_src\),\1.linux,
+s,\(extra/comp_err\)\$(EXEEXT),\1.linux,
 EOF
           ;;
         client/Makefile.in)
diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index fd51e4f064c..e1c67386744 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -131,6 +131,15 @@
    obj:/lib/ld-*.so
 }
 
+{  
+   strlen/_dl_init_paths/dl_main/_dl_sysdep_start(Cond)
+   Memcheck:Cond
+   fun:strlen
+   fun:_dl_init_paths
+   fun:dl_main
+   fun:_dl_sysdep_start
+}
+
 {
    pthread errno
    Memcheck:Leak
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index 9713e4bed44..6763196ec37 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -52,6 +52,10 @@
 #include <signal.h>
 #include <errno.h>
 
+#ifdef __NETWARE__
+#include <sys/select.h>
+#endif
+
 #ifdef EMBEDDED_LIBRARY
 #undef MYSQL_SERVER
 #undef MYSQL_CLIENT
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index de69df90ed5..a26114e086d 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -146,6 +146,11 @@ static byte* tina_get_key(TINA_SHARE *share,uint *length,
 int get_mmap(TINA_SHARE *share, int write)
 {
   DBUG_ENTER("ha_tina::get_mmap");
+#ifdef __NETWARE__
+  my_message(errno, "Sorry, no mmap() on Netware", 0);
+  DBUG_ASSERT(0);
+  DBUG_RETURN(1);
+#else
   if (share->mapped_file && my_munmap(share->mapped_file,
                                       share->file_stat.st_size))
     DBUG_RETURN(1);
@@ -180,6 +185,7 @@ int get_mmap(TINA_SHARE *share, int write)
     share->mapped_file= NULL;
 
   DBUG_RETURN(0);
+#endif /* __NETWARE__ */
 }
 
 
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index c57496e6c55..88d9ed034b4 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -311,7 +311,6 @@ fi
 CFLAGS="${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS} -g" \
 CXXFLAGS="${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti} -g" \
 BuildMySQL "--enable-shared \
-		--with-berkeley-db \
 		--with-innodb \
 		--with-ndbcluster \
 		--with-archive-storage-engine \
@@ -683,6 +682,10 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Tue May 16 2006 Kent Boortz <kent@mysql.com>
+
+- Removed Berkeley DB
+
 * Mon May 01 2006 Kent Boortz <kent@mysql.com>
 
 - Use "./libtool --mode=execute" instead of searching for the
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4cad3c30bdd..292e37faa35 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,6 +22,13 @@ if HAVE_YASSL
 else
   yassl_dummy_link_fix=
 endif
+
+if THREAD_SAFE_CLIENT
+LIBMYSQLCLIENT_LA =		$(top_builddir)/libmysql_r/libmysqlclient_r.la
+else
+LIBMYSQLCLIENT_LA =		$(top_builddir)/libmysql/libmysqlclient.la
+endif
+
 EXTRA_DIST =		auto_increment.res auto_increment.tst \
 			function.res function.tst lock_test.pl lock_test.res \
 			export.pl big_record.pl \
@@ -42,7 +49,7 @@ INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
 			$(openssl_includes)
 LIBS =			@CLIENT_LIBS@
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ \
-                        $(top_builddir)/libmysql/libmysqlclient.la
+                        $(LIBMYSQLCLIENT_LA)
 mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys
 mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix)
 insert_test_SOURCES=       insert_test.c $(yassl_dummy_link_fix)
diff --git a/unittest/mytap/t/basic.t.c b/unittest/mytap/t/basic.t.c
index 95a77755347..bf4c1a9a664 100644
--- a/unittest/mytap/t/basic.t.c
+++ b/unittest/mytap/t/basic.t.c
@@ -2,7 +2,7 @@
 #include "my_config.h"
 
 #include <stdlib.h>
-#include <tap.h>
+#include "../tap.h"
 
 int main() {
   plan(5);