Commit 5810ee1c authored by unknown's avatar unknown
Browse files

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/export/space/pekka/ndb/version/my50-ndb


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 995e29f0 2cb2374b

BitKeeper/etc/logging_ok

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ bar@bar.intranet.mysql.r18.ru 
bar@bar.mysql.r18.ru

bar@bar.udmsearch.izhnet.ru

bar@deer.(none)

bar@eagle.intranet.mysql.r18.ru

bar@gw.udmsearch.izhnet.ru

bar@mysql.com

bar@noter.intranet.mysql.r18.ru
@@ -55,6 +56,7 @@ georg@beethoven.local 
georg@beethoven.site

georg@lmy002.wdf.sap.corp

gerberb@ou800.zenez.com

gluh@eagle.intranet.mysql.r18.ru

gluh@gluh.(none)

gluh@gluh.mysql.r18.ru

gordon@zero.local.lan
@@ -119,6 +121,7 @@ kostja@oak.local 
lars@mysql.com

lenz@kallisto.mysql.com

lenz@mysql.com

magnus@msdesk.mysql.com

magnus@neptunus.(none)

magnus@shellback.(none)

marko@hundin.mysql.fi
@@ -227,6 +230,7 @@ salle@vafla.online.bg 
sasha@mysql.sashanet.com

serg@build.mysql.com

serg@build.mysql2.com

serg@mysql.com

serg@serg.mylan

serg@serg.mysql.com

serg@sergbook.mylan

BitKeeper/triggers/pre-commit

+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 commit 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 [ "$REAL_EMAIL" = "" ]

then

 echo "Error: you must set REAL_EMAIL in your profile"

Build-tools/Bootstrap

+28 −14
Original line number Diff line number Diff line
@@ -240,40 +240,52 @@ if (defined $opt_changelog) 
	# the last tagged ChangeSet (this relies heavily on our current tagging

	# practice!)

	#

	my $revision= "";

	$opt_changelog=~ s/^=//;	# Sometimes, a leading '=' was not stripped.

	my $log_base= $opt_changelog;

	my $changelogfile;

	if ($target_dir =~ m:^/:)	# we need an absolute path, as we change directory

	{

		$changelogfile= $target_dir. "/ChangeLog";

	}

	else

	{

		$changelogfile= cwd() . "/" . $target_dir . "/ChangeLog";

	}



	if ($opt_changelog eq "last")

	{

		if (!$opt_revision)

		{

			$revision= `bk changes -t -d':REV:::TAG:' -n $REPO | grep mysql-$major.$minor | head -1 | cut -f1 -d ":"`;

			$log_base= `bk changes -t -d':REV:::TAG:' -n $REPO | grep mysql-$major.$minor | head -1 | cut -f1 -d ":"`;

		}

		else

		{

			$revision= `bk changes -r..$opt_revision -t -d':REV:' -n $REPO | head -2 | tail -1`;

			$log_base= `bk changes -r..$opt_revision -t -d':REV:' -n $REPO | head -2 | tail -1`;

		}

		chomp($revision);

		$opt_changelog= $revision;

		chomp($log_base);

	}



	$msg= "Adding $target_dir/ChangeLog";

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

	$msg= "Adding $changelogfile";

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

	&logger($msg);

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

	# Due to a BK error, "bk changes" must be run in $REPO !

	$command= "cd $REPO ; ";

	$command.= "bk changes -v";

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

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

	$command.= ".." if ($log_base ne "" && !$opt_revision);

	$command.= ".." . $opt_revision if $opt_revision;

	$command.= " " . $REPO . " > $target_dir/ChangeLog";

	$command.= " > $changelogfile";

	&logger($command);

	# We cannot use run_command here because of output redirection

	unless ($opt_dry_run)

	{

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

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

	}

}



#

# Add the latest manual from the mysqldoc tree

# Add the latest manual and tool from the mysqldoc tree

#

unless ($opt_skip_manual)

{
@@ -283,6 +295,8 @@ unless ($opt_skip_manual) 
		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/!");

	}

	&run_command("cp $opt_docdir/Docs/Support/texi2html $target_dir/Docs/Support",

	  "Could not copy $opt_docdir/Docs/Support/texi2html!");



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

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

Build-tools/Do-compile

+7 −3
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ use Sys::Hostname; 
$opt_comment=$opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env="";

$opt_dbd_options=$opt_perl_options=$opt_config_options=$opt_make_options=$opt_suffix="";

$opt_tmp=$opt_version_suffix="";

$opt_bundled_zlib=$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_one_error=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_archive=$opt_with_cluster=$opt_with_csv=$opt_with_example=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=0;

$opt_skip_embedded_test=$opt_skip_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=$opt_with_federated=0;

$opt_bundled_zlib=$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_one_error=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_archive=$opt_with_cluster=$opt_with_csv=$opt_with_example=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=$opt_with_blackhole=0;

$opt_skip_embedded_test=$opt_skip_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=$opt_with_federated=$opt_with_big_tables=0;

$global_step="";



GetOptions(
@@ -58,6 +58,8 @@ GetOptions( 
	"user=s",

	"version-suffix=s",

	"with-archive",

        "with-big-tables",

        "with-blackhole",

	"with-cluster",

	"with-csv",

	"with-debug",
@@ -275,6 +277,7 @@ if ($opt_stage <= 1) 
  $opt_config_options.= " --without-ndb-debug" if ($opt_with_debug && $opt_with_cluster);

  $opt_config_options.= " --with-libwrap" if ($opt_libwrap);

  $opt_config_options.= " --with-low-memory" if ($opt_with_low_memory);

  $opt_config_options.= " --with-big-tables" if ($opt_with_big_tables);

  $opt_config_options.= " --with-mysqld-ldflags=-all-static" if ($opt_static_server);

  $opt_config_options.= " --with-raid" if ($opt_raid);

	if ($opt_readline)
@@ -288,6 +291,7 @@ if ($opt_stage <= 1) 
  $opt_config_options.= " --with-embedded-server" unless ($opt_without_embedded);

  $opt_skip_embedded_test= 1 if ($opt_without_embedded);

  $opt_config_options.= " --with-archive-storage-engine" if ($opt_with_archive);

  $opt_config_options.= " --with-blackhole-storage-engine" if ($opt_with_blackhole);

  $opt_config_options.= " --with-ndbcluster" if ($opt_with_cluster);

  $opt_config_options.= " --with-csv-storage-engine" if ($opt_with_csv);

  $opt_config_options.= " --with-example-storage-engine" if ($opt_with_example);

VC++Files/libmysqld/examples/test_libmysqld.dsp

+1 −5
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ BSC32=bscmake.exe 
# ADD BSC32 /nologo

LINK32=xilink6.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"LIBCMTD" /out:"Release/mysql-server.exe"

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\test_libmysqld.exe"

# Begin Target



# Name "test_libmysqld - Win32 Release"
@@ -71,9 +71,5 @@ SOURCE=..\..\client\readline.cpp 
SOURCE=..\..\client\sql_string.cpp

# End Source File

# End Group

# Begin Source File



SOURCE=..\..\lib_release\libmysqld.lib

# End Source File

# End Target

# End Project