Skip to content

Commit 023d6dd

Browse files
author
[email protected]
committed
Merge with 4.0.11
2 parents 6a32ae7 + 5ce0cd1 commit 023d6dd

File tree

206 files changed

+11593
-65041
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+11593
-65041
lines changed

‎BUILD/compile-pentium-valgrind-max‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
path=`dirname $0`
44
. "$path/SETUP.sh"
55

6-
extra_flags="$pentium_cflags $debug_cflags -DHAVE_purify"
6+
extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -DHAVE_purify"
77
c_warnings="$c_warnings $debug_extra_warnings"
88
cxx_warnings="$cxx_warnings $debug_extra_warnings"
99
extra_configs="$pentium_configs $debug_configs"

‎BitKeeper/etc/gone‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,7 @@ BK|vio/vio-global.h|19700101030959|00021|c261412c01b2f4
443443
BK|vio/vioelitexx.cc|19700101030959|00022|3eaba70da792a7fc
444444
BK|vio/violite.h|19700101030959|00023|58d2942a52ea7a83
445445
BK|vio/viotypes.h|19700101030959|00027|f5a38e7326bd50f3
446+
BitKeeper/deleted/SCCS/s..del-makefile.w32
446447
[email protected]|=6|20010818122920|53462|33f33b0a159dc5d5
447448
[email protected]|mysql-test/r/sel000004.result|20020522121240|20995|360af2095c88cb8c
448449
[email protected]|mysql-test/r/sel000004.result|20020522133259|25000|4b5fbc60d0d9754f

‎BitKeeper/etc/logging_ok‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ [email protected]
1818
[email protected]
1919
gluh@gluh.(none)
2020
[email protected]
21+
[email protected]
2122
[email protected]
2223
[email protected]
2324
heikki@rescue.

‎Build-tools/Do-compile‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,6 @@ if (@config_env > 0)
7474
$opt_config_env= join(" ", @config_env);
7575
}
7676

77-
if (@config_env > 0)
78-
{
79-
chomp(@config_env);
80-
$opt_config_env= join(" ", @config_env);
81-
}
82-
8377
chomp($host=`hostname`);
8478
$full_host_name=$host;
8579
$connect_option= ($opt_tcpip ? "--host=$host" : "");
@@ -425,7 +419,7 @@ if ($opt_stage <= 9 && !$opt_no_test && !$opt_no_benchmark)
425419
rm_all($bench_tmpdir);
426420
rm_all("$opt_tmp") if ($new_opt_tmp);
427421

428-
log_system("$pwd/$host/bin/mysqladmin $mysqladmin_args -S $mysql_unix_port -u root shutdown");
422+
log_system("$pwd/$host/bin/mysqladmin $mysqladmin_args -S $mysql_unix_port shutdown");
429423
print LOG "ok\n";
430424
close LOG;
431425
print "$host: ok\n";

‎Docs/Makefile.am‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \
2727
all: $(targets) txt_files
2828

2929
txt_files: ../INSTALL-SOURCE ../COPYING ../COPYING.LIB \
30-
INSTALL-BINARY # ../MIRRORS
30+
INSTALL-BINARY
3131

3232
CLEAN_FILES: $(BUILD_SOURCES)
3333
touch $(BUILD_SOURCES)
@@ -254,8 +254,5 @@ INSTALL-BINARY: mysql.info $(GT)
254254
../COPYING.LIB: mysql.info $(GT)
255255
perl -w $(GT) mysql.info "LGPL license" "Function Index" > $@
256256

257-
#../MIRRORS: manual.texi $(srcdir)/Support/generate-mirror-listing.pl
258-
# perl -w $(srcdir)/Support/generate-mirror-listing.pl manual.texi > $@
259-
260257
# Don't update the files from bitkeeper
261258
%::SCCS/s.%

‎Docs/ManualStyleGuidelines.wiki‎

Lines changed: 0 additions & 282 deletions
This file was deleted.

0 commit comments

Comments
 (0)