mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge marko@build.mysql.com:/home/bk/mysql-4.0

Browse source 
into hundin.mysql.fi:/home/marko/k/mysql-4.0
This commit is contained in:
unknown 2004-09-10 13:44:45 +03:00
commit 4468792d6f
5 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View file

@ -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

4
Build-tools/mysql-copyright
View file

@ -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

1
Build-tools/mysql-copyright-2
View file

@ -90,6 +90,7 @@ sub add_copyright
$ARGV =~ /\.cc$/ ||
$ARGV =~ /\.h$/ ||
$ARGV =~ /\.cpp$/ ||
$ARGV =~ /\.txt$/ ||
$ARGV =~ /\.yy$/)
{
$start_copyright="/* ";

2
configure.in
View file

@ -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

3
ltmain.sh
View file

@ -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"