3477 Joerg Bruehe 2011-10-04 [merge]
Upmerge of a merge changeset - empty.
3476 Joerg Bruehe 2011-10-04 [merge]
Merge to main.
modified:
support-files/mysql.spec.sh
3475 Tor Didriksen 2011-10-04
New test results after merge from opt-team
modified:
mysql-test/r/join_outer_bka_nixbnl.result
mysql-test/r/subquery_nomat_nosj_bka_nixbnl.result
mysql-test/r/subquery_none_bka_nixbnl.result
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh 2011-09-23 10:55:10 +0000
+++ b/support-files/mysql.spec.sh 2011-10-04 15:26:49 +0000
@@ -280,11 +280,12 @@ documentation and the manual for more in
##############################################################################
%package -n MySQL-server%{product_suffix}
-Summary: MySQL: a very fast and reliable SQL database server
-Group: Applications/Databases
-Requires: %{distro_requires}
-Provides: msqlormysql mysql-server mysql MySQL MySQL-server
-Obsoletes: MySQL mysql mysql-server MySQL-server MySQL-server-community
+Summary: MySQL: a very fast and reliable SQL database server
+Group: Applications/Databases
+Requires: %{distro_requires}
+Provides: msqlormysql mysql MySQL mysql-server MySQL-server
+Obsoletes: mysql MySQL mysql-server MySQL-server
+Obsoletes: MySQL-server-community MySQL-server-advanced
%description -n MySQL-server%{product_suffix}
The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
@@ -300,7 +301,7 @@ licenses from %{mysql_vendor} if you do
the GPL. See the chapter "Licensing and Support" in the manual for
further info.
-The MySQL web site (http://www.mysql.com/) provides the latest news and
+The MySQL web site (http://www.mysql.com/) provides the latest news and
information about the MySQL software. Also please see the documentation
and the manual for more information.
@@ -312,10 +313,11 @@ package "MySQL-client%{product_suffix}"
# ----------------------------------------------------------------------------
%package -n MySQL-client%{product_suffix}
-Summary: MySQL - Client
-Group: Applications/Databases
-Obsoletes: mysql-client MySQL-client MySQL-client-community
-Provides: mysql-client MySQL-client
+Summary: MySQL - Client
+Group: Applications/Databases
+Provides: mysql-client MySQL-client
+Obsoletes: mysql-client MySQL-client
+Obsoletes: MySQL-client-community MySQL-client-advanced
%description -n MySQL-client%{product_suffix}
This package contains the standard MySQL clients and administration tools.
@@ -324,12 +326,13 @@ For a description of MySQL see the base
# ----------------------------------------------------------------------------
%package -n MySQL-test%{product_suffix}
-Requires: MySQL-client%{product_suffix} perl
-Summary: MySQL - Test suite
-Group: Applications/Databases
-Provides: mysql-test
-Obsoletes: mysql-bench mysql-test MySQL-test-community
-AutoReqProv: no
+Summary: MySQL - Test suite
+Group: Applications/Databases
+Requires: MySQL-client perl
+Provides: mysql-test MySQL-test
+Obsoletes: mysql-test MySQL-test
+Obsoletes: MySQL-test-community MySQL-test-advanced
+AutoReqProv: no
%description -n MySQL-test%{product_suffix}
This package contains the MySQL regression test suite.
@@ -338,10 +341,11 @@ For a description of MySQL see the base
# ----------------------------------------------------------------------------
%package -n MySQL-devel%{product_suffix}
-Summary: MySQL - Development header files and libraries
-Group: Applications/Databases
-Provides: mysql-devel
-Obsoletes: mysql-devel MySQL-devel-community
+Summary: MySQL - Development header files and libraries
+Group: Applications/Databases
+Provides: mysql-devel MySQL-devel
+Obsoletes: mysql-devel MySQL-devel
+Obsoletes: MySQL-devel-community MySQL-devel-advanced
%description -n MySQL-devel%{product_suffix}
This package contains the development header files and libraries necessary
@@ -351,10 +355,11 @@ For a description of MySQL see the base
# ----------------------------------------------------------------------------
%package -n MySQL-shared%{product_suffix}
-Summary: MySQL - Shared libraries
-Group: Applications/Databases
-Provides: mysql-shared
-Obsoletes: MySQL-shared-community
+Summary: MySQL - Shared libraries
+Group: Applications/Databases
+Provides: mysql-shared MySQL-shared
+Obsoletes: mysql-shared MySQL-shared
+Obsoletes: MySQL-shared-community MySQL-shared-advanced
%description -n MySQL-shared%{product_suffix}
This package contains the shared libraries (*.so*) which certain languages
@@ -362,10 +367,12 @@ and applications need to dynamically loa
# ----------------------------------------------------------------------------
%package -n MySQL-embedded%{product_suffix}
-Summary: MySQL - embedded library
-Group: Applications/Databases
-Requires: MySQL-devel%{product_suffix}
-Obsoletes: mysql-embedded MySQL-embedded-community
+Summary: MySQL - Embedded library
+Group: Applications/Databases
+Requires: MySQL-devel
+Provides: mysql-embedded MySQL-embedded
+Obsoletes: mysql-embedded MySQL-embedded
+Obsoletes: MySQL-embedded-community MySQL-embedded-advanced
%description -n MySQL-embedded%{product_suffix}
This package contains the MySQL server as an embedded library.
@@ -1131,6 +1138,16 @@ echo "====="
# merging BK trees)
##############################################################################
%changelog
+* Wed Sep 14 2011 Joerg Bruehe <joerg.bruehe@stripped>
+
+- Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace
+ the RPMs of any configuration (of the current or the preceding release series)
+ by the new ones. This is done by not using the implicitly generated capabilities
+ (which include the configuration name) and relying on more generic ones which
+ just list the function ("server", "client", ...).
+ The implicit generation cannot be prevented, so all these capabilities must be
+ explicitly listed in "Obsoletes:"
+
* Tue Sep 13 2011 Jonathan Perkin <jonathan.perkin@stripped>
- Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6. Due to
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (joerg.bruehe:3475 to 3477) | Joerg Bruehe | 5 Oct |
