diff options
author | unknown <joerg@trift2.> | 2007-07-17 21:11:22 +0200 |
---|---|---|
committer | unknown <joerg@trift2.> | 2007-07-17 21:11:22 +0200 |
commit | 0b0277b47a99a29bc0ac9ee8bf428081359731b5 (patch) | |
tree | 8e9fd900c2ee6c1017c62e3dd0762fbdbe094335 /scripts | |
parent | 035346fcff6070dae08c134094f7cd1be980492c (diff) | |
parent | 3ec7c63645f8b6111cef864718fb8c6dfc298b0f (diff) | |
download | mariadb-git-0b0277b47a99a29bc0ac9ee8bf428081359731b5.tar.gz |
Merge trift2.:/MySQL/M50/bug21023-25486-5.0
into trift2.:/MySQL/M51/bug21023-25486-5.1
mysql-test/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/Makefile.am:
SCCS merged
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/make_binary_distribution.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 201a922ee68..7a016670d67 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -301,7 +301,8 @@ rm -f $MYSQL_SHARE/Makefile* $MYSQL_SHARE/*/*.OLD copyfileto $BASE/mysql-test \ mysql-test/mysql-test-run mysql-test/install_test_db \ mysql-test/mysql-test-run.pl mysql-test/README \ - mysql-test/valgrind.supp \ + mysql-test/mysql-stress-test.pl \ + mysql-test/valgrind.supp \ netware/mysql_test_run.nlm netware/install_test_db.ncf MCP mysql-test/lib/*.pl $BASE/mysql-test/lib |