bk commit into 5.1 tree (kent:1.2379)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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.2379 06/05/16 22:47:22 kent@stripped +7 -0
  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

  support-files/mysql.spec.sh
    1.141 06/05/16 22:44:47 kent@stripped +4 -1
    Removed Berkeley DB

  configure.in
    1.348 06/05/16 22:35:29 kent@stripped +4 -23
    Adjusted Netware support

  unittest/mytap/t/basic.t.c
    1.4 06/05/16 22:35:07 kent@stripped +1 -1
    Change for Netware

  tests/Makefile.am
    1.28 06/05/16 22:34:43 kent@stripped +8 -1
    Use thread safe libmysqlclient_r if it was built

  mysql-test/valgrind.supp
    1.7 06/05/16 22:34:02 kent@stripped +9 -0
    Hide report about strlen/_dl_init_paths

  storage/csv/ha_tina.cc
    1.45 06/05/16 22:23:46 kent@stripped +6 -0
    Temporarely disable CSV engine on Netware,
    as the engine depends on mmap()

  sql/net_serv.cc
    1.90 06/05/16 01:14:51 kent@stripped +4 -0
    Include <sys/select.h> for Netware

# 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:	c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-release

--- 1.347/configure.in	2006-05-04 18:39:42 +02:00
+++ 1.348/configure.in	2006-05-16 22:35:29 +02:00
@@ -1088,7 +1088,7 @@
     # 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 @@
           # 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)

--- 1.89/sql/net_serv.cc	2006-04-16 03:17:25 +02:00
+++ 1.90/sql/net_serv.cc	2006-05-16 01:14:51 +02:00
@@ -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

--- 1.140/support-files/mysql.spec.sh	2006-05-04 21:55:02 +02:00
+++ 1.141/support-files/mysql.spec.sh	2006-05-16 22:44:47 +02:00
@@ -311,7 +311,6 @@
 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 @@
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Tue May 16 2006 Kent Boortz <kent@stripped>
+
+- Removed Berkeley DB
+
 * Mon May 01 2006 Kent Boortz <kent@stripped>
 
 - Use "./libtool --mode=execute" instead of searching for the

--- 1.27/tests/Makefile.am	2006-05-03 16:03:58 +02:00
+++ 1.28/tests/Makefile.am	2006-05-16 22:34:43 +02:00
@@ -22,6 +22,13 @@
 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 @@
 			$(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)

--- 1.44/storage/csv/ha_tina.cc	2006-05-02 13:10:55 +02:00
+++ 1.45/storage/csv/ha_tina.cc	2006-05-16 22:23:46 +02:00
@@ -146,6 +146,11 @@
 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 @@
     share->mapped_file= NULL;
 
   DBUG_RETURN(0);
+#endif /* __NETWARE__ */
 }
 
 

--- 1.3/unittest/mytap/t/basic.t.c	2006-05-10 17:29:22 +02:00
+++ 1.4/unittest/mytap/t/basic.t.c	2006-05-16 22:35:07 +02:00
@@ -2,7 +2,7 @@
 #include "my_config.h"
 
 #include <stdlib.h>
-#include <tap.h>
+#include "../tap.h"
 
 int main() {
   plan(5);

--- 1.6/mysql-test/valgrind.supp	2006-05-14 01:13:57 +02:00
+++ 1.7/mysql-test/valgrind.supp	2006-05-16 22:34:02 +02:00
@@ -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