Merge with 4.0.13

Author: monty@narttu.mysql.fi

.bzrignore

@@ -38,7 +38,11 @@ COPYING.LIB
 Docs/#manual.texi#
 Docs/INSTALL-BINARY
 Docs/include.texi
+Docs/internals.html
 Docs/internals.info
+Docs/internals.pdf
+Docs/internals.txt
+Docs/internals_toc.html
 Docs/manual.aux
 Docs/manual.cp
 Docs/manual.cps
@@ -239,6 +243,7 @@ client/select_test
 client/ssl_test
 client/thimble
 client/thread_test
+client_test
 cmd-line-utils/libedit/common.h
 comon.h
 config.cache
@@ -287,6 +292,7 @@ innobase/conftest.subs
 innobase/ib_config.h
 innobase/ib_config.h.in
 innobase/stamp-h1
+insert_test
 isam/isamchk
 isam/isamlog
 isam/pack_isam
@@ -513,6 +519,7 @@ scripts/mysqld_safe
 scripts/mysqldumpslow
 scripts/mysqlhotcopy
 scripts/safe_mysqld
+select_test
 sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686
 sql-bench/bench-count-distinct
 sql-bench/bench-init.pl
@@ -578,6 +585,7 @@ strings/ctype_autoconf.c
 strings/ctype_extra_sources.c
 support-files/MacOSX/Description.plist
 support-files/MacOSX/Info.plist
+support-files/MacOSX/ReadMe.txt
 support-files/MacOSX/StartupParameters.plist
 support-files/MacOSX/postinstall
 support-files/MacOSX/preinstall
@@ -597,6 +605,7 @@ support-files/mysql.spec
 tags
 test_xml
 tests/client_test
+thread_test
 tmp/*
 tools/my_vsnprintf.c
 tools/mysqlmanager
@@ -607,7 +616,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-client_test
-thread_test
-select_test
-insert_test

BUILD/SETUP.sh

@@ -71,4 +71,6 @@ else
   make=make
 fi
 
-CXX=gcc
+if test -z $CXX ; then
+  CXX=gcc
+fi

BitKeeper/etc/logging_ok

@@ -51,6 +51,7 @@ miguel@hegel.br
 miguel@hegel.local
 miguel@light.
 miguel@light.local
+mmatthew@markslaptop.
 monty@bitch.mysql.fi
 monty@butch.
 monty@donna.mysql.fi
@@ -67,6 +68,7 @@ mwagner@cash.mwagner.org
 mwagner@evoq.mwagner.org
 mwagner@work.mysql.com
 mysql@home.(none)
+mysqldev@build.mysql2.com
 nick@mysql.com
 nick@nick.leippe.com
 papa@gbichot.local
@@ -75,6 +77,7 @@ paul@teton.kitebird.com
 pem@mysql.com
 peter@linux.local
 peter@mysql.com
+peterg@mysql.com
 pgulutzan@linux.local
 ram@gw.udmsearch.izhnet.ru
 ram@mysql.r18.ru

Build-tools/Do-compile

@@ -276,7 +276,11 @@ if ($opt_stage <= 3)
   my $flags= "";
   log_timestamp();
   log_system("rm -fr mysql-3* mysql-4* $pwd/$host/*.tar.gz");
-  log_system("nm -n sql/mysqld | gzip -9 -v 2>&1 > sql/mysqld.sym.gz | cat");
+  # No need to add the debug symbols, if the binaries are not stripped (saves space)
+  unless ($opt_with_debug || $opt_no_strip)
+  {
+    log_system("nm -n sql/mysqld | gzip -9 -v 2>&1 > sql/mysqld.sym.gz | cat");
+  }
 
   $flags.= "--no-strip" if ($opt_no_strip || $opt_with_debug);
   check_system("scripts/make_binary_distribution --tmp=$opt_tmp --suffix=$opt_suffix $flags",".tar.gz created");

Docs/Makefile.am

@@ -27,7 +27,7 @@ EXTRA_DIST =		$(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \
 all:			$(targets) txt_files
 
 txt_files:		../INSTALL-SOURCE ../COPYING ../COPYING.LIB \
-			INSTALL-BINARY
+			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
 
 CLEAN_FILES:		$(BUILD_SOURCES)
 	touch $(BUILD_SOURCES)
@@ -254,5 +254,8 @@ INSTALL-BINARY:	mysql.info $(GT)
 ../COPYING.LIB:		mysql.info $(GT)
 	perl -w $(GT) mysql.info "LGPL license" "Function Index" > $@
 
+../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)
+	perl -w $(GT) mysql.info "Mac OS X installation" "Netware installation" > $@
+
 # Don't update the files from bitkeeper
 %::SCCS/s.%