rpms/mysql
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 5.6.22

Browse Source
This commit is contained in:
Jakub Dorňák 2014-12-03 15:01:06 +01:00
parent e29bd9d1cc
commit 891c072e02
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,3 +11,4 @@
/mysql-5.6.19.tar.gz /mysql-5.6.19.tar.gz
/mysql-5.6.20.tar.gz /mysql-5.6.20.tar.gz
/mysql-5.6.21.tar.gz /mysql-5.6.21.tar.gz
/mysql-5.6.22.tar.gz

16
community-mysql-file-contents.patch
View File

@ -6,9 +6,9 @@ to know about this.
Recommendation they change is at http://bugs.mysql.com/bug.php?id=61425 Recommendation they change is at http://bugs.mysql.com/bug.php?id=61425
diff -up mysql-5.6.19/mysql-test/t/file_contents.test.file-contents mysql-5.6.19/mysql-test/t/file_contents.test diff -up mysql-5.6.22/mysql-test/t/file_contents.test.file-contents mysql-5.6.22/mysql-test/t/file_contents.test
--- mysql-5.6.19/mysql-test/t/file_contents.test.file-contents 2014-07-25 11:56:12.442153944 +0200 --- mysql-5.6.22/mysql-test/t/file_contents.test.file-contents 2014-12-03 15:05:18.629731527 +0100
+++ mysql-5.6.19/mysql-test/t/file_contents.test 2014-07-25 12:00:11.578581702 +0200 +++ mysql-5.6.22/mysql-test/t/file_contents.test 2014-12-03 15:09:36.082081039 +0100
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
--perl --perl
print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n"; print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n";
@ -18,8 +18,8 @@ diff -up mysql-5.6.19/mysql-test/t/file_contents.test.file-contents mysql-5.6.19
# RPM package # RPM package
$dir_docs = $dir_bin; $dir_docs = $dir_bin;
$dir_docs =~ s|/lib|/share/doc|; $dir_docs =~ s|/lib|/share/doc|;
@@ -26,7 +26,7 @@ if ($dir_bin =~ m|/usr/|) { @@ -30,7 +30,7 @@ if ($dir_bin =~ m|/usr/|) {
$dir_docs = glob "$dir_bin/share/doc/mysql-community-server*"; }
} }
} }
-} elsif ($dir_bin =~ m|/usr$|) { -} elsif ($dir_bin =~ m|/usr$|) {
@ -27,9 +27,9 @@ diff -up mysql-5.6.19/mysql-test/t/file_contents.test.file-contents mysql-5.6.19
# RPM build during development # RPM build during development
$dir_docs = "$dir_bin/share/doc"; $dir_docs = "$dir_bin/share/doc";
if(-d "$dir_docs/packages") { if(-d "$dir_docs/packages") {
@@ -39,6 +39,15 @@ if ($dir_bin =~ m|/usr/|) { @@ -47,6 +47,15 @@ if ($dir_bin =~ m|/usr/|) {
# If not it might be ULN so try that $dir_docs = glob "$dir_bin/share/mysql/docs";
$dir_docs = glob "$dir_bin/share/doc/mysql-community-server*"; }
} }
+ +
+ # All the above is entirely wacko, because these files are not docs; + # All the above is entirely wacko, because these files are not docs;

11
community-mysql.spec
View File

@ -64,8 +64,8 @@
%global sameevr %{?epoch:%{epoch}:}%{version}-%{release} %global sameevr %{?epoch:%{epoch}:}%{version}-%{release}
Name: %{pkgname} Name: %{pkgname}
Version: 5.6.21 Version: 5.6.22
Release: 5%{?with_debug:.debug}%{?dist} Release: 1%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries Summary: MySQL client programs and shared libraries
Group: Applications/Databases Group: Applications/Databases
URL: http://www.mysql.com URL: http://www.mysql.com
@ -387,13 +387,15 @@ the MySQL sources.
# Modify tests to pass on all archs # Modify tests to pass on all archs
pushd mysql-test pushd mysql-test
add_test () { add_test () {
echo $1 >> %{skiplist} echo $1 >> %{skiplist}
} }
touch %{skiplist}
# Workaround for upstream bug #http://bugs.mysql.com/56342 # Workaround for upstream bug #http://bugs.mysql.com/56342
rm -f t/ssl_8k_key-master.opt rm -f t/ssl_8k_key-master.opt
touch %{skiplist}
# Archs without hw performance counter, rh 741325 # Archs without hw performance counter, rh 741325
%ifarch %{arm} aarch64 sparc64 %ifarch %{arm} aarch64 sparc64
@ -924,6 +926,9 @@ fi
%endif %endif
%changelog %changelog
* Wed Dec 3 2014 Jakub Dorňák <jdornak@redhat.com> - 5.6.22-1
- Update to MySQL 5.6.22
* Wed Oct 08 2014 Bjorn Munch <bjorn.munch@oracle.com> - 5.6.21-5 * Wed Oct 08 2014 Bjorn Munch <bjorn.munch@oracle.com> - 5.6.21-5
- Fix rhbz #1149986 - Fix rhbz #1149986

2
sources
View File

@ -1 +1 @@
e47c3a70b8d89db3199a349204b2ae4e mysql-5.6.21.tar.gz 3985b634294482363f3d87e0d67f2262 mysql-5.6.22.tar.gz