diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-09-10 13:44:45 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-09-10 13:44:45 +0300 |
| commit | 4468792d6f748e97418813fdd9b2bf7f42820b5d (patch) | |
| tree | 6c550b04d53d61d3175c14a44b1d48c1b57a32fd | |
| parent | 58c98fde65049a9eb75612454f936110ea0ff426 (diff) | |
| parent | 8eb1db61a0fedd44497c1e442486f25edc988731 (diff) | |
| download | mariadb-git-4468792d6f748e97418813fdd9b2bf7f42820b5d.tar.gz | |
Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rwxr-xr-x | Build-tools/mysql-copyright | 4 | ||||
| -rwxr-xr-x | Build-tools/mysql-copyright-2 | 1 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | ltmain.sh | 3 |
5 files changed, 10 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index ca4a56eb210..d65810bb708 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 ad4547b493c..a1869304ba7 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 a1a870526da..2ea2e8ef441 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 30a546ec5d9..c3978ff32d1 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 62b9ed17e3f..92e438cbda6 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" |