diff options
| author | msvensson@neptunus.(none) <> | 2006-12-04 19:11:55 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-12-04 19:11:55 +0100 |
| commit | 971c783f7dd3a136693722f20a815b7171bbbcd8 (patch) | |
| tree | ac382a3e694ccbe7ed5a481331e35e4f055fdcae /support-files | |
| parent | 6072b7a4c4b786604b4584058c6c62a339b6d3ba (diff) | |
| parent | b70d2b9341ae804fbd5147500a4d29bd86e2a5d6 (diff) | |
| download | mariadb-git-971c783f7dd3a136693722f20a815b7171bbbcd8.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 2 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 459699988ab..b84ae85f524 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -82,7 +82,7 @@ datadir_set= # lsb_functions="/lib/lsb/init-functions" if test -f $lsb_functions ; then - source $lsb_functions + . $lsb_functions else log_success_msg() { diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 33e1cb4ae2d..c16282c6281 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -193,8 +193,6 @@ 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 @@ -689,17 +687,17 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog -* 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. |