From 28893f83f232d80563dbbfe7032a9bcdbeee49e2 Mon Sep 17 00:00:00 2001 From: "balasubramanian.kandasamy@oracle.com" <> Date: Thu, 28 Feb 2013 14:36:00 +0100 Subject: Updated mysql.spec.sh file for br16298542 --- support-files/mysql.spec.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'support-files/mysql.spec.sh') diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index bac22fc96a9..ab26a7b6b8f 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -286,11 +286,12 @@ documentation and the manual for more information. Summary: MySQL: a very fast and reliable SQL database server Group: Applications/Databases Requires: %{distro_requires} -Provides: msqlormysql MySQL MySQL-server -Conflicts: mysql mysql-server mysql-advanced mysql-server-advanced Obsoletes: MySQL MySQL-server +Obsoletes: mysql mysql-server mysql-advanced mysql-server-advanced Obsoletes: MySQL-server-classic MySQL-server-community MySQL-server-enterprise Obsoletes: MySQL-server-advanced MySQL-server-advanced-gpl MySQL-server-enterprise-gpl +Provides: msqlormysql MySQL MySQL-server +Provides: mysql %description -n MySQL-server%{product_suffix} The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, @@ -320,11 +321,12 @@ package "MySQL-client%{product_suffix}" as well! %package -n MySQL-client%{product_suffix} Summary: MySQL - Client Group: Applications/Databases -Provides: MySQL-client -Conflicts: mysql mysql-advanced +Obsoletes: mysql mysql-advanced Obsoletes: MySQL-client Obsoletes: MySQL-client-classic MySQL-client-community MySQL-client-enterprise Obsoletes: MySQL-client-advanced MySQL-client-advanced-gpl MySQL-client-enterprise-gpl +Provides: MySQL-client +Provides: mysql %description -n MySQL-client%{product_suffix} This package contains the standard MySQL clients and administration tools. @@ -336,12 +338,12 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ Summary: MySQL - Test suite Group: Applications/Databases Requires: MySQL-client perl -Provides: MySQL-test Conflicts: mysql-test mysql-test-advanced Obsoletes: 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 +Provides: MySQL-test AutoReqProv: no %description -n MySQL-test%{product_suffix} @@ -353,11 +355,11 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ %package -n MySQL-devel%{product_suffix} Summary: MySQL - Development header files and libraries Group: Applications/Databases -Provides: MySQL-devel Conflicts: mysql-devel mysql-embedded-devel mysql-devel-advanced mysql-embedded-devel-advanced Obsoletes: MySQL-devel Obsoletes: MySQL-devel-classic MySQL-devel-community MySQL-devel-enterprise Obsoletes: MySQL-devel-advanced MySQL-devel-advanced-gpl MySQL-devel-enterprise-gpl +Provides: MySQL-devel %description -n MySQL-devel%{product_suffix} This package contains the development header files and libraries necessary @@ -369,12 +371,12 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ %package -n MySQL-shared%{product_suffix} Summary: MySQL - Shared libraries Group: Applications/Databases -Provides: MySQL-shared Obsoletes: 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 +Provides: MySQL-shared %description -n MySQL-shared%{product_suffix} This package contains the shared libraries (*.so*) which certain languages @@ -385,12 +387,12 @@ and applications need to dynamically load and use MySQL. Summary: MySQL - Embedded library Group: Applications/Databases Requires: MySQL-devel -Provides: MySQL-embedded Conflicts: mysql-embedded mysql-embedded-advanced Obsoletes: 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 +Provides: MySQL-embedded %description -n MySQL-embedded%{product_suffix} This package contains the MySQL server as an embedded library. -- cgit v1.2.1 From 349d3efabb26c76a18b9e0211fa4a892a23cd87d Mon Sep 17 00:00:00 2001 From: "balasubramanian.kandasamy@oracle.com" <> Date: Thu, 28 Feb 2013 14:49:54 +0100 Subject: Updated release number in mysql.spec.sh file for br16298542 --- support-files/mysql.spec.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'support-files/mysql.spec.sh') diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index ab26a7b6b8f..3a63e7082f6 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -30,7 +30,7 @@ %define mysqld_group mysql %define mysqldatadir /var/lib/mysql -%define release 1 +%define release 2 # # Macros we use which are not available in all supported versions of RPM -- cgit v1.2.1 From 7819ad7fbbfd5085991c90111cd0f4c2aaddd265 Mon Sep 17 00:00:00 2001 From: <> Date: Fri, 1 Mar 2013 14:11:24 +0100 Subject: Updated mysql.spec.sh file for br16298542 --- support-files/mysql.spec.sh | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'support-files/mysql.spec.sh') diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 3a63e7082f6..226ff5d0dfc 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -286,10 +286,9 @@ documentation and the manual for more information. Summary: MySQL: a very fast and reliable SQL database server Group: Applications/Databases Requires: %{distro_requires} -Obsoletes: MySQL MySQL-server Obsoletes: mysql mysql-server mysql-advanced mysql-server-advanced Obsoletes: MySQL-server-classic MySQL-server-community MySQL-server-enterprise -Obsoletes: MySQL-server-advanced MySQL-server-advanced-gpl MySQL-server-enterprise-gpl +Obsoletes: MySQL-server-advanced-gpl MySQL-server-enterprise-gpl Provides: msqlormysql MySQL MySQL-server Provides: mysql @@ -322,9 +321,8 @@ package "MySQL-client%{product_suffix}" as well! Summary: MySQL - Client Group: Applications/Databases Obsoletes: mysql mysql-advanced -Obsoletes: MySQL-client Obsoletes: MySQL-client-classic MySQL-client-community MySQL-client-enterprise -Obsoletes: MySQL-client-advanced MySQL-client-advanced-gpl MySQL-client-enterprise-gpl +Obsoletes: MySQL-client-advanced-gpl MySQL-client-enterprise-gpl Provides: MySQL-client Provides: mysql @@ -339,10 +337,9 @@ Summary: MySQL - Test suite Group: Applications/Databases Requires: MySQL-client perl Conflicts: mysql-test mysql-test-advanced -Obsoletes: 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 +Obsoletes: MySQL-test-advanced-gpl MySQL-test-enterprise-gpl Provides: MySQL-test AutoReqProv: no @@ -356,9 +353,8 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ Summary: MySQL - Development header files and libraries Group: Applications/Databases Conflicts: mysql-devel mysql-embedded-devel mysql-devel-advanced mysql-embedded-devel-advanced -Obsoletes: MySQL-devel Obsoletes: MySQL-devel-classic MySQL-devel-community MySQL-devel-enterprise -Obsoletes: MySQL-devel-advanced MySQL-devel-advanced-gpl MySQL-devel-enterprise-gpl +Obsoletes: MySQL-devel-advanced-gpl MySQL-devel-enterprise-gpl Provides: MySQL-devel %description -n MySQL-devel%{product_suffix} @@ -373,9 +369,9 @@ Summary: MySQL - Shared libraries Group: Applications/Databases Obsoletes: 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-pro-gpl-cert Obsoletes: MySQL-shared-classic MySQL-shared-community MySQL-shared-enterprise -Obsoletes: MySQL-shared-advanced MySQL-shared-advanced-gpl MySQL-shared-enterprise-gpl +Obsoletes: MySQL-shared-advanced-gpl MySQL-shared-enterprise-gpl Provides: MySQL-shared %description -n MySQL-shared%{product_suffix} @@ -388,10 +384,9 @@ Summary: MySQL - Embedded library Group: Applications/Databases Requires: MySQL-devel Conflicts: mysql-embedded mysql-embedded-advanced -Obsoletes: 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 +Obsoletes: MySQL-embedded-advanced-gpl MySQL-embedded-enterprise-gpl Provides: MySQL-embedded %description -n MySQL-embedded%{product_suffix} -- cgit v1.2.1 From f0de58fad5ad0b5e9ea9222a076df83f47e592b2 Mon Sep 17 00:00:00 2001 From: Balasubramanian Kandasamy Date: Tue, 5 Mar 2013 16:16:34 +0100 Subject: Updated Code for Bug#16235828 --- support-files/mysql.spec.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'support-files/mysql.spec.sh') diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 226ff5d0dfc..b64796fa4ea 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -716,13 +716,16 @@ if [ -d $mysql_datadir ] ; then echo "MySQL RPM upgrade to version $NEW_VERSION" > $STATUS_FILE echo "'pre' step running at `date`" >> $STATUS_FILE echo >> $STATUS_FILE - echo "ERR file(s):" >> $STATUS_FILE - ls -ltr $mysql_datadir/*.err >> $STATUS_FILE - echo >> $STATUS_FILE - echo "Latest 'Version' line in latest file:" >> $STATUS_FILE - grep '^Version' `ls -tr $mysql_datadir/*.err | tail -1` | \ + fcount=`ls -ltr $mysql_datadir/*.err 2>/dev/null | wc -l` + if [ $fcount -gt 0 ] ; then + echo "ERR file(s):" >> $STATUS_FILE + ls -ltr $mysql_datadir/*.err >> $STATUS_FILE + echo >> $STATUS_FILE + echo "Latest 'Version' line in latest file:" >> $STATUS_FILE + grep '^Version' `ls -tr $mysql_datadir/*.err | tail -1` | \ tail -1 >> $STATUS_FILE - echo >> $STATUS_FILE + echo >> $STATUS_FILE + fi if [ -n "$SERVER_TO_START" ] ; then # There is only one PID file, race possibility ignored -- cgit v1.2.1