From ae4d78ec52063eafa70f6a4e20e33454198c60a7 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 06 2019 10:01:24 +0000
Subject: import mariadb-5.5.64-1.el7


---

diff --git a/.gitignore b/.gitignore
index ab78b76..7e2c68d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mariadb-5.5.60.tar.gz
+SOURCES/mariadb-5.5.64.tar.gz
diff --git a/.mariadb.metadata b/.mariadb.metadata
index 8214c51..055fb28 100644
--- a/.mariadb.metadata
+++ b/.mariadb.metadata
@@ -1 +1 @@
-25cb56b1ea5df6057b89828675c92ce76c57620a SOURCES/mariadb-5.5.60.tar.gz
+39ee4db628c775f378e6f19206e8a329d94e24ff SOURCES/mariadb-5.5.64.tar.gz
diff --git a/SOURCES/mariadb-prepare-db-dir b/SOURCES/mariadb-prepare-db-dir
index e8a284b..f5ef9f8 100644
--- a/SOURCES/mariadb-prepare-db-dir
+++ b/SOURCES/mariadb-prepare-db-dir
@@ -79,10 +79,11 @@ fi
 # since otherwise this systemd service file could report false
 # positive result when starting and mysqld_safe could remove
 # a socket file, which actually uses a different daemon.
-if fuser "$socketfile" &>/dev/null ; then
-    echo "Socket file $socketfile exists." >&2
-    echo "Is another MySQL daemon already running with the same unix socket?" >&2
-    exit 1
+response=`/usr/bin/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER --connect-timeout="${CHECKSOCKETTIMEOUT:-10}" ping 2>&1`
+if [ $? -eq 0 ] || echo "$response" | grep -q "Access denied for user" ; then
+  echo "Socket file $socketfile exists." >&2
+  echo "Is another MySQL daemon already running with the same unix socket?" >&2
+  exit 1
 fi
 
 
diff --git a/SOURCES/rh-skipped-tests-base.list b/SOURCES/rh-skipped-tests-base.list
index 9c303c6..68a6cdf 100644
--- a/SOURCES/rh-skipped-tests-base.list
+++ b/SOURCES/rh-skipped-tests-base.list
@@ -1,6 +1,11 @@
 # Tests and a bug where we track the failure in the following format:
 # suite.test : rhbz#1234567
+
+# Failing from 5.5.63 on all arches
+main.mysql                             :
+
+# i686, ppc64le
 main.mysql_client_test_nonblock        : rhbz#1544452 rhbz#1021450
-parts.partition_alter4_innodb          :
-parts.partition_alter2_2_2_innodb      :
+
+# ppc, ppc64le, aarch64
 innodb.innodb_simulate_comp_failures   :
diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec
index 34e5189..df2125f 100644
--- a/SPECS/mariadb.spec
+++ b/SPECS/mariadb.spec
@@ -3,7 +3,7 @@
 %bcond_with tokudb
 
 Name: mariadb
-Version: 5.5.60
+Version: 5.5.64
 Release: 1%{?dist}
 Epoch: 1
 
@@ -727,6 +727,16 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu May 02 2019 Michal Schorm <mschorm@redhat.com> - 1:5.5.64-1
+- Rebase to 5.5.64
+- Resolves: #1490398
+- CVE's fixed: #1610986
+  CVE-2018-3058 CVE-2018-3063 CVE-2018-3066 CVE-2018-3081
+- CVE's fixed: #1664043
+  CVE-2018-3282 CVE-2019-2503
+- CVE's fixed: #1701686
+  CVE-2019-2529
+
 * Thu May 10 2018 Michal Schorm <mschorm@redhat.com> - 1:5.5.60-1
 - Rebase to 5.5.60
 - CVE's fixed: #1558256, #1558260, #1559060