From: Joerg Bruehe Date: October 4 2011 3:29pm Subject: bzr push into mysql-5.5 branch (joerg.bruehe:3563 to 3565) List-Archive: http://lists.mysql.com/commits/141322 Message-Id: <201110041529.p94FTNrq017044@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3565 Joerg Bruehe 2011-10-04 [merge] Upmerge of a merge changeset - empty. 3564 Joerg Bruehe 2011-10-04 [merge] Merge to main. modified: support-files/mysql.spec.sh 3563 Rohit Kalhans 2011-10-03 BUG#11758262 BUG#13043055: Fix for commit_1innodb failure on pb2. Background: as status increment differs for an unsafe statement when logged in stmt and row format, mtr throws a content mismatch error. Fix: call p_verify_status_increment with different arguments for loging format as stmt and row/mixed and disable query log. modified: mysql-test/include/commit.inc mysql-test/r/commit_1innodb.result === modified file 'support-files/mysql.spec.sh' --- a/support-files/mysql.spec.sh 2011-09-21 10:40:41 +0000 +++ b/support-files/mysql.spec.sh 2011-10-04 15:17:17 +0000 @@ -280,11 +280,13 @@ 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-classic MySQL-server-community MySQL-server-enterprise +Obsoletes: MySQL-server-advanced MySQL-server-advanced-gpl MySQL-server-enterprise-gpl %description -n MySQL-server%{product_suffix} The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, @@ -312,10 +314,12 @@ 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-classic MySQL-client-community MySQL-client-enterprise +Obsoletes: MySQL-client-advanced MySQL-client-advanced-gpl MySQL-client-enterprise-gpl %description -n MySQL-client%{product_suffix} This package contains the standard MySQL clients and administration tools. @@ -324,12 +328,15 @@ 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-bench MySQL-bench +Obsoletes: MySQL-test-classic MySQL-test-community MySQL-test-enterprise +Obsoletes: MySQL-test-advanced MySQL-test-advanced-gpl MySQL-test-enterprise-gpl +AutoReqProv: no %description -n MySQL-test%{product_suffix} This package contains the MySQL regression test suite. @@ -338,10 +345,12 @@ 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-classic MySQL-devel-community MySQL-devel-enterprise +Obsoletes: MySQL-devel-advanced MySQL-devel-advanced-gpl MySQL-devel-enterprise-gpl %description -n MySQL-devel%{product_suffix} This package contains the development header files and libraries necessary @@ -351,10 +360,14 @@ 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-standard MySQL-shared-pro +Obsoletes: MySQL-shared-pro-cert MySQL-shared-pro-gpl +Obsoletes: MySQL-shared-pro-gpl-cert MySQL-shared +Obsoletes: MySQL-shared-classic MySQL-shared-community MySQL-shared-enterprise +Obsoletes: MySQL-shared-advanced MySQL-shared-advanced-gpl MySQL-shared-enterprise-gpl %description -n MySQL-shared%{product_suffix} This package contains the shared libraries (*.so*) which certain languages @@ -362,10 +375,14 @@ 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-pro +Obsoletes: MySQL-embedded-classic MySQL-embedded-community MySQL-embedded-enterprise +Obsoletes: MySQL-embedded-advanced MySQL-embedded-advanced-gpl MySQL-embedded-enterprise-gpl %description -n MySQL-embedded%{product_suffix} This package contains the MySQL server as an embedded library. @@ -1131,6 +1148,16 @@ echo "=====" # merging BK trees) ############################################################################## %changelog +* Wed Sep 14 2011 Joerg Bruehe + +- 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 - Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6. Due to No bundle (reason: useless for push emails).