Commit fcf27382 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 cf51de6d 34474695

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ greg@mysql.com 
guilhem@mysql.com

gweir@build.mysql.com

gweir@work.mysql.com

hartmut@mysql.com

heikki@donna.mysql.fi

heikki@hundin.mysql.fi

heikki@rescue.

Build-tools/mysql-copyright

+112 −28
Original line number Diff line number Diff line 
#!/usr/bin/perl -i

#!/usr/bin/perl -wi



# Untar a MySQL distribution, change the copyright texts,

# pack it up again to a given directory



$VER="1.3";

$VER="1.4";



use Cwd;

use File::Basename;
@@ -104,37 +104,25 @@ sub main 
    unlink("$destdir/COPYING", "$destdir/EXCEPTIONS-CLIENT");

    copy("$WD/Docs/MySQLEULA.txt", "$destdir");

    

    # remove readline subdir and update configure accordingly

    system("rm -rf $destdir/cmd-line-utils/readline");

    if ($win_flag) {

      chdir("$destdir") or (print "$! Unable to change directory to $destdir!\n" && exit(0));

    } else {

      chdir("$destdir");

      unlink ("configure") or die "Can't delete $destdir/configure: $!\n";

      open(CONFIGURE,"<configure.in") or die "$! Unable to open configure.in to read from!\n";

      local $/;

      undef $/;

      my $configure = <CONFIGURE>;

      close(CONFIGURE);

      $configure =~ s|cmd\-line\-utils/readline/Makefile dnl\n?||g;

      open(CONFIGURE,">configure.in") or die "$! Unable to open configure.in to write to!\n";

      print CONFIGURE $configure;

      close(CONFIGURE);

      `aclocal && autoheader && aclocal && automake && autoconf`;

      if (! -f "configure") {

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

      }

    # remove subdirectories 'bdb', 'cmd-line-utils/readline'

    #   (latter does not apply to 4.0, but is in different place there!)

    my @extra_fat= ('bdb', 'cmd-line-utils/readline');



    foreach my $fat (@extra_fat)

    {

        &trim_the_fat($fat);

    }



    # fix file copyrights

    &fix_usage_copyright();

    &add_copyright();

    

    # fix LICENSE tag in include/mysql_version.h

    &fix_mysql_version();



    # apply "autotools" - must be last to ensure proper timestamps

    &run_autotools();



    # rename the directory with new distribution name

    chdir("$WD/$dir");

    print "renaming $destdir $newdistname\n" if $opt_verbose;
@@ -160,6 +148,101 @@ sub main 
  exit(0);

}  



####

#### This function will s/GPL/Commercial/ in include/mysql_version.h for the

#### LICENSE tag.

####

sub fix_mysql_version

{

  my $cwd= getcwd();

  chdir("$destdir");

  my $header_file= (-f 'include/mysql_version.h.in')? 'include/mysql_version.h.in' : 'include/mysql_version.h';



  open(MYSQL_VERSION,"<$header_file") or die "Unable to open $header_file for read: $!\n";

  undef $/;

  my $mysql_version= <MYSQL_VERSION>;

  close(MYSQL_VERSION);



  $mysql_version=~ s/\#define LICENSE[\s\t]+GPL/#define LICENSE Commercial/;



  open(MYSQL_VERSION,">$header_file") or die "Unable to open $header_file for write: $!\n";

  print MYSQL_VERSION $mysql_version;

  close(MYSQL_VERSION);

  chdir("$cwd");

}



####

#### This function will remove unwanted parts of a src tree for the mysqlcom

#### distributions.

####

sub trim_the_fat

{

  my $the_fat= shift;

  my $cwd= getcwd();



  chdir("$destdir");

  if ( -d "${the_fat}" )

  {

    system("rm -rf ${the_fat}");

    if (!$win_flag)

    {

      open(CONFIG_IN,"<configure.in") or die "Unable to open configure.in for read: $!\n";

      undef $/;

      my $config_in= <CONFIG_IN>;

      close(CONFIG_IN);



      #

      # If $the_fat Makefile line closes the parenthesis, then

      # replace that line with just the closing parenthesis.

      #

      if ($config_in=~ m|${the_fat}/Makefile\)\n?|)

      {

        $config_in=~ s|${the_fat}/Makefile(\)\n?)|$1|;

      }

      #

      # Else just delete the line

      #

      else

      {

        $config_in=~ s|${the_fat}/Makefile dnl\n?||;

      }



      open(CONFIG_IN,">configure.in") or die "Unable to open configure.in for write: $!\n";

      print CONFIG_IN $config_in;

      close(CONFIG_IN);

    }

  }

  chdir("$cwd");

}





####

#### This function will run the autotools on the reduced source tree.

####

sub run_autotools

{

  my $cwd= getcwd();



  if (!$win_flag)

  {

    chdir("$destdir");

    unlink ("configure") or die "Can't delete $destdir/configure: $!\n";



    # File "configure.in" has already been modified by "trim_the_fat()"



    `aclocal && autoheader && aclocal && automake && autoconf`;

    die "'./configure' was not produced!" unless (-f "configure");



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

    }



    chdir("$cwd");

  }

}





####

#### mysqld and MySQL client programs have a usage printed with --help.

#### This usage includes a copyright, which needs to be modified
@@ -191,6 +274,7 @@ sub add_copyright 
  foreach my $file (@files)

  {

    next if ! -f $file;

    next if -B $file;

    print "processing file $file in cwd $cwd\n" if $opt_verbose;

    `$WD/Build-tools/mysql-copyright-2 "$file"`;

  }

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS = foreign 
EXTRA_DIST =		INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT

SUBDIRS =		. include @docs_dirs@ @readline_dir@ \

			@thread_dirs@ pstack @sql_client_dirs@ \

			@sql_server_dirs@ scripts man tests \

			@sql_server_dirs@ scripts @man_dirs@ tests \

			BUILD netware os2 @libmysqld_dirs@ \

			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@

acinclude.m4

+21 −2
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [ 
AC_DEFUN(MYSQL_CHECK_OPENSSL, [

AC_MSG_CHECKING(for OpenSSL)

  AC_ARG_WITH([openssl],

              [  --with-openssl          Include the OpenSSL support],

              [  --with-openssl[=DIR]    Include the OpenSSL support],

              [openssl="$withval"],

              [openssl=no])
@@ -806,8 +806,19 @@ AC_MSG_CHECKING(for OpenSSL) 
              [openssl_libs="$withval"],

              [openssl_libs=""])



  if test "$openssl" = "yes"

  if test "$openssl" != "no"

  then

	if test "$openssl" != "yes"

	then

		if test -z "$openssl_includes" 

		then

			openssl_includes="$openssl/include"

		fi

		if test -z "$openssl_libs" 

		then

			openssl_libs="$openssl/lib"

		fi

	fi

    MYSQL_FIND_OPENSSL([$openssl_includes], [$openssl_libs])

    #force VIO use

    vio_dir="vio"
@@ -843,6 +854,14 @@ AC_MSG_CHECKING(for OpenSSL) 
    NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS $openssl_libs"

  else

    AC_MSG_RESULT(no)

	if test ! -z "$openssl_includes"

	then

		AC_MSG_ERROR(Can't have --with-openssl-includes without --with-openssl);

	fi

	if test ! -z "$openssl_libs"

	then

		AC_MSG_ERROR(Can't have --with-openssl-libs without --with-openssl);

	fi

  fi

  AC_SUBST(openssl_libs)

  AC_SUBST(openssl_includes)

client/mysqldump.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static struct my_option my_long_options[] = 
   "Fields in the i.file are opt. enclosed by ...", (gptr*) &opt_enclosed,

   (gptr*) &opt_enclosed, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0 ,0, 0},

  {"fields-escaped-by", OPT_ESC, "Fields in the i.file are escaped by ...",

   (gptr*) &escaped, (gptr*) &escaped, 0, GET_STR, NO_ARG, 0, 0, 0, 0, 0, 0},

   (gptr*) &escaped, (gptr*) &escaped, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"first-slave", 'x', "Locks all tables across all databases.",

   (gptr*) &opt_first_slave, (gptr*) &opt_first_slave, 0, GET_BOOL, NO_ARG,

   0, 0, 0, 0, 0, 0},