Commit 14f8afc9 authored by unknown's avatar unknown
Browse files

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

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
parents 7d3b20e3 ae99cc1f

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ ram@gw.udmsearch.izhnet.ru 
ram@mysql.r18.ru

ram@ram.(none)

ranger@regul.home.lan

rburnett@build.mysql.com

root@home.(none)

root@x3.internalnet

salle@banica.(none)

Build-tools/mysql-copyright

+26 −5
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ sub main 
    &fix_usage_copyright();

    &add_copyright();

   

    # fix LICENSE tag in include/mysql_version.h

    &fix_mysql_version();

    

    # rename the directory with new distribution name

    chdir("$WD/$dir");

    print "renaming $destdir $newdistname\n" if $opt_verbose;
@@ -141,6 +144,28 @@ sub main 
  exit(0);

}  



####

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

#### LICENSE tag.

####

sub fix_mysql_version

{

    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 include/mysql_version.h 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 include/mysql_version.h 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.
@@ -151,11 +176,7 @@ sub trim_the_fat 
        my $cwd= getcwd();



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

        if ($win_flag)

        {

                chdir("$destdir") or die "Unable to change directory to $destdir!: $!\n";

        }

        else

        if (!$win_flag)

        {

                chdir("$destdir");

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

include/my_time.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
C_MODE_START



extern ulonglong log_10_int[20];

extern uchar days_in_month[];



/*

  Portable time_t replacement.

myisam/Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include 
LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \

			$(top_builddir)/mysys/libmysys.a \

			$(top_builddir)/dbug/libdbug.a \

			@ZLIB_LIBS@ \

			$(top_builddir)/strings/libmystrings.a

			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@

pkglib_LIBRARIES =	libmyisam.a

bin_PROGRAMS =		myisamchk myisamlog myisampack myisam_ftdump

myisamchk_DEPENDENCIES=	$(LIBRARIES)

mysql-test/ndb/ndb_config_2_node.ini

+1 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ DataMemory: CHOOSE_DataMemory 
IndexMemory: CHOOSE_IndexMemory

Diskless: CHOOSE_Diskless

TimeBetweenWatchDogCheck: 30000

FileSystemPath: CHOOSE_FILESYSTEM



[COMPUTER]

Id: 1
@@ -16,11 +17,9 @@ HostName: CHOOSE_HOSTNAME_2 


[DB]

ExecuteOnComputer: 1

FileSystemPath: CHOOSE_FILESYSTEM_NODE_1



[DB]

ExecuteOnComputer: 2

FileSystemPath: CHOOSE_FILESYSTEM_NODE_2



[MGM]

PortNumber: CHOOSE_PORT_MGM