diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index ca4a56eb210c5044caebe321e4f23591ce69e6ac..d65810bb70814f417126590c15068ee6a764f222 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -67,6 +67,7 @@ kostja@oak.local lenz@kallisto.mysql.com lenz@mysql.com marko@hundin.mysql.fi +matt@mysql.com miguel@hegel.(none) miguel@hegel.br miguel@hegel.local diff --git a/Build-tools/mysql-copyright b/Build-tools/mysql-copyright index ad4547b493c35a1924cf63a1a54d4f0d81324cce..a1869304ba7d1c02f29ad93f72b317a7f6d2be56 100755 --- a/Build-tools/mysql-copyright +++ b/Build-tools/mysql-copyright @@ -125,6 +125,10 @@ sub main print "\"./configure\" was not produced, exiting!\n"; exit(0); } + if (-d "autom4te.cache") { + print "Trying to delete autom4te.cache dir\n" if $opt_verbose; + system("rm -rf autom4te.cache") or print "Unable to delete autom4te.cache dir: $!\n"; + } } # fix file copyrights diff --git a/Build-tools/mysql-copyright-2 b/Build-tools/mysql-copyright-2 index a1a870526da6c2519c6d2c48b01d7c24afaf839b..2ea2e8ef44177d79064a76bc479c14d041ab3b38 100755 --- a/Build-tools/mysql-copyright-2 +++ b/Build-tools/mysql-copyright-2 @@ -90,6 +90,7 @@ sub add_copyright $ARGV =~ /\.cc$/ || $ARGV =~ /\.h$/ || $ARGV =~ /\.cpp$/ || + $ARGV =~ /\.txt$/ || $ARGV =~ /\.yy$/) { $start_copyright="/* "; diff --git a/configure.in b/configure.in index 30a546ec5d92b2b1111419dd58edd0a52827f7ba..c3978ff32d171a9b9a7ece9f8ac590856006b6d4 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! -AM_INIT_AUTOMAKE(mysql, 4.0.21) +AM_INIT_AUTOMAKE(mysql, 4.0.22) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 diff --git a/ltmain.sh b/ltmain.sh index 62b9ed17e3fce8ffd8af969234a22bc14dd5fcb6..92e438cbda6814f0530c9432646283678169d16d 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -51,6 +51,9 @@ fi # libtool 1.4.2 workaround SED=${SED:-sed} +# workaround against unset 'max_cmd_len': assume at least 4 kB +max_cmd_len=${max_cmd_len:-4096} + # The name of this program. progname=`$echo "$0" | ${SED} 's%^.*/%%'` modename="$progname"