From f2bda8d1f00950f920de1c663403f9ee393e347f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 26 2018 07:01:02 +0000
Subject: import rh-mysql56-mysql-5.6.40-1.el7


---

diff --git a/.gitignore b/.gitignore
index 772c4ea..6906e80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mysql-5.6.39.tar.gz
+SOURCES/mysql-5.6.40.tar.gz
diff --git a/.rh-mysql56-mysql.metadata b/.rh-mysql56-mysql.metadata
index 9922d6b..132f9d8 100644
--- a/.rh-mysql56-mysql.metadata
+++ b/.rh-mysql56-mysql.metadata
@@ -1 +1 @@
-8f69162cfcfb031e0e60f85e46182548a4e34b41 SOURCES/mysql-5.6.39.tar.gz
+78b9ef4b09cf37a683a4696b70d54be227f3e501 SOURCES/mysql-5.6.40.tar.gz
diff --git a/SPECS/mysql.spec b/SPECS/mysql.spec
index bcadb55..7663459 100644
--- a/SPECS/mysql.spec
+++ b/SPECS/mysql.spec
@@ -110,8 +110,8 @@
 %endif
 
 Name:             %{?scl_prefix}mysql
-Version:          5.6.39
-Release:          1%{?with_debug:.debug}%{?dist}.1
+Version:          5.6.40
+Release:          1%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 Group:            Applications/Databases
 URL:              http://www.mysql.com
@@ -633,8 +633,6 @@ rm %{buildroot}%{_datadir}/%{pkg_name}/magic
 rm %{buildroot}%{_datadir}/%{pkg_name}/mysql.server
 rm %{buildroot}%{_datadir}/%{pkg_name}/mysqld_multi.server
 rm %{buildroot}%{_mandir}/man1/comp_err.1*
-rm %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1*
-rm %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1*
 
 # put logrotate script where it needs to be
 mkdir -p %{buildroot}%{logrotateddir}
@@ -660,11 +658,6 @@ install -p -m 0644 %{SOURCE7} %{basename:%{SOURCE7}}
 # Install the list of skipped tests to be available for user runs
 install -p -m 0644 mysql-test/%{skiplist} %{buildroot}%{_datadir}/mysql-test
 
-# These are in fact identical
-rm %{buildroot}%{_mandir}/man1/{mysqltest,mysql_client_test}_embedded.1
-cp -p %{buildroot}%{_mandir}/man1/mysqltest.1 %{buildroot}%{_mandir}/man1/mysqltest_embedded.1
-cp -p %{buildroot}%{_mandir}/man1/mysql_client_test.1 %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1
-
 %if %{without clibrary}
 unlink %{buildroot}%{_libdir}/mysql/libmysqlclient.so
 unlink %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so
@@ -674,7 +667,6 @@ rm -r %{buildroot}%{_libdir}/mysql/libmysqlclient*.so.*
 %if %{without embedded}
 rm %{buildroot}%{_libdir}/mysql/libmysqld.so*
 rm %{buildroot}%{_bindir}/{mysql_client_test_embedded,mysqltest_embedded}
-rm %{buildroot}%{_mandir}/man1/{mysql_client_test_embedded,mysqltest_embedded}.1*
 %endif
 
 %if %{without devel}
@@ -718,7 +710,6 @@ rm -r %{buildroot}%{_datadir}/sql-bench
 %if %{without test}
 rm %{buildroot}%{_bindir}/{mysql_client_test,my_safe_process}
 rm -r %{buildroot}%{_datadir}/mysql-test
-rm %{buildroot}%{_mandir}/man1/mysql_client_test.1*
 %endif
 
 %if 0%{?scl:1}
@@ -972,7 +963,6 @@ fi
 %{_mandir}/man1/mysqlhotcopy.1*
 %{_mandir}/man1/mysqlman.1*
 %{_mandir}/man1/mysql_setpermission.1*
-%{_mandir}/man1/mysqltest.1*
 %{_mandir}/man1/innochecksum.1*
 %{_mandir}/man1/perror.1*
 %{_mandir}/man1/replace.1*
@@ -1031,8 +1021,6 @@ fi
 %{_libdir}/mysql/libmysqld.so
 %{_bindir}/mysql_client_test_embedded
 %{_bindir}/mysqltest_embedded
-%{_mandir}/man1/mysql_client_test_embedded.1*
-%{_mandir}/man1/mysqltest_embedded.1*
 %endif
 
 %if %{with bench}
@@ -1045,16 +1033,26 @@ fi
 %{_bindir}/mysql_client_test
 %{_bindir}/my_safe_process
 %attr(-,mysql,mysql) %{_datadir}/mysql-test
-%{_mandir}/man1/mysql_client_test.1*
 %endif
 
 %changelog
+* Tue Apr 24 2018 Michal Schorm <mschorm@redhat.com> - 5.6.40-1
+- Rebase to MySQL 5.6.40, for various fixes described at
+  https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-40.html
+- Fix for various CVEs listed on
+  http://www.oracle.com/technetwork/security-advisory/cpuapr2018-3678067.html
+- CVE fixes: #1571242
+            CVE-2018-2755 CVE-2018-2758 CVE-2018-2761 CVE-2018-2766 CVE-2018-2771
+            CVE-2018-2773 CVE-2018-2781 CVE-2018-2782 CVE-2018-2784 CVE-2018-2787
+            CVE-2018-2805 CVE-2018-2813 CVE-2018-2817 CVE-2018-2818 CVE-2018-2819
+  Resolves: rhbz#1571242
+
 * Tue Feb 20 2018 Honza Horak <hhorak@redhat.com> - 5.6.39-1.1
 - Use mysqladmin instead of fuser for checking whether socket is used
   Related: #1461445
 
 * Wed Jan 24 2018 Michal Schorm <mschorm@redhat.com> - 5.6.39-1
-- Update to MySQL 5.7.21, for various fixes described at
+- Rebase to MySQL 5.6.39, for various fixes described at
   https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-39.html
 - Fix for various CVEs listed on
   http://www.oracle.com/technetwork/security-advisory/cpujan2018-3236628.html