Merge bk-internal.mysql.com:/home/bk/mysql-5.0 (991ad10d) · Commits · Software / OSDI20 Artifacts / mariadb

config/ac-macros/misc.m4

+29 −0

Original line number	Diff line number	Diff line
		@@ -737,3 +737,32 @@ then
		fi
		AC_SUBST(CXX_VERSION)
		])

		AC_DEFUN([MYSQL_PROG_AR], [
		AC_REQUIRE([MYSQL_CHECK_CXX_VERSION])
		case $CXX_VERSION in
		MIPSpro*)
		AR=$CXX
		ARFLAGS="-ar -o"
		;;
		Forte)
		AR=$CXX
		ARFLAGS="-xar -o"
		;;
		*)
		if test -z "$AR"
		then
		AC_CHECK_PROG([AR], [ar], [ar])
		fi
		if test -z "$AR"
		then
		AC_MSG_ERROR([You need ar to build the library])
		fi
		if test -z "$ARFLAGS"
		then
		ARFLAGS="cru"
		fi
		esac
		AC_SUBST(AR)
		AC_SUBST(ARFLAGS)
		])

configure.in

+1 −9

Original line number	Diff line number	Diff line
		@@ -354,15 +354,7 @@ then
		[1], [Defined by configure. Use explicit template instantiation.])
		fi

		case $CXX_VERSION in
		MIPSpro*)
		AR=$CXX
		ARFLAGS="-ar -o"
		;;
		Forte)
		AR=$CXX
		ARFLAGS="-xar -o"
		esac
		MYSQL_PROG_AR

		# Avoid bug in fcntl on some versions of linux
		AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os")

mysql-test/lib/mtr_cases.pl

+8 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,14 @@ sub collect_one_test_case($$$$$) {
		}
		}

		if ( defined mtr_match_prefix($tname,"federated") )
		{
		$tinfo->{'slave_num'}= 1; # Default, use one slave

		# FIXME currently we always restart slaves
		$tinfo->{'slave_restart'}= 1;
		}

		# FIXME what about embedded_server + ndbcluster, skip ?!

		my $master_opt_file= "$testdir/$tname-master.opt";

mysql-test/mysql-test-run.pl

+13 −5

Original line number	Diff line number	Diff line
		@@ -772,7 +772,8 @@ sub executable_setup () {
		{
		if ( $glob_win32 )
		{
		$path_client_bindir= mtr_path_exists("$glob_basedir/client_release");
		$path_client_bindir= mtr_path_exists("$glob_basedir/client_release",
		"$glob_basedir/bin");
		$exe_mysqld= mtr_exe_exists ("$path_client_bindir/mysqld-nt");
		$path_language= mtr_path_exists("$glob_basedir/share/english/");
		$path_charsetsdir= mtr_path_exists("$glob_basedir/share/charsets");
		@@ -794,7 +795,7 @@ sub executable_setup () {
		}
		else
		{
		$exe_mysqltest= mtr_exe_exists("$glob_basedir/client/mysqltest");
		$exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest");
		$exe_mysql_client_test=
		mtr_exe_exists("$glob_basedir/tests/mysql_client_test");
		}
		@@ -1993,7 +1994,7 @@ sub run_mysqltest ($$) {
		}

		my $cmdline_mysqlbinlog=
		"$exe_mysqlbinlog --no-defaults --local-load=$opt_tmpdir";
		"$exe_mysqlbinlog --no-defaults --local-load=$opt_tmpdir --character-sets-dir=$path_charsetsdir";

		if ( $opt_debug )
		{
		@@ -2011,6 +2012,14 @@ sub run_mysqltest ($$) {
		"--port=$master->[0]->{'path_myport'} " .
		"--socket=$master->[0]->{'path_mysock'}";

		if ( $glob_use_embedded_server )
		{
		$cmdline_mysql_client_test.=
		" -A --language=$path_language" .
		" -A --datadir=$slave->[0]->{'path_myddir'}" .
		" -A --character-sets-dir=$path_charsetsdir";
		}

		my $cmdline_mysql_fix_system_tables=
		"$exe_mysql_fix_system_tables --no-defaults --host=localhost --user=root --password= " .
		"--basedir=$glob_basedir --bindir=$path_client_bindir --verbose " .
		@@ -2127,8 +2136,7 @@ sub run_mysqltest ($$) {
		#
		##############################################################################

		sub usage ($)
		{
		sub usage ($) {
		print STDERR <<HERE;

		mysql-test-run [ OPTIONS ] [ TESTCASE ]

mysql-test/r/index_merge.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -371,8 +371,8 @@ alter table t0 add filler1 char(200), add filler2 char(200), add filler3 char(20
		update t0 set key2=1, key3=1, key4=1, key5=1,key6=1,key7=1 where key7 < 500;
		explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
		from t0 as A, t0 as B
		where (A.key1 = 1 and A.key2 = 1 and A.key3 = 1 and A.key4=1 and A.key5=1 and A.key6=1 and A.key# = 1 or A.key8=1)
		and (B.key1 = 1 and B.key2 = 1 and B.key3 = 1 and B.key4=1 and B.key5=1 and B.key6=1 and B.key# = 1 or B.key8=1);
		where (A.key1 = 1 and A.key2 = 1 and A.key3 = 1 and A.key4=1 and A.key5=1 and A.key6=1 and A.key7 = 1 or A.key8=1)
		and (B.key1 = 1 and B.key2 = 1 and B.key3 = 1 and B.key4=1 and B.key5=1 and B.key6=1 and B.key7 = 1 or B.key8=1);
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE A index_merge i1,i2,i3,i4,i5,i6,i7?,i8 i2,i3,i4,i5,i6,i7?,i8 X NULL # Using union(intersect(i2,i3,i4,i5,i6,i7?),i8); Using where
		1 SIMPLE B index_merge i1,i2,i3,i4,i5,i6,i7?,i8 i2,i3,i4,i5,i6,i7?,i8 X NULL # Using union(intersect(i2,i3,i4,i5,i6,i7?),i8); Using where