diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-03-28 23:08:00 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-03-28 23:08:00 +0200 |
| commit | f2e8355d27748c3fed3b4562cc357825d9910317 (patch) | |
| tree | 4c3aa8ce9f94908db01e0a1f2cc92620f3783d0d /support-files | |
| parent | 5d3b8266b8d9fab8ee0981c885d88b41e969b106 (diff) | |
| parent | 406fd12ad42268b42631c27772a292d5787ff0a4 (diff) | |
| download | mariadb-git-f2e8355d27748c3fed3b4562cc357825d9910317.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
Makefile.am:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
BitKeeper/deleted/.del-README~1:
Auto merged
BitKeeper/deleted/.del-configure.js:
Auto merged
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 0671bd8a58c..1bdab2495c2 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -337,11 +337,7 @@ then cp -fp mysql-debug-%{mysql_version}/config.log "$MYSQL_DEBUGCONFLOG_DEST" fi - MTR_BUILD_THREAD=auto - export MTR_BUILD_THREAD -(cd mysql-debug-%{mysql_version}/mysql-test ; \ - ./mysql-test-run.pl --comment=debug --skip-rpl --skip-ndbcluster --force --report-features ; \ - true) +(cd mysql-debug-%{mysql_version} ; make test-bt-debug) ############################################################################## # @@ -370,15 +366,7 @@ then cp -fp mysql-release-%{mysql_version}/config.log "$MYSQL_CONFLOG_DEST" fi - MTR_BUILD_THREAD=auto - export MTR_BUILD_THREAD -cd mysql-release-%{mysql_version}/mysql-test -./mysql-test-run.pl --comment=normal --force --skip-ndbcluster --timer --report-features || true -./mysql-test-run.pl --comment=ps --ps-protocol --force --skip-ndbcluster --timer || true -./mysql-test-run.pl --comment=normal+rowrepl --mysqld=--binlog-format=row --force --skip-ndbcluster --timer || true -./mysql-test-run.pl --comment=ps+rowrepl+NDB --ps-protocol --mysqld=--binlog-format=row --force --timer || true -./mysql-test-run.pl --comment=NDB --with-ndbcluster-only --force --timer || true -cd ../.. +(cd mysql-release-%{mysql_version} ; make test-bt) ############################################################################## |