diff options
| author | unknown <istruewing@chilla.local> | 2007-02-03 09:43:38 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-02-03 09:43:38 +0100 |
| commit | 9e01ae9f2ce8fc20ee0d969f2fffcef1bca134b1 (patch) | |
| tree | 5110ccf005cc6b9218ae7219ab94f430c2705b4f /support-files/mysql.spec.sh | |
| parent | 4df381fdbe271dbee18ed84b5f041c73ad2c8953 (diff) | |
| parent | 13390debf6aa979ca31437d687eaa9ae2740ad2f (diff) | |
| download | mariadb-git-9e01ae9f2ce8fc20ee0d969f2fffcef1bca134b1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into chilla.local:/home/mydev/mysql-5.1-axmrg
BUILD/SETUP.sh:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
Auto merged
BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
Auto merged
BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
Auto merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
Auto merged
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/Makefile.am:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Manual merged
support-files/mysql.spec.sh:
Manual merged
Diffstat (limited to 'support-files/mysql.spec.sh')
| -rw-r--r-- | support-files/mysql.spec.sh | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 893baba178b..9d64fe444ad 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -337,8 +337,9 @@ 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 ; \ - MTR_BUILD_THREAD=auto ; export MTR_BUILD_THREAD ; \ ./mysql-test-run.pl --comment=debug --skip-rpl --skip-ndbcluster --force --report-features ; \ true) @@ -369,9 +370,9 @@ 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 -MTR_BUILD_THREAD=auto -export MTR_BUILD_THREAD ./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 @@ -717,10 +718,6 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog -* Wed Jan 31 2007 Daniel Fischer <df@mysql.com> - -- add MTR_BUILD_THREAD=auto to test runs. - * Fri Jan 05 2007 Kent Boortz <kent@mysql.com> - Put back "libmygcc.a", found no real reason it was removed. @@ -738,17 +735,17 @@ fi in the server RPM. - The "mysqlmanager" man page got moved from section 1 to 8. +* Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com> + +- Call "make install" using "benchdir_root=%{_datadir}", + because that is affecting the regression test suite as well. + * Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com> - Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading (bug#22081). -* Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com> - -- Call "make install" using "benchdir_root=%{_datadir}", - because that is affecting the regression test suite as well. - * Mon Nov 13 2006 Joerg Bruehe <joerg@mysql.com> - Add "--with-partition" to all server builds. |