Commit 4468792d authored by unknown's avatar unknown
Browse files

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

into hundin.mysql.fi:/home/marko/k/mysql-4.0
parents 58c98fde 8eb1db61

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -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

Build-tools/mysql-copyright

+4 −0
Original line number Diff line number Diff line
@@ -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

Build-tools/mysql-copyright-2

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ sub add_copyright 
	 $ARGV =~ /\.cc$/ ||

	 $ARGV =~ /\.h$/ ||

	 $ARGV =~ /\.cpp$/ ||

	 $ARGV =~ /\.txt$/ ||

	 $ARGV =~ /\.yy$/)

  {

    $start_copyright="/* ";

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -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

ltmain.sh

+3 −0
Original line number Diff line number Diff line
@@ -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"