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

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

into build.mysql.com:/users/tulin/mysql-4.1-cluster-extra


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
parents 7f7cdd0b c99b4964

.bzrignore

+56 −0
Original line number Diff line number Diff line
@@ -946,3 +946,59 @@ libmysqld/ha_tina.cc 
analyse.test

client/mysqladmin.c

mysql-4.1.8-win-src.zip

ndb/include/ndb_version.h

ndb/include/ndb_global.h

mysql-test/mysql-test-run.log

mysql-test/r/alter_table.err

mysql-test/r/archive.err

mysql-test/r/bdb-alter-table-1.err

mysql-test/r/bdb-alter-table-2.err

mysql-test/r/bdb-crash.err

mysql-test/r/bdb-deadlock.err

mysql-test/r/bdb.err

mysql-test/r/bdb_cache.err

mysql-test/r/client_test.err

mysql-test/r/csv.err

mysql-test/r/ctype_ucs.err

mysql-test/r/derived.err

mysql-test/r/exampledb.err

mysql-test/r/func_encrypt.err

mysql-test/r/isam.err

mysql-test/r/lowercase_table2.err

mysql-test/r/multi_update.err

mysql-test/r/mysql_protocols.err

mysql-test/r/mysqlbinlog.err

mysql-test/r/mysqlbinlog2.err

mysql-test/r/mysqldump.err

mysql-test/r/mysqltest.err

mysql-test/r/ndb_alter_table.err

mysql-test/r/ndb_autodiscover.err

mysql-test/r/ndb_autodiscover2.err

mysql-test/r/ndb_basic.err

mysql-test/r/ndb_blob.err

mysql-test/r/ndb_cache.err

mysql-test/r/ndb_charset.err

mysql-test/r/ndb_index.err

mysql-test/r/ndb_index_ordered.err

mysql-test/r/ndb_index_unique.err

mysql-test/r/ndb_insert.err

mysql-test/r/ndb_limit.err

mysql-test/r/ndb_lock.err

mysql-test/r/ndb_minmax.err

mysql-test/r/ndb_replace.err

mysql-test/r/ndb_subquery.err

mysql-test/r/ndb_transaction.err

mysql-test/r/ndb_truncate.err

mysql-test/r/ndb_types.err

mysql-test/r/ndb_update.err

mysql-test/r/openssl_1.err

mysql-test/r/ps_1general.err

mysql-test/r/ps_6bdb.err

mysql-test/r/ps_7ndb.err

mysql-test/r/query_cache.err

mysql-test/r/query_cache_merge.err

mysql-test/r/raid.err

mysql-test/r/repair.err

mysql-test/r/replace.err

mysql-test/r/rpl000001.err

mysql-test/r/rpl000015.err

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

+2 −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
@@ -164,6 +165,7 @@ paul@frost.snake.net 
paul@ice.local

paul@ice.snake.net

paul@kite-hub.kitebird.com

paul@snake-hub.snake.net

paul@teton.kitebird.com

pekka@mysql.com

pem@mysql.com

BitKeeper/triggers/pre-delta

+11 −0
Original line number Diff line number Diff line 
#!/bin/sh



if [ "$BK_USER" = "Administrator" -o "$BK_USER" = "mysqldev" ]

then

 echo "Error: you cannot checkin as 'Administrator' or 'mysqldev' user."

 echo "as a workaround set BK_USER to your nickname"

 echo "e.g.: export BK_USER='bar'"

 echo ""

 echo "Checkin FAILED!"

 echo "Set BK_USER and retry."

 exit 1

fi



if [ `tail -c1 $BK_FILE` ]

then

 echo "File $BK_FILE does not end with a new-line character!"

Build-tools/Bootstrap

+24 −22
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);

}



#
@@ -262,7 +252,7 @@ if (defined $opt_changelog) 
	$msg= "Adding $target_dir/ChangeLog";

	$msg.= " (down to revision $opt_changelog)" if $opt_changelog ne "";

	&logger($msg);

	$command= "bk changes -mv";

	$command= "bk changes -v";

	$command.= " -r" if ($opt_changelog ne "" || $opt_revision);

	$command.= $opt_changelog if $opt_changelog ne "";

	$command.= ".." if ($opt_changelog ne "" && !$opt_revision);
@@ -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)

#