From 63de2fe6d01dd9849529b81a08f0ea92d85b7c51 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 11 2016 12:06:06 +0000
Subject: import mariadb-5.5.50-1.el7_2


---

diff --git a/.gitignore b/.gitignore
index 1bee34e..5650dd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mariadb-5.5.47.tar.gz
+SOURCES/mariadb-5.5.50.tar.gz
diff --git a/.mariadb.metadata b/.mariadb.metadata
index 9641998..674d7db 100644
--- a/.mariadb.metadata
+++ b/.mariadb.metadata
@@ -1 +1 @@
-a60a64b0bb423c68cab72ec81d5a4c730cf18840 SOURCES/mariadb-5.5.47.tar.gz
+4bad9d566aae9d96155290bf3690eafe67363b36 SOURCES/mariadb-5.5.50.tar.gz
diff --git a/SOURCES/mariadb-ssltest.patch b/SOURCES/mariadb-ssltest.patch
deleted file mode 100644
index 6fdd271..0000000
--- a/SOURCES/mariadb-ssltest.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Don't test EDH-RSA-DES-CBC-SHA cipher, it seems to be removed from openssl
-which now makes mariadb/mysql FTBFS because openssl_1 test fails
-
-Related: #1044565
-
-
-diff -up mariadb-5.5.34/mysql-test/r/openssl_1.result.p20 mariadb-5.5.34/mysql-test/r/openssl_1.result
---- mariadb-5.5.34/mysql-test/r/openssl_1.result.p20	2014-01-06 11:51:18.878640731 +0100
-+++ mariadb-5.5.34/mysql-test/r/openssl_1.result	2014-01-06 11:51:45.364678942 +0100
-@@ -196,8 +196,6 @@ Ssl_cipher	DHE-RSA-AES256-SHA
- Variable_name	Value
- Ssl_cipher	EDH-RSA-DES-CBC3-SHA
- Variable_name	Value
--Ssl_cipher	EDH-RSA-DES-CBC-SHA
--Variable_name	Value
- Ssl_cipher	RC4-SHA
- select 'is still running; no cipher request crashed the server' as result from dual;
- result
-diff -up mariadb-5.5.34/mysql-test/t/openssl_1.test.p20 mariadb-5.5.34/mysql-test/t/openssl_1.test
---- mariadb-5.5.34/mysql-test/t/openssl_1.test.p20	2014-01-06 11:51:18.830640662 +0100
-+++ mariadb-5.5.34/mysql-test/t/openssl_1.test	2014-01-06 11:51:18.879640733 +0100
-@@ -218,7 +218,7 @@ DROP TABLE t1;
- # Common ciphers to openssl and yassl
- --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=DHE-RSA-AES256-SHA
- --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC3-SHA
----exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC-SHA
-+#--exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC-SHA
- --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=RC4-SHA
- --disable_query_log
- --disable_result_log
diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec
index 5826cc5..691a009 100644
--- a/SPECS/mariadb.spec
+++ b/SPECS/mariadb.spec
@@ -3,7 +3,7 @@
 %bcond_with tokudb
 
 Name: mariadb
-Version: 5.5.47
+Version: 5.5.50
 Release: 1%{?dist}
 Epoch: 1
 
@@ -51,7 +51,6 @@ Patch11: mariadb-string-overflow.patch
 Patch14: mariadb-basedir.patch
 Patch17: mariadb-covscan-signexpr.patch
 Patch18: mariadb-covscan-stroverflow.patch
-Patch19: mariadb-ssltest.patch
 
 BuildRequires: perl, readline-devel, openssl-devel
 BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@@ -219,7 +218,6 @@ MariaDB is a community developed branch of MySQL.
 %patch14 -p1
 %patch17 -p1
 %patch18 -p1
-%patch19 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -724,6 +722,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Mon Jul 25 2016 Jakub Dorňák <jdornak@redhat.com> - 1:5.5.50-1
+- Rebase to 5.5.50
+  Resolves: #1359628
+
 * Wed Feb  3 2016 Jakub Dorňák <jdornak@redhat.com> - 1:5.5.47-1
 - Rebase to 5.5.47
   Also fixes: CVE-2015-4792 CVE-2015-4802 CVE-2015-4815 CVE-2015-4816