bzr push into mysql-5.0 branch (df:2729 to 2730) Bug#42888

[Daniel Fischer]

 2730 Daniel Fischer	2009-05-12 [merge]
      merge bug#42888

    added:
      mysql-test/collections/
      mysql-test/collections/README
      mysql-test/collections/default.daily
      mysql-test/collections/default.push
      mysql-test/collections/default.weekly
    modified:
      mysql-test/Makefile.am
 2729 Kent Boortz	2009-05-09
      Use /usr/bin/perl as standard Perl install path (bug#44643)

    modified:
      scripts/mysql_find_rows.sh
      scripts/mysql_fix_extensions.sh
      scripts/mysql_setpermission.sh
      scripts/mysql_zap.sh
      scripts/mysqlaccess.sh
      sql-bench/as3ap.sh
      sql-bench/bench-count-distinct.sh
      sql-bench/bench-init.pl.sh
      sql-bench/compare-results.sh
      sql-bench/copy-db.sh
      sql-bench/crash-me.sh
      sql-bench/innotest1.sh
      sql-bench/innotest1a.sh
      sql-bench/innotest1b.sh
      sql-bench/innotest2.sh
      sql-bench/innotest2a.sh
      sql-bench/innotest2b.sh
      sql-bench/run-all-tests.sh
      sql-bench/server-cfg.sh
      sql-bench/test-ATIS.sh
      sql-bench/test-alter-table.sh
      sql-bench/test-big-tables.sh
      sql-bench/test-connect.sh
      sql-bench/test-create.sh
      sql-bench/test-insert.sh
      sql-bench/test-select.sh
      sql-bench/test-transactions.sh
      sql-bench/test-wisconsin.sh
=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am	2008-06-17 07:31:29 +0000
+++ b/mysql-test/Makefile.am	2009-02-24 13:54:04 +0000
@@ -33,7 +33,7 @@ endif
 benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test
 EXTRA_SCRIPTS = 	mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
-EXTRA_DIST = 		$(EXTRA_SCRIPTS) suite
+EXTRA_DIST = 		$(EXTRA_SCRIPTS) suite collections
 GENSCRIPTS =		mysql-test-run-shell mysql-test-run install_test_db mtr
 PRESCRIPTS =		mysql-test-run.pl mysql-stress-test.pl
 test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)
@@ -80,6 +80,7 @@ install-data-local:
 		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_be \
 		$(DESTDIR)$(testdir)/std_data/ndb_backup50_data_le \
 		$(DESTDIR)$(testdir)/lib \
+                $(DESTDIR)$(testdir)/collections \
 		$(DESTDIR)$(testdir)/std_data/funcs_1
 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
 	-$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t

=== added directory 'mysql-test/collections'
=== added file 'mysql-test/collections/README'
--- a/mysql-test/collections/README	1970-01-01 00:00:00 +0000
+++ b/mysql-test/collections/README	2009-02-24 10:42:11 +0000
@@ -0,0 +1,30 @@
+This directory contains collections of test runs that we run during our
+integration and release testing. Each file contains zero or more lines,
+with one invocation of mysql-test-run.pl on each. These invocations are
+written so that, with the assumption that perl is in your search path,
+any collection can run as a shell script or a batch file, with the parent
+mysql-test directory being the current working directory.
+
+During integration testing, we choose the collection to run by following
+these steps:
+
+1) We choose the extension to look for, based on these rules:
+   - If we're running a per-push test, we choose ".push" as the extension.
+   - If we're running a daily test, we choose ".daily" as the extension.
+   - If we're running a weekly test, we choose ".weekly" as the extension.
+
+2) If there is a collection that has the same name as the branch we're
+   testing plus the extension as determined in step 1, we choose that
+   collection.
+
+3) If the branch is unknown or we have removed all characters from it
+   and still not found a matching collection, we choose the name "default"
+   plus the extension determined in step 1. If there is no such file,
+   we give up and don't test anything at all.
+
+4) If we haven't found a collection yet, we remove the last character from 
+   the branch name and go back to step 2.
+
+5) The commands from the collection are run line by line via execv() or
+   similar system calls. They are not run as a shell script. Shell 
+   expansions are not guaranteed to work and most likely won't.

=== added file 'mysql-test/collections/default.daily'

=== added file 'mysql-test/collections/default.push'
--- a/mysql-test/collections/default.push	1970-01-01 00:00:00 +0000
+++ b/mysql-test/collections/default.push	2009-02-24 10:42:11 +0000
@@ -0,0 +1,2 @@
+perl mysql-test-run.pl --timer --force --comment=n_stm
+perl mysql-test-run.pl --timer --force --comment=ps_stm --ps-protocol

=== added file 'mysql-test/collections/default.weekly'


Attachment: [text/bzr-bundle] bzr/[e-mail]