Commit f0c655b4 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-4.1
parents 9bfdbc0d 7a18eb7a

BUILD/compile-dist

0 → 100755
+47 −0
Original line number Diff line number Diff line 
#!/bin/sh

#

# This script's purpose is to update the automake/autoconf helper scripts and

# to run a plain "configure" without any special compile flags. Only features

# that affect the content of the source distribution are enabled. The resulting

# tree can then be picked up by "make dist" to create the "pristine source

# package" that is used as the basis for all other binary builds.

#

make distclean

aclocal

autoheader

libtoolize --automake --force --copy

automake --force --add-missing --copy

autoconf

(cd bdb/dist && sh s_all)

(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)



# Default to gcc for CC and CXX

if test -z "$CXX" ; then

  export CXX=gcc

fi



if test -z "$CC" ; then

  export CC=gcc

fi



# Use ccache, if available

if ccache -V > /dev/null 2>&1

then

  if ! (echo "$CC" | grep "ccache" > /dev/null)

  then

    export CC="ccache $CC"

  fi

  if ! (echo "$CXX" | grep "ccache" > /dev/null)

  then

    export CXX="ccache $CXX"

  fi

fi



# Make sure to enable all features that affect "make dist"

./configure \

  --with-embedded-server \

  --with-berkeley-db \

  --with-innodb \

  --enable-thread-safe-client \

  --with-ndbcluster

make

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ lenz@mysql.com 
magnus@neptunus.(none)

magnus@shellback.(none)

marko@hundin.mysql.fi

marty@linux.site

mats@mysql.com

matt@booty.(none)

matt@mysql.com

Build-tools/Bootstrap

+23 −21
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ else 
}



# Some predefined settings

$build_command= "BUILD/compile-pentium-max";

$build_command= "BUILD/compile-dist";

$PWD= cwd();

$opt_docdir= $PWD . "/mysqldoc";

$opt_archive_log= undef;
@@ -122,18 +122,8 @@ if (($opt_directory ne $PWD) && (!-d $opt_directory && !$opt_dry_run)) 
#

if ($opt_pull)

{

	&logger("Updating BK tree $REPO to latest ChangeSet first");

  chdir ($REPO) or &abort("Could not chdir to $REPO!");

	&run_command("bk pull", "Could not update $REPO!");

  chdir ($PWD) or &abort("Could not chdir to $PWD!");



	unless ($opt_skip_manual)

	{

		&logger("Updating manual tree in $opt_docdir");

    chdir ($opt_docdir) or &abort("Could not chdir to $opt_docdir!");

	  &run_command("bk pull", "Could not update $opt_docdir!");

    chdir ($PWD) or &abort("Could not chdir to $PWD!");

	}

	&bk_pull("$REPO");

	&bk_pull("$opt_docdir") unless ($opt_skip_manual);

}



#
@@ -270,7 +260,7 @@ if (defined $opt_changelog) 
	$command.= " " . $REPO . " > $target_dir/ChangeLog";

	&logger($command);

	# We cannot use run_command here because of output redirection

	if (!$opt_dry_run)

	unless ($opt_dry_run)

	{

		system($command) == 0 or &abort("Could not create $target_dir/ChangeLog!");

	}
@@ -281,17 +271,17 @@ if (defined $opt_changelog) 
#

unless ($opt_skip_manual)

{

	$msg= "Updating manual files";

	&logger($msg);

	&logger("Updating manual files");

	foreach $file qw/internals manual reservedwords/

	{

		system ("bk cat $opt_docdir/Docs/$file.texi > $target_dir/Docs/$file.texi") == 0

		or &abort("Could not update $file.texi in $target_dir/Docs/!");

	}

        system ("rm -f $target_dir/Docs/Images/Makefile*") == 0

        or &abort("Could not remove Makefiles in $target_dir/Docs/Images/!");

        system ("cp $opt_docdir/Docs/Images/*.* $target_dir/Docs/Images") == 0

        or &abort("Could not copy image files in $target_dir/Docs/Images/!");



	&run_command("rm -f $target_dir/Docs/Images/Makefile*",

 	  "Could not remove Makefiles in $target_dir/Docs/Images/!");

	&run_command("cp $opt_docdir/Docs/Images/*.* $target_dir/Docs/Images",

	  "Could not copy image files in $target_dir/Docs/Images/!");

}



#
@@ -377,6 +367,18 @@ if ($opt_archive_log) 


exit 0;



#

# Run a BK pull on the given BK tree

#

sub bk_pull

{

  my $bk_tree= $_[0];

	&logger("Updating BK tree $bk_tree to latest ChangeSet first");

  chdir ($bk_tree) or &abort("Could not chdir to $bk_tree!");

	&run_command("bk pull", "Could not update $bk_tree!");

  chdir ($PWD) or &abort("Could not chdir to $PWD!");

}



#

# Print the help text message (with an optional message on top)

#

innobase/log/log0recv.c

+1 −2
Original line number Diff line number Diff line
@@ -2990,8 +2990,7 @@ recv_reset_log_files_for_backup( 
	memcpy(name + log_dir_len, logfilename, sizeof logfilename);



	buf = ut_malloc(LOG_FILE_HDR_SIZE + OS_FILE_LOG_BLOCK_SIZE);

        memset(buf, LOG_FILE_HDR_SIZE + OS_FILE_LOG_BLOCK_SIZE, '\0');



        memset(buf, '\0', LOG_FILE_HDR_SIZE + OS_FILE_LOG_BLOCK_SIZE);



	for (i = 0; i < n_log_files; i++) {

innobase/row/row0upd.c

+7 −1
Original line number Diff line number Diff line
@@ -381,8 +381,14 @@ row_upd_changes_field_size_or_external( 
		new_len = new_val->len;



		if (new_len == UNIV_SQL_NULL) {

			/* A bug fixed on Dec 31st, 2004: we looked at the

			SQL NULL size from the wrong field! We may backport

			this fix also to 4.0. The merge to 5.0 will be made

			manually immediately after we commit this to 4.1. */



			new_len = dtype_get_sql_null_size(

					dict_index_get_nth_type(index, i));

					dict_index_get_nth_type(index,

						upd_field->field_no));

		}



		old_len = rec_get_nth_field_size(rec, upd_field->field_no);