Update to 5.6.25
This commit is contained in:
parent
c6553415d0
commit
a66d4b2b46
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@
|
||||
/mysql-5.6.22.tar.gz
|
||||
/mysql-5.6.23.tar.gz
|
||||
/mysql-5.6.24.tar.gz
|
||||
/mysql-5.6.25.tar.gz
|
||||
|
@ -1,60 +0,0 @@
|
||||
commit b377595b246be1de01c37f1d0269b5821e19b3fb
|
||||
Author: Tor Didriksen <tor.didriksen@oracle.com>
|
||||
Date: Wed Apr 8 16:53:55 2015 +0200
|
||||
|
||||
Bug#20768820 MAIN.BIGINT TEST FAILS WHEN BUILT WITH GCC 5 IN RELEASE BUILD
|
||||
|
||||
Problem: with gcc5 in optmized mode, (- LLONG_MIN ) yields integer overflow.
|
||||
Fix: In ull2dec() change the loop which counts the number of decimal_digit_t's
|
||||
(cherry picked from commit b37d8bcc24f82f8e15c5f6e2243c8937af74acb7)
|
||||
|
||||
diff --git a/strings/decimal.c b/strings/decimal.c
|
||||
index 0d47241..ccb4a6b 100644
|
||||
--- a/strings/decimal.c
|
||||
+++ b/strings/decimal.c
|
||||
@@ -1064,26 +1064,34 @@ int double2decimal(double from, decimal_t *to)
|
||||
|
||||
static int ull2dec(ulonglong from, decimal_t *to)
|
||||
{
|
||||
- int intg1, error=E_DEC_OK;
|
||||
- ulonglong x=from;
|
||||
+ int intg1;
|
||||
+ int error= E_DEC_OK;
|
||||
+ ulonglong x= from;
|
||||
dec1 *buf;
|
||||
|
||||
sanity(to);
|
||||
|
||||
- for (intg1=1; from >= DIG_BASE; intg1++, from/=DIG_BASE) ;
|
||||
+ if (from == 0)
|
||||
+ intg1= 1;
|
||||
+ else
|
||||
+ {
|
||||
+ /* Count the number of decimal_digit_t's we need. */
|
||||
+ for (intg1= 0; from != 0; intg1++, from/= DIG_BASE)
|
||||
+ ;
|
||||
+ }
|
||||
if (unlikely(intg1 > to->len))
|
||||
{
|
||||
- intg1=to->len;
|
||||
- error=E_DEC_OVERFLOW;
|
||||
+ intg1= to->len;
|
||||
+ error= E_DEC_OVERFLOW;
|
||||
}
|
||||
- to->frac=0;
|
||||
- to->intg=intg1*DIG_PER_DEC1;
|
||||
+ to->frac= 0;
|
||||
+ to->intg= intg1 * DIG_PER_DEC1;
|
||||
|
||||
- for (buf=to->buf+intg1; intg1; intg1--)
|
||||
+ for (buf= to->buf + intg1; intg1; intg1--)
|
||||
{
|
||||
- ulonglong y=x/DIG_BASE;
|
||||
- *--buf=(dec1)(x-y*DIG_BASE);
|
||||
- x=y;
|
||||
+ ulonglong y= x / DIG_BASE;
|
||||
+ *--buf=(dec1)(x - y * DIG_BASE);
|
||||
+ x= y;
|
||||
}
|
||||
return error;
|
||||
}
|
@ -77,8 +77,8 @@
|
||||
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
|
||||
Name: community-mysql
|
||||
Version: 5.6.24
|
||||
Release: 4%{?with_debug:.debug}%{?dist}
|
||||
Version: 5.6.25
|
||||
Release: 1%{?with_debug:.debug}%{?dist}
|
||||
Summary: MySQL client programs and shared libraries
|
||||
Group: Applications/Databases
|
||||
URL: http://www.mysql.com
|
||||
@ -119,7 +119,6 @@ Patch7: %{pkgnamepatch}-dh1024.patch
|
||||
Patch8: %{pkgnamepatch}-scripts.patch
|
||||
Patch9: %{pkgnamepatch}-install-db-sharedir.patch
|
||||
Patch10: %{pkgnamepatch}-paths.patch
|
||||
Patch11: %{pkgnamepatch}-gcc5.patch
|
||||
|
||||
# Patches specific for this mysql package
|
||||
Patch51: %{pkgnamepatch}-chain-certs.patch
|
||||
@ -392,7 +391,6 @@ the MySQL sources.
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch51 -p1
|
||||
%patch52 -p1
|
||||
%patch53 -p1
|
||||
@ -949,6 +947,9 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jul 21 2015 Jakub Dorňák <jdornak@redhat.com> - 5.6.25-1
|
||||
- Update to 5.6.25
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.6.24-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user