Commit 1bef73c2 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 376d6e19 1073271b

BitKeeper/etc/logging_ok

+11 −0
Original line number Diff line number Diff line
@@ -24,14 +24,17 @@ bar@bar.udmsearch.izhnet.ru 
bar@deer.(none)

bar@gw.udmsearch.izhnet.ru

bar@mysql.com

bar@noter.intranet.mysql.r18.ru

bell@laptop.sanja.is.com.ua

bell@sanja.is.com.ua

bk@admin.bk

bk@mysql.r18.ru

brian@avenger.(none)

brian@brian-akers-computer.local

brian@private-client-ip-101.oz.net

carsten@tsort.bitbybit.dk

davida@isil.mysql.com

dellis@goetia.(none)

dlenev@brandersnatch.localdomain

dlenev@build.mysql.com

dlenev@jabberwock.localdomain
@@ -49,6 +52,7 @@ gweir@build.mysql.com 
gweir@work.mysql.com

harrison@mysql.com

harry@corona.lordblink.com

hartmut@mysql.com

heikki@donna.mysql.fi

heikki@hundin.mysql.fi

heikki@rescue.
@@ -62,7 +66,9 @@ igor@hundin.mysql.fi 
igor@rurik.mysql.com

ingo@mysql.com

jan@hundin.mysql.fi

jani@a193-229-222-2.elisa-laajakaista.fi

jani@a80-186-24-72.elisa-laajakaista.fi

jani@a80-186-41-201.elisa-laajakaista.fi

jani@dsl-jkl1657.dial.inet.fi

jani@dsl-kpogw4gb5.dial.inet.fi

jani@hynda.(none)
@@ -91,7 +97,9 @@ kostja@oak.local 
lenz@kallisto.mysql.com

lenz@mysql.com

magnus@neptunus.(none)

magnus@shellback.(none)

marko@hundin.mysql.fi

matt@mysql.com

miguel@hegel.(none)

miguel@hegel.br

miguel@hegel.local
@@ -100,6 +108,7 @@ miguel@hegel.txg.br 
miguel@light.

miguel@light.local

miguel@sartre.local

mikael@mc04.(none)

mikron@c-fb0ae253.1238-1-64736c10.cust.bredbandsbolaget.se

mikron@mikael-ronstr-ms-dator.local

mleich@mysql.com
@@ -130,6 +139,7 @@ mwagner@here.mwagner.org 
mwagner@work.mysql.com

mydev@mysql.com

mysql@home.(none)

mysql@mc04.(none)

mysqldev@build.mysql2.com

mysqldev@melody.local

mysqldev@mysql.com
@@ -159,6 +169,7 @@ ram@ram.(none) 
ranger@regul.home.lan

rburnett@build.mysql.com

root@home.(none)

root@mc04.(none)

root@x3.internalnet

salle@banica.(none)

salle@geopard.(none)

Build-tools/mysql-copyright

+74 −41
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,7 +104,7 @@ sub main 
    unlink("$destdir/COPYING", "$destdir/EXCEPTIONS-CLIENT");

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



    # remove readline, bdb subdirs and update 'configure'

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

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



    foreach my $fat (@extra_fat)
@@ -119,6 +119,9 @@ sub main 
    # 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;
@@ -150,6 +153,7 @@ sub main 
####

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';
@@ -170,42 +174,71 @@ sub fix_mysql_version 
#### 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();



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

  chdir("$destdir");

  if ( -d "${the_fat}" )

  {

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

    if (!$win_flag)

    {

                chdir("$destdir");

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

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

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

      undef $/;

                my $configure= <CONFIGURE>;

                close(CONFIGURE);

      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 ($configure=~ m|${the_fat}/Makefile\)\n?|)

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

      {

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

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

      }

      #

      # Else just delete the line

      #

      else

      {

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

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

      }



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

                print CONFIGURE $configure;

                close(CONFIGURE);

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

  }

}

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="/* ";

Docs/Flags/argentina.eps

deleted100644 → 0
+0 −98
Original line number Diff line number Diff line 
%!PS-Adobe-2.0 EPSF-2.0

%%Creator: pnmtops

%%Title: argentina.ps

%%Pages: 1

%%BoundingBox: 290 385 321 407

%%EndComments

/readstring {

  currentfile exch readhexstring pop

} bind def

/rpicstr 32 string def

/gpicstr 32 string def

/bpicstr 32 string def

%%EndProlog

%%Page: 1 1

gsave

290.64 385.44 translate

30.72 21.12 scale

32 22 8

[ 32 0 0 -22 0 22 ]

{ rpicstr readstring }

{ gpicstr readstring }

{ bpicstr readstring }

true 3

colorimage

000000000000000000000000000000000000000000000000000000000000

000000000000000000000000000000000000000000000000000000000000

000000000000000000000000000000000000000000000000000000000000

000000000000001818181818181818181818181818181818181818181818

181818181818180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b5b5b5b5b5b5b50000efefefefefefefefefefefefefefefefefefef

efefefefefefefefefefef00001818181818181818181818181818181818

181818181818181818181818180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b5b5b5b5b5b5b5b5b5b5b5b5b50000efefefefefefefefefefefefef

efefefefefefefefefefefefefefefefef00001818181818181818181818

181818181818181818181818181818181818180000b5b5b5b5b5b5b5b5b5

b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b50000efefefefefefef

efefefefefefefefefefefefefefefefefefefefefefef00001818181818

181818181818181818181818181818181818181818181818180000b5b5b5

b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b50000ef

efefefefefefefefefefefefefefefefefefefefefefefefefefefefef00

001818181818181818181818181818181818181818181818181818181818

180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b50000efefefefefefefefefefefefefefefefefefefefefefefefef

efefefefef00001818181818181818181818181818181818181818181818

181818181818180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b5b5b5b5b5b5b50000efefefefefefefefefefefefefefefefefefef

efefefefefefefefefefef00006161616161616161616161616161616161

616161616161616161616161610000cacacacacacacacacacacacacacaca

cacacacacacacacacacacacacacaca0000f2f2f2f2f2f2f2f2f2f2f2f2f2

f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f20000f7f7f7f7f7f7f7f7f7f7f7

f7f7f7f9f9f7f7f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7

f7f7f7f7f6f3f3f6f7f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7

f7f7f7f7f7f7eccbccecf7f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7

f7f7f7f7f7f7f7f7fafdfdfaf7f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7

f7f7f7f7f7f7f7f7f7f6f0f2f2f0f6f7f7f7f7f7f7f7f7f7f7f7f70000f7

f7f7f7f7f7f7f7f7f7f7f7ec9b45459becf7f7f7f7f7f7f7f7f7f7f7f700

00f7f7f7f7f7f7f7f7f7f7f7f7f9fdf2eefdf9f7f7f7f7f7f7f7f7f7f7f7

f70000f7f7f7f7f7f7f7f7f7f7f7f7f3f2ede9f2f3f7f7f7f7f7f7f7f7f7

f7f7f70000f7f7f7f7f7f7f7f7f7f7f7f7cb45000045cbf7f7f7f7f7f7f7

f7f7f7f7f70000f7f7f7f7f7f7f7f7f7f7f7f7f9fdebeafdf9f7f7f7f7f7

f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7f7f7f7f3f2e7e7f2f3f7f7f7

f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7f7f7f7cb45000045cbf7

f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7f7f7f7f7fafdfdfa

f7f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7f7f7f7f6f1f2

f2f1f6f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7f7f7f7ec

9b45459becf7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7f7f7

f7f7f7f9f9f7f7f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7f7f7

f7f7f7f7f6f3f3f6f7f7f7f7f7f7f7f7f7f7f7f7f70000f7f7f7f7f7f7f7

f7f7f7f7f7f7eccbcbecf7f7f7f7f7f7f7f7f7f7f7f7f700006363636363

636363636363636363636363636363636363636363636363630000cbcbcb

cbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcb0000f2

f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f2f200

001818181818181818181818181818181818181818181818181818181818

180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b50000efefefefefefefefefefefefefefefefefefefefefefefefef

efefefefef00001818181818181818181818181818181818181818181818

181818181818180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b5b5b5b5b5b5b50000efefefefefefefefefefefefefefefefefefef

efefefefefefefefefefef00001818181818181818181818181818181818

181818181818181818181818180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b5b5b5b5b5b5b5b5b5b5b5b5b50000efefefefefefefefefefefefef

efefefefefefefefefefefefefefefefef00001818181818181818181818

181818181818181818181818181818181818180000b5b5b5b5b5b5b5b5b5

b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b50000efefefefefefef

efefefefefefefefefefefefefefefefefefefefefefef00001818181818

181818181818181818181818181818181818181818181818180000b5b5b5

b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b50000ef

efefefefefefefefefefefefefefefefefefefefefefefefefefefefef00

001818181818181818181818181818181818181818181818181818181818

180000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5

b5b5b50000efefefefefefefefefefefefefefefefefefefefefefefefef

efefefefef00000000000000000000000000000000000000000000000000

000000000000000000000000000000000000000000000000000000000000

000000000000000000000000000000000000000000000000000000000000

000000000000000000000000

grestore

showpage

%%Trailer

Docs/Flags/argentina.gif

deleted100644 → 0
−187 B
Loading image diff...