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

mysql-test/include/get_binlog_dump_thread_id.inc

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		--exec $MYSQL test -e 'show processlist' \| grep 'Binlog Dump' \| cut -f1 > $MYSQLTEST_VARDIR/tmp/bl_dump_thread_id
		--disable_warnings
		drop table if exists t999;
		--enable_warnings
		create temporary table t999 (f int);
		--replace_result $MYSQLTEST_VARDIR "."
		eval LOAD DATA INFILE "$MYSQLTEST_VARDIR/tmp/bl_dump_thread_id" into table t999;
		let $id = `select f from t999`;
		drop table t999;

mysql-test/lib/mtr_process.pl

+2 −3

Original line number	Diff line number	Diff line
		@@ -465,8 +465,7 @@ sub mtr_kill_leftovers () {

		if ( kill(0, @pids) ) # Check if some left
		{
		# FIXME maybe just mtr_warning() ?
		mtr_error("can't kill process(es) " . join(" ", @pids));
		mtr_warning("can't kill process(es) " . join(" ", @pids));
		}
		}
		}
		@@ -479,7 +478,7 @@ sub mtr_kill_leftovers () {
		{
		if ( mtr_ping_mysqld_server($srv->{'port'}, $srv->{'sockfile'}) )
		{
		mtr_error("can't kill old mysqld holding port $srv->{'port'}");
		mtr_warning("can't kill old mysqld holding port $srv->{'port'}");
		}
		}
		}

mysql-test/mysql-test-run.pl

+20 −5

Original line number	Diff line number	Diff line
		@@ -312,6 +312,9 @@ our $opt_udiff;

		our $opt_skip_ndbcluster;
		our $opt_with_ndbcluster;
		our $opt_with_ndbcluster_only= 0; # dummy, ignored

		our $opt_with_openssl;

		our $exe_ndb_mgm;
		our $path_ndb_tools_dir;
		@@ -572,6 +575,7 @@ sub command_line_setup () {
		'force' => \$opt_force,
		'with-ndbcluster' => \$opt_with_ndbcluster,
		'skip-ndbcluster\|skip-ndb' => \$opt_skip_ndbcluster,
		'with-ndbcluster-only' => \$opt_with_ndbcluster_only,
		'do-test=s' => \$opt_do_test,
		'suite=s' => \$opt_suite,
		'skip-rpl' => \$opt_skip_rpl,
		@@ -677,6 +681,11 @@ sub command_line_setup () {
		print '#' x 78, "\n\n";
		}

		if ( $opt_with_ndbcluster_only )
		{
		print "# Option '--with-ndbcluster-only' is ignored in this release.\n";
		}

		foreach my $arg ( @ARGV )
		{
		if ( $arg =~ /^--skip-/ )
		@@ -2933,11 +2942,6 @@ sub run_mysqltest ($) {

		mtr_init_args(\$args);

		if ( $opt_valgrind_mysqltest )
		{
		valgrind_arguments($args, \$exe);
		}

		mtr_add_arg($args, "--no-defaults");
		mtr_add_arg($args, "--silent");
		mtr_add_arg($args, "-v");
		@@ -3053,6 +3057,17 @@ sub run_mysqltest ($) {
		# Add arguments that should not go into the MYSQL_TEST env var
		# ----------------------------------------------------------------------

		if ( $opt_valgrind_mysqltest )
		{
		# Prefix the Valgrind options to the argument list.
		# We do this here, since we do not want to Valgrind the nested invocations
		# of mysqltest; that would mess up the stderr output causing test failure.
		my @args_saved = @$args;
		mtr_init_args(\$args);
		valgrind_arguments($args, \$exe);
		mtr_add_arg($args, "%s", $_) for @args_saved;
		}

		mtr_add_arg($args, "--test-file");
		mtr_add_arg($args, $tinfo->{'path'});

mysql-test/mysql-test-run.sh

+12 −0

Original line number	Diff line number	Diff line
		@@ -277,6 +277,7 @@ EXTRA_MYSQLSHOW_OPT=""
		EXTRA_MYSQLBINLOG_OPT=""
		USE_RUNNING_SERVER=0
		USE_NDBCLUSTER=@USE_NDBCLUSTER@
		USE_NDBCLUSTER_ONLY=0
		USE_RUNNING_NDBCLUSTER=""
		USE_PURIFY=""
		PURIFY_LOGS=""
		@@ -315,6 +316,8 @@ STRESS_INIT_FILE=""
		STRESS_TEST_FILE=""
		STRESS_TEST=""

		$ECHO "Logging: $0 $*" # To ensure we see all arguments in the output, for the test analysis tool

		while test $# -gt 0; do
		case "$1" in
		--embedded-server)
		@@ -341,6 +344,10 @@ while test $# -gt 0; do
		--extern) USE_RUNNING_SERVER=1 ;;
		--with-ndbcluster)
		USE_NDBCLUSTER="--ndbcluster" ;;
		--with-ndbcluster-only)
		USE_NDBCLUSTER="--ndbcluster"
		USE_NDBCLUSTER_SLAVE="--ndbcluster"
		USE_NDBCLUSTER_ONLY=1 ;;
		--ndb-connectstring=*)
		USE_NDBCLUSTER="--ndbcluster" ;
		USE_RUNNING_NDBCLUSTER=`$ECHO "$1" \| $SED -e "s;--ndb-connectstring=;;"` ;;
		@@ -1654,6 +1661,11 @@ run_testcase ()
		result_file="r/$tname.result"
		echo $tname > $CURRENT_TEST
		SKIP_SLAVE=`$EXPR $ $tname : rpl $ = 0 \& $ $tname : federated $ = 0`
		NDBCLUSTER_TEST=`$EXPR $ $tname : '.ndb.' $ != 0`
		if [ "x$USE_NDBCLUSTER_ONLY" = "x1" -a "x$NDBCLUSTER_TEST" != "x1" ] ; then
		skip_test $tname
		return
		fi
		if [ "$USE_MANAGER" = 1 ] ; then
		many_slaves=`$EXPR $ \( $tname : rpl_failsafe $ != 0 \) \\| $ \( $tname : rpl_chain_temp_table $ != 0 \)`
		fi

mysql-test/r/func_time.result

+36 −0

Original line number	Diff line number	Diff line
		@@ -360,6 +360,42 @@ extract(SECOND FROM "1999-01-02 10:11:12")
		select extract(MONTH FROM "2001-02-00");
		extract(MONTH FROM "2001-02-00")
		2
		SELECT EXTRACT(QUARTER FROM '2004-01-15') AS quarter;
		quarter
		1
		SELECT EXTRACT(QUARTER FROM '2004-02-15') AS quarter;
		quarter
		1
		SELECT EXTRACT(QUARTER FROM '2004-03-15') AS quarter;
		quarter
		1
		SELECT EXTRACT(QUARTER FROM '2004-04-15') AS quarter;
		quarter
		2
		SELECT EXTRACT(QUARTER FROM '2004-05-15') AS quarter;
		quarter
		2
		SELECT EXTRACT(QUARTER FROM '2004-06-15') AS quarter;
		quarter
		2
		SELECT EXTRACT(QUARTER FROM '2004-07-15') AS quarter;
		quarter
		3
		SELECT EXTRACT(QUARTER FROM '2004-08-15') AS quarter;
		quarter
		3
		SELECT EXTRACT(QUARTER FROM '2004-09-15') AS quarter;
		quarter
		3
		SELECT EXTRACT(QUARTER FROM '2004-10-15') AS quarter;
		quarter
		4
		SELECT EXTRACT(QUARTER FROM '2004-11-15') AS quarter;
		quarter
		4
		SELECT EXTRACT(QUARTER FROM '2004-12-15') AS quarter;
		quarter
		4
		SELECT "1900-01-01 00:00:00" + INTERVAL 2147483648 SECOND;
		"1900-01-01 00:00:00" + INTERVAL 2147483648 SECOND
		1968-01-20 03:14:08