Commit fb1aab1a authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-4.1-maint 

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


mysql-test/mysql-test-run.pl:
  Manual merge of fix for location of mysql_client_test
parents f754fd25 178dddb5

Makefile.am

+6 −4
Original line number Diff line number Diff line
@@ -114,6 +114,12 @@ test-force: 
	./mysql-test-run --force && \

	./mysql-test-run --ps-protocol --force



test-force-mem:

	cd mysql-test; \

	./mysql-test-run --force --mem && \

	./mysql-test-run --ps-protocol --force --mem





# We are testing a new Perl version of the test script

test-pl:

	cd mysql-test; \
@@ -125,7 +131,3 @@ test-force-pl: 
	./mysql-test-run.pl --force && \

	./mysql-test-run.pl --ps-protocol --force

test-force-pl-mem:

	cd mysql-test; \

	./mysql-test-run.pl --force --mem && \

	./mysql-test-run.pl --ps-protocol --force --mem

include/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,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/Makefile.am

+15 −8
Original line number Diff line number Diff line
@@ -32,20 +32,22 @@ endif 


benchdir_root=		$(prefix)

testdir =	        $(benchdir_root)/mysql-test

EXTRA_SCRIPTS = 	mysql-test-run.sh install_test_db.sh $(PRESCRIPTS)

EXTRA_SCRIPTS = 	mysql-test-run-shell.sh install_test_db.sh \

			 $(PRESCRIPTS)

EXTRA_DIST = 		$(EXTRA_SCRIPTS)

GENSCRIPTS =		mysql-test-run install_test_db mtr

GENSCRIPTS =		mysql-test-run-shell 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 \

	std_data/server-cert.pem std_data/server-key.pem 

test_DATA = 		std_data/client-key.pem \

			std_data/client-cert.pem \

			std_data/cacert.pem \

			std_data/server-cert.pem \

			std_data/server-key.pem

CLEANFILES = 		$(GENSCRIPTS) $(test_DATA)



INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include -I..

EXTRA_PROGRAMS =	mysql_test_run_new

noinst_HEADERS =	my_manage.h

mysql_test_run_new_SOURCES=		mysql_test_run_new.c my_manage.c my_create_tables.c



noinst_HEADERS =	my_manage.h



dist-hook:

	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \
@@ -110,6 +112,11 @@ mtr: 
	$(RM) -f mtr

	$(LN_S) mysql-test-run.pl mtr



# mysql-test-run - a shortcut for executing mysql-test-run.pl

mysql-test-run:

	$(RM) -f mysql-test-run

	$(LN_S) mysql-test-run.pl mysql-test-run



SUFFIXES = .sh



.sh:

mysql-test/mysql-test-run.pl

+8 −7
Original line number Diff line number Diff line
@@ -597,7 +597,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,
@@ -1320,7 +1320,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 "");

}
@@ -1472,7 +1473,7 @@ sub executable_setup () { 
    $exe_mysql_client_test=

      mtr_exe_maybe_exists(vs_config_dirs('tests', 'mysql_client_test'),

                           "$glob_basedir/tests/mysql_client_test",

                           "$glob_basedir/bin");

                           "$glob_basedir/bin/mysql_client_test");

  }

}
@@ -3053,7 +3054,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);
@@ -4646,9 +4647,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]