From b7293d62a6b85e98197c7b6cd76ee6e88a327d4c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 31 2016 19:34:31 +0000
Subject: import mysql55-mysql-5.5.52-1.el7


---

diff --git a/.gitignore b/.gitignore
index 2f9cc94..7c44345 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mysql-5.5.50.tar.gz
+SOURCES/mysql-5.5.52.tar.gz
diff --git a/.mysql55-mysql.metadata b/.mysql55-mysql.metadata
index 93a4a03..6ddf4dd 100644
--- a/.mysql55-mysql.metadata
+++ b/.mysql55-mysql.metadata
@@ -1 +1 @@
-08b27227d66b39b7914c6b5a0e16012dd57048a9 SOURCES/mysql-5.5.50.tar.gz
+585b90289e2fd51b26b0696426ae25b2b01cfe6d SOURCES/mysql-5.5.52.tar.gz
diff --git a/SOURCES/mysql-socket-removal.patch b/SOURCES/mysql-socket-removal.patch
index 280b398..2561739 100644
--- a/SOURCES/mysql-socket-removal.patch
+++ b/SOURCES/mysql-socket-removal.patch
@@ -4,15 +4,17 @@ do it here as well.
 
 RHBZ#1045401
 
-diff -up mysql-5.5.36/scripts/mysqld_safe.sh.socket-removal mysql-5.5.36/scripts/mysqld_safe.sh
---- mysql-5.5.36/scripts/mysqld_safe.sh.socket-removal	2014-02-12 20:53:35.655312819 +0100
-+++ mysql-5.5.36/scripts/mysqld_safe.sh	2014-02-12 20:53:45.014310456 +0100
-@@ -779,7 +779,7 @@ have_sleep=1
  
+diff -up mysql-5.5.52/scripts/mysqld_safe.sh.patch31 mysql-5.5.52/scripts/mysqld_safe.sh
+--- mysql-5.5.52/scripts/mysqld_safe.sh.patch31	2016-09-18 19:49:13.818534828 +0200
++++ mysql-5.5.52/scripts/mysqld_safe.sh	2016-09-18 19:50:33.544748288 +0200
+@@ -789,9 +789,6 @@ have_sleep=1
  while true
  do
--  rm -f $safe_mysql_unix_port "$pid_file"	# Some extra safety
-+  rm -f "$pid_file"	# Some extra safety
- 
-   start_time=`date +%M%S`
- 
+   # Some extra safety
+-  if [ ! -h "$safe_mysql_unix_port" ]; then
+-    rm -f "$safe_mysql_unix_port"
+-  fi
+   if [ ! -h "$pid_file" ]; then
+     rm -f "$pid_file"
+   fi
diff --git a/SPECS/mysql.spec b/SPECS/mysql.spec
index 6b7a148..97e2a4a 100644
--- a/SPECS/mysql.spec
+++ b/SPECS/mysql.spec
@@ -1,7 +1,7 @@
 %{?scl:%scl_package mysql}
 
 Name: %{?scl_prefix}mysql
-Version: 5.5.50
+Version: 5.5.52
 Release: 1%{?dist}
 
 Summary: MySQL client programs and shared libraries
@@ -328,6 +328,7 @@ make %{?_smp_mflags} VERBOSE=1
     cd mysql-test
     perl ./mysql-test-run.pl --force --retry=0 --ssl \
 	--skip-test-list=rh-skipped-tests.list \
+	--skip-rpl \
 	--mysqld=--binlog-format=mixed \
 	--suite-timeout=720 --testcase-timeout=30
     # cmake build scripts will install the var cruft if left alone :-(
@@ -675,6 +676,11 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris/postinstall-solaris
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sun Sep 18 2016 Honza Horak <hhorak@redhat.com> - 5.5.52-1
+- Rebase to 5.5.52
+  Also fixes: CVE-2016-6662
+  Resolves: #1384960
+
 * Tue Jun  7 2016 Jakub Dorňák <jdornak@redhat.com> - 5.5.50-1
 - Rebase to 5.5.50
   Resolves: #1342440