diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-23 11:57:18 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-23 11:57:18 +0100 |
| commit | df333b1ffe189b1338203abf08e6004b86e058d1 (patch) | |
| tree | ad3c14184035e87aace55f5636f58f39196da558 /support-files | |
| parent | 3fff19bfe3e40efb736eb63848683d6c4da2f6fe (diff) | |
| parent | 6351280267ed0f911d099493520e027b811323c0 (diff) | |
| download | mariadb-git-df333b1ffe189b1338203abf08e6004b86e058d1.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysql_upgrade.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql-common/my_time.c:
Auto merged
sql/item_timefunc.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Merge
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index eefc4f55d35..6000773144c 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -194,6 +194,8 @@ necessary to develop MySQL client applications. %package shared Summary: MySQL - Shared libraries Group: Applications/Databases +Provides: mysql-shared +Obsoletes: mysql-shared %description shared This package contains the shared libraries (*.so*) which certain @@ -342,7 +344,10 @@ then cp -fp config.log "$MYSQL_MAXCONFLOG_DEST" fi -make -i test-force-pl || true +( cd mysql-test + perl ./mysql-test-run.pl --force --report-features + perl ./mysql-test-run.pl --force --ps-protocol + true ) # Save mysqld-max ./libtool --mode=execute cp sql/mysqld sql/mysqld-max @@ -401,7 +406,10 @@ then cp -fp config.log "$MYSQL_CONFLOG_DEST" fi -make -i test-force-pl || true +( cd mysql-test + perl ./mysql-test-run.pl --force --report-features + perl ./mysql-test-run.pl --force --ps-protocol + true ) %install RBR=$RPM_BUILD_ROOT @@ -745,6 +753,17 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* 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). + +* Wed Nov 15 2006 Joerg Bruehe <joerg@mysql.com> + +- Switch from "make test*" to explicit calls of the test suite, + so that "report features" can be used. + * Mon Jul 10 2006 Joerg Bruehe <joerg@mysql.com> - Fix a typing error in the "make" target for the Perl script to run the tests. |