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

.bzrignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -671,6 +671,7 @@ mysql-test/*.ds?
		mysql-test/*.vcproj
		mysql-test/gmon.out
		mysql-test/install_test_db
		mysql-test/mtr
		mysql-test/mysql-test-run
		mysql-test/mysql-test-run.log
		mysql-test/mysql_test_run_new

client/mysqldump.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -852,6 +852,7 @@ static void DB_error(MYSQL mysql, const char when)
		DBUG_ENTER("DB_error");
		fprintf(stderr, "%s: Got error: %d: %s %s\n", my_progname,
		mysql_errno(mysql), mysql_error(mysql), when);
		fflush(stderr);
		safe_exit(EX_MYSQLERR);
		DBUG_VOID_RETURN;
		} /* DB_error */

mysql-test/Makefile.am

+6 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ benchdir_root= $(prefix)
		testdir = $(benchdir_root)/mysql-test
		EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
		EXTRA_DIST = $(EXTRA_SCRIPTS)
		GENSCRIPTS = mysql-test-run install_test_db
		GENSCRIPTS = mysql-test-run install_test_db mtr
		PRESCRIPTS = mysql-test-run.pl
		test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS)
		test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \
		@@ -112,6 +112,11 @@ std_data/server-cert.pem: $(top_srcdir)/SSL/$(@F)
		std_data/server-key.pem: $(top_srcdir)/SSL/$(@F)
		@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

		# mtr - a shortcut for executing mysql-test-run.pl
		mtr:
		$(RM) -f mtr
		$(LN_S) mysql-test-run.pl mtr

		SUFFIXES = .sh

		.sh:

mysql-test/lib/mtr_cases.pl

+31 −27

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ sub collect_test_cases ($) {

		if ( $mysqld_test_exists and $im_test_exists )
		{
		mtr_error("Ambiguos test case name ($tname)");
		mtr_error("Ambiguous test case name ($tname)");
		}
		elsif ( ! $mysqld_test_exists and ! $im_test_exists )
		{
		@@ -154,34 +154,38 @@ sub collect_test_cases ($) {

		if ( $::opt_reorder )
		{
		@$cases = sort {
		if ( ! $a->{'master_restart'} and ! $b->{'master_restart'} )
		{
		return $a->{'name'} cmp $b->{'name'};
		}

		if ( $a->{'master_restart'} and $b->{'master_restart'} )
		{
		my $cmp= mtr_cmp_opts($a->{'master_opt'}, $b->{'master_opt'});
		if ( $cmp == 0 )
		{
		return $a->{'name'} cmp $b->{'name'};
		}
		else
		{
		return $cmp;
		}
		}
		my %sort_criteria;
		my $tinfo;

		if ( $a->{'master_restart'} )
		{
		return 1; # Is greater
		}
		else
		# Make a mapping of test name to a string that represents how that test
		# should be sorted among the other tests. Put the most important criterion
		# first, then a sub-criterion, then sub-sub-criterion, et c.
		foreach $tinfo (@$cases)
		{
		return -1; # Is less
		my @this_criteria = ();

		# Append the criteria for sorting, in order of importance.
		push(@this_criteria, join("!", sort @{$tinfo->{'master_opt'}}) . "~"); # Ending with "~" makes empty sort later than filled
		push(@this_criteria, "ndb=" . ($tinfo->{'ndb_test'} ? "1" : "0"));
		push(@this_criteria, "restart=" . ($tinfo->{'master_restart'} ? "1" : "0"));
		push(@this_criteria, "big_test=" . ($tinfo->{'big_test'} ? "1" : "0"));
		push(@this_criteria, join("\|", sort keys %{$tinfo})); # Group similar things together. The values may differ substantially. FIXME?
		push(@this_criteria, $tinfo->{'name'}); # Finally, order by the name

		$sort_criteria{$tinfo->{"name"}} = join(" ", @this_criteria);
		}
		} @$cases;

		@$cases = sort { $sort_criteria{$a->{"name"}} cmp $sort_criteria{$b->{"name"}}; } @$cases;

		### For debugging the sort-order
		# foreach $tinfo (@$cases)
		# {
		# print $sort_criteria{$tinfo->{"name"}};
		# print " -> \t";
		# print $tinfo->{"name"};
		# print "\n";
		# }
		}

		return $cases;