diff options
author | murthy.narkedimilli@oracle.com <> | 2014-05-29 09:34:50 +0200 |
---|---|---|
committer | Murthy Narkedimilli <murthy.narkedimilli@oracle.com> | 2014-05-29 09:34:50 +0200 |
commit | c5c1cbc4d612b7491c5947838f2e109edf05ab4d (patch) | |
tree | 087e9c2e6d8de2826da0e59cd7cb685e76f85e5c | |
parent | a4d12749df38b6b836997201e89295fadfe09f0b (diff) | |
parent | d4b316108549e09d61e183a8969f86d81a97060f (diff) | |
download | mariadb-git-c5c1cbc4d612b7491c5947838f2e109edf05ab4d.tar.gz |
Merge from mysql-5.5.38-release
-rw-r--r-- | packaging/rpm-oel/mysql.spec.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index 959bcc0e3e3..d28e89b4216 100644 --- a/packaging/rpm-oel/mysql.spec.in +++ b/packaging/rpm-oel/mysql.spec.in @@ -85,7 +85,7 @@ Name: mysql-%{product_suffix} Summary: A very fast and reliable SQL database server Group: Applications/Databases Version: @VERSION@ -Release: 1%{?commercial:.1}%{?dist} +Release: 2%{?commercial:.1}%{?dist} License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field. Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz URL: http://www.mysql.com/ @@ -881,6 +881,9 @@ fi %endif %changelog +* Sun May 11 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.38-2 +- Increment release version to resolve upgrade conflict issue + * Thu Apr 24 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.38-1 - Updated for 5.5.38 |