diff options
| -rw-r--r-- | Makefile.am | 39 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 12 |
2 files changed, 23 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am index 3f17cbe797d..eb81344acb6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -120,53 +120,36 @@ tags: test: cd mysql-test ; \ - ./mysql-test-run --mysqld=--binlog-format=statement && \ - ./mysql-test-run --ps-protocol --mysqld=--binlog-format=row - -test-full: - cd mysql-test ; \ - ./mysql-test-run --mysqld=--binlog-format=statement && \ - ./mysql-test-run --ps-protocol --mysqld=--binlog-format=statement && \ - ./mysql-test-run --mysqld=--binlog-format=row && \ - ./mysql-test-run --ps-protocol --mysqld=--binlog-format=row - -test-force: - cd mysql-test ; \ - ./mysql-test-run --force --mysqld=--binlog-format=statement && \ - ./mysql-test-run --ps-protocol --force --mysqld=--binlog-format=row - -test-force-full: - cd mysql-test ; \ - ./mysql-test-run --force --mysqld=--binlog-format=statement && \ - ./mysql-test-run --force --ps-protocol --mysqld=--binlog-format=statement && \ - ./mysql-test-run --force --mysqld=--binlog-format=row && \ - ./mysql-test-run --force --ps-protocol --mysqld=--binlog-format=row - -# We are testing a new Perl version of the test script -test-pl: - cd mysql-test ; \ ./mysql-test-run.pl --mysqld=--binlog-format=statement && \ ./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row -test-full-pl: +test-full: cd mysql-test ; \ ./mysql-test-run.pl --mysqld=--binlog-format=statement && \ ./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=statement && \ ./mysql-test-run.pl --mysqld=--binlog-format=row && \ ./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row -test-force-pl: +test-force: cd mysql-test ; \ ./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \ ./mysql-test-run.pl --ps-protocol --force --mysqld=--binlog-format=row -test-force-full-pl: +test-force-full: cd mysql-test ; \ ./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \ ./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=statement && \ ./mysql-test-run.pl --force --mysqld=--binlog-format=row && \ ./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=row +# Keep these for a while +test-pl: test +test-full-pl: test-full +test-force-pl: test-force +test-force-full-pl: test-force-full + + + # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 4485d8ca073..7bc56e24f4b 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -7,6 +7,18 @@ # List of failed cases (--force) backported from 4.1 by Joerg # :-) + +echo "##################################################"; +echo "This script is deprecated and will soon be removed"; +echo "Use mysql-test-run.pl instead"; +echo "Now sleeping 20 seconds..."; +echo "##################################################"; +sleep 20; +echo "continuing"; +echo; + + + #++ # Access Definitions #-- |