Merge bk-internal:/home/bk/mysql-5.0 (342f7987) · Commits · Software / OSDI20 Artifacts / mariadb

BUILD/SETUP.sh

+2 −2

Original line number	Diff line number	Diff line
		@@ -48,8 +48,8 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch
		c_warnings="$global_warnings -Wunused"
		cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

		base_max_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"
		max_leave_isam_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"
		base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"
		max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"
		max_no_es_configs="$max_leave_isam_configs --without-isam"
		max_configs="$max_no_es_configs --with-embedded-server"

BitKeeper/etc/logging_ok

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ brian@zim.(none)
		carsten@tsort.bitbybit.dk
		cps@silver_beast.(none)
		davida@isil.mysql.com
		dean@mysql.com
		dellis@goetia.(none)
		dlenev@brandersnatch.localdomain
		dlenev@build.mysql.com
		@@ -222,6 +223,7 @@ serg@sergbook.mysql.com
		sergefp@mysql.com
		sinisa@rhols221.adsl.netsonic.fi
		stewart@mysql.com
		svoj@mysql.com
		tfr@beta.frontier86.ee
		tfr@indrek.tfr.cafe.ee
		tfr@sarvik.tfr.cafe.ee

BitKeeper/triggers/post-commit

+0 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,6 @@ From: $FROM
		To: $INTERNALS
		Subject: bk commit into $VERSION tree ($CHANGESET)$BS
		$BH

		Below is the list of changes that have just been committed into a local
		$VERSION repository of $USER. When $USER does a push these changes will
		be propagated to the main repository and, within 24 hours after the

Build-tools/Do-hpux-depot

0 → 100755

+85 −0

Original line number	Diff line number	Diff line
		#!/usr/bin/perl

		#
		# By Matt Wagner <matt@mysql.com> 2005
		#
		# This script generates HP Depot packages for MySQL Server.
		# It basically repackages a binary tarball as a depot.
		#
		# Usage: ./Do-hpux-depot <untarred-binary-tarball>
		#

		$fullname = shift @ARGV;
		$fullname or die "No package name was specified";
		-d $fullname or die "That directory is not present!";

		$fullname =~ s,/+$,,; # Remove ending slash if any

		chomp($pwd= `pwd`);

		%title= (
		"mysql-standard" => "MySQL Community Edition - Standard (GPL)",
		"mysql-debug" => "MySQL Community Edition - Debug (GPL)",
		"mysql-max" => "MySQL Community Edition - Experimental (GPL)",
		"mysql-pro" => "MySQL Pro (Commercial)",
		"mysql-classic" => "MySQL Classic (Commercial)",
		"mysql-cluster" => "MySQL Cluster (Commercial)",
		);

		%architecture= (
		"hpux11.23" => "HP-UX_B.11.23",
		"hpux11.11" => "HP-UX_B.11.11",
		"hpux11.00" => "HP-UX_B.11.00",
		);

		%os_release= (
		"hpux11.23" => "?.11.2?",
		"hpux11.11" => "?.11.1?",
		"hpux11.00" => "?.11.0?",
		);

		%machine_type= (
		"ia64" => "ia64*",
		"hppa2.0w" => "9000/*",
		);

		$fullname =~ m/^(mysql-\w+)-([\d\.]+)-hp-(hpux11\.\d\d)-(hppa2\.0w\|(ia64))-?(64bit)?$/;

		# print "title: $1\n";
		# print "version: $2\n";
		# print "os: $3\n";
		# print "cpu: $4\n";
		# print "64: $6\n";

		$cpu64= ($6 ne "") ? "_64" : "";

		open (PSF,">${fullname}.psf") or die "Unable to write PSF file ($!)\n";

		print PSF <<EOF;
		product
		tag $1
		vendor_tag "MySQL_AB"
		title "$title{$1}"
		description "MySQL Database Server and Clients"
		revision $2

		architecture $architecture{$3}$cpu64
		machine_type $machine_type{$4}
		os_name HP-UX
		os_release $os_release{$3}
		directory /usr/local

		fileset
		tag all
		revision $2
		directory $fullname=/usr/local/$fullname
		file_permissions -u 222 -g bin -o bin
		file *
		end
		end
		EOF

		close(PSF);

		system("/usr/sbin/swpackage -v -d \"\|gzip -c > $fullname.depot.gz\" -x target_type=tape -s ${pwd}/${fullname}.psf");

client/mysqltest.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -253,6 +253,7 @@ VAR var_reg[10];
		/Perl/shell-like variable registers /
		HASH var_hash;
		my_bool disable_query_log=0, disable_result_log=0, disable_warnings=0;
		my_bool disable_ps_warnings= 0;
		my_bool disable_info= 1; /* By default off */
		my_bool abort_on_error= 1;

		@@ -283,6 +284,7 @@ Q_ENABLE_RESULT_LOG, Q_DISABLE_RESULT_LOG,
		Q_SERVER_START, Q_SERVER_STOP,Q_REQUIRE_MANAGER,
		Q_WAIT_FOR_SLAVE_TO_STOP,
		Q_ENABLE_WARNINGS, Q_DISABLE_WARNINGS,
		Q_ENABLE_PS_WARNINGS, Q_DISABLE_PS_WARNINGS,
		Q_ENABLE_INFO, Q_DISABLE_INFO,
		Q_ENABLE_METADATA, Q_DISABLE_METADATA,
		Q_EXEC, Q_DELIMITER,
		@@ -360,6 +362,8 @@ const char *command_names[]=
		"wait_for_slave_to_stop",
		"enable_warnings",
		"disable_warnings",
		"enable_ps_warnings",
		"disable_ps_warnings",
		"enable_info",
		"disable_info",
		"enable_metadata",
		@@ -3021,6 +3025,7 @@ static int run_query_stmt(MYSQL mysql, struct st_query q, int flags)

		/* We may have got warnings already, collect them if any */
		/* FIXME we only want this if the statement succeeds I think */
		if (!disable_ps_warnings)
		run_query_stmt_handle_warnings(mysql, ds);

		/*
		@@ -3711,6 +3716,8 @@ int main(int argc, char **argv)
		case Q_DISABLE_RESULT_LOG: disable_result_log=1; break;
		case Q_ENABLE_WARNINGS: disable_warnings=0; break;
		case Q_DISABLE_WARNINGS: disable_warnings=1; break;
		case Q_ENABLE_PS_WARNINGS: disable_ps_warnings=0; break;
		case Q_DISABLE_PS_WARNINGS: disable_ps_warnings=1; break;
		case Q_ENABLE_INFO: disable_info=0; break;
		case Q_DISABLE_INFO: disable_info=1; break;
		case Q_ENABLE_METADATA: display_metadata=1; break;