Commit 5900506c authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint-mysql_upgrade 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/deleted/.del-abi_check.ic:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge
parents 8c598f60 e5d88949

include/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \ 
	if [ @ICHECK@ != no ] ; then \

	  @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \

	  @ICHECK@ --compare mysql_h.ic $@.ic; \

	  $(RM) -f $@.ic; \

	fi; \

	touch abi_check;

mysql-test/mysql-test-run.pl

+7 −6
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ sub command_line_setup () { 
             'tmpdir=s'                 => \$opt_tmpdir,

             'vardir=s'                 => \$opt_vardir,

             'benchdir=s'               => \$glob_mysql_bench_dir,

             'mem:s'                    => \$opt_mem,

             'mem'                      => \$opt_mem,



             # Misc

             'comment=s'                => \$opt_comment,
@@ -1316,7 +1316,8 @@ sub executable_setup_im () { 
  $exe_im=

    mtr_exe_maybe_exists(

      "$glob_basedir/server-tools/instance-manager/mysqlmanager",

      "$glob_basedir/libexec/mysqlmanager");

      "$glob_basedir/libexec/mysqlmanager",

      "$glob_basedir/bin/mysqlmanager");



  return ($exe_im eq "");

}
@@ -3098,7 +3099,7 @@ sub run_testcase ($) { 
  # -------------------------------------------------------



  $ENV{'TZ'}= $tinfo->{'timezone'};

  mtr_verbose("Starting server with timezone: $tinfo->{'timezone'}");

  mtr_verbose("Setting timezone: $tinfo->{'timezone'}");



  my $master_restart= run_testcase_need_master_restart($tinfo);

  my $slave_restart= run_testcase_need_slave_restart($tinfo);
@@ -4691,9 +4692,9 @@ Options to control directories to use 
  vardir=DIR            The directory where files generated from the test run

                        is stored (default: ./var). Specifying a ramdisk or

                        tmpfs will speed up tests.

  mem[=DIR]             Run testsuite in "memory" using tmpfs or ramdisk

                        Attempts to use DIR first if specified else

                        uses as builtin list of standard locations

  mem                   Run testsuite in "memory" using tmpfs or ramdisk

                        Attempts to find a suitable location

                        using a builtin list of standard locations

                        for tmpfs (/dev/shm)

                        The option can also be set using environment

                        variable MTR_MEM=[DIR]