Commit d8735905 authored by unknown's avatar unknown
Browse files

Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 

into hundin.mysql.fi:/home/jan/mysql-4.1
parents 59c3c8ce b6d9222d

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

bdb/dist/gen_inc.awk

+11 −11
Original line number Diff line number Diff line
@@ -18,20 +18,20 @@ 
#	i_pfile		include file that contains internal (PUBLIC) prototypes

/PUBLIC:/ {

	sub("^.*PUBLIC:[	 ][	 ]*", "")

	if ($0 ~ "^#if|^#ifdef|^#ifndef|^#else|^#endif") {

	if ($0 ~ /^#(if|ifdef|ifndef|else|endif)/) {

		print $0 >> i_pfile

		print $0 >> i_dfile

		next

	}

	pline = sprintf("%s %s", pline, $0)

	if (pline ~ "));") {

	if (pline ~ /\)\);/) {

		sub("^[	 ]*", "", pline)

		print pline >> i_pfile

		if (pline !~ db_version_unique_name) {

			def = gensub("[	 ][	 ]*__P.*", "", 1, pline)

			sub("^.*[	 ][*]*", "", def)

			sub("[	 ][	 ]*__P.*", "", pline)

			sub("^.*[	 ][*]*", "", pline)

			printf("#define	%s %s@DB_VERSION_UNIQUE_NAME@\n",

			    def, def) >> i_dfile

			    pline, pline) >> i_dfile

		}

		pline = ""

	}
@@ -53,20 +53,20 @@ 
# functions in libraries built with that configuration option.

/EXTERN:/ {

	sub("^.*EXTERN:[	 ][	 ]*", "")

	if ($0 ~ "^#if|^#ifdef|^#ifndef|^#else|^#endif") {

	if ($0 ~ /^#(if|ifdef|ifndef|else|endif)/) {

		print $0 >> e_pfile

		print $0 >> e_dfile

		next

	}

	eline = sprintf("%s %s", eline, $0)

	if (eline ~ "));") {

	if (eline ~ /\)\);/) {

		sub("^[	 ]*", "", eline)

		print eline >> e_pfile

		if (eline !~ db_version_unique_name && eline !~ "^int txn_") {

			def = gensub("[	 ][	 ]*__P.*", "", 1, eline)

			sub("^.*[	 ][*]*", "", def)

		if (eline !~ db_version_unique_name && eline !~ /^int txn_/) {

			sub("[	 ][	 ]*__P.*", "", eline)

			sub("^.*[	 ][*]*", "", eline)

			printf("#define	%s %s@DB_VERSION_UNIQUE_NAME@\n",

			    def, def) >> e_dfile

			    eline, eline) >> e_dfile

		}

		eline = ""

	}

cmd-line-utils/libedit/history.c

+1 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ history_save(History *h, const char *fname) 
	for (retval = HLAST(h, &ev);

	    retval != -1;

	    retval = HPREV(h, &ev), i++) {

		len = strlen(ev.str) * 4;

		len = strlen(ev.str) * 4 + 1;

		if (len >= max_size) {

			max_size = (len + 1023) & ~1023;

			ptr = h_realloc(ptr, max_size);

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.