Merge with 4.0.11

Author: monty@mashka.mysql.fi

BUILD/compile-pentium-valgrind-max

@@ -3,7 +3,7 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags $debug_cflags -DHAVE_purify"
+extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -DHAVE_purify"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"

BitKeeper/etc/gone

@@ -443,6 +443,7 @@ BK|vio/vio-global.h|19700101030959|00021|c261412c01b2f4
 BK|vio/vioelitexx.cc|19700101030959|00022|3eaba70da792a7fc
 BK|vio/violite.h|19700101030959|00023|58d2942a52ea7a83
 BK|vio/viotypes.h|19700101030959|00027|f5a38e7326bd50f3
+BitKeeper/deleted/SCCS/s..del-makefile.w32
 Sinisa@sinisa.nasamreza.org|=6|20010818122920|53462|33f33b0a159dc5d5
 Sinisa@sinisa.nasamreza.org|mysql-test/r/sel000004.result|20020522121240|20995|360af2095c88cb8c
 Sinisa@sinisa.nasamreza.org|mysql-test/r/sel000004.result|20020522133259|25000|4b5fbc60d0d9754f

BitKeeper/etc/logging_ok

@@ -18,6 +18,7 @@ bk@admin.bk
 davida@isil.mysql.com
 gluh@gluh.(none)
 gluh@gluh.mysql.r18.ru
+gweir@work.mysql.com
 heikki@donna.mysql.fi
 heikki@hundin.mysql.fi
 heikki@rescue.

Build-tools/Do-compile

@@ -74,12 +74,6 @@ if (@config_env > 0)
 	$opt_config_env= join(" ", @config_env);
 }
 
-if (@config_env > 0)
-{
-	chomp(@config_env);
-	$opt_config_env= join(" ", @config_env);
-}
-
 chomp($host=`hostname`);
 $full_host_name=$host;
 $connect_option= ($opt_tcpip ? "--host=$host" : "");
@@ -425,7 +419,7 @@ if ($opt_stage <= 9 && !$opt_no_test && !$opt_no_benchmark)
 rm_all($bench_tmpdir);
 rm_all("$opt_tmp") if ($new_opt_tmp);
 
-log_system("$pwd/$host/bin/mysqladmin $mysqladmin_args -S $mysql_unix_port -u root shutdown");
+log_system("$pwd/$host/bin/mysqladmin $mysqladmin_args -S $mysql_unix_port shutdown");
 print LOG "ok\n";
 close LOG;
 print "$host: ok\n";

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 # ../MIRRORS
+			INSTALL-BINARY
 
 CLEAN_FILES:		$(BUILD_SOURCES)
 	touch $(BUILD_SOURCES)
@@ -254,8 +254,5 @@ INSTALL-BINARY:	mysql.info $(GT)
 ../COPYING.LIB:		mysql.info $(GT)
 	perl -w $(GT) mysql.info "LGPL license" "Function Index" > $@
 
-#../MIRRORS:		manual.texi $(srcdir)/Support/generate-mirror-listing.pl
-#	perl -w $(srcdir)/Support/generate-mirror-listing.pl manual.texi > $@
-
 # Don't update the files from bitkeeper
 %::SCCS/s.%