From 64180b511b16492b377d95945812c88595841b84 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 05 2015 12:17:03 +0000
Subject: import mariadb-5.5.40-2.el7_0


---

diff --git a/SOURCES/mariadb-headerfile.patch b/SOURCES/mariadb-headerfile.patch
new file mode 100644
index 0000000..c229fae
--- /dev/null
+++ b/SOURCES/mariadb-headerfile.patch
@@ -0,0 +1,19 @@
+diff -up mariadb-5.5.40/config.h.cmake.rev4355 mariadb-5.5.40/config.h.cmake
+--- mariadb-5.5.40/config.h.cmake.rev4355	2014-10-08 15:19:51.000000000 +0200
++++ mariadb-5.5.40/config.h.cmake	2014-12-15 13:34:52.874221087 +0100
+@@ -648,9 +648,13 @@
+   included first (or at least before <features.h> - so, practically,
+   before including any system headers).
+ 
+-  __GLIBC__ is defined in <features.h>
++  Check the include order by looking at __GLIBC__ (defined in <features.h>)
++
++  But we cannot force all third-party clients/connectors to include
++  my_config.h first. So, their crashes are their responsibility,
++  we enable this check only for MariaDB sources (SAFE_MUTEX check).
+ */
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && defined(SAFE_MUTEX)
+ #error <my_config.h> MUST be included first!
+ #endif
+ 
diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec
index 2416367..46a11e0 100644
--- a/SPECS/mariadb.spec
+++ b/SPECS/mariadb.spec
@@ -4,7 +4,7 @@
 
 Name: mariadb
 Version: 5.5.40
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 
 Summary: A community developed branch of MySQL
@@ -54,6 +54,7 @@ Patch17: mariadb-covscan-signexpr.patch
 Patch18: mariadb-covscan-stroverflow.patch
 Patch19: mariadb-ssltest.patch
 #Patch20: mariadb-symbols-versioning.patch
+Patch21: mariadb-headerfile.patch
 
 BuildRequires: perl, readline-devel, openssl-devel
 BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@@ -224,6 +225,7 @@ MariaDB is a community developed branch of MySQL.
 %patch18 -p1
 %patch19 -p1
 #%patch20 -p1
+%patch21 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -732,6 +734,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Tue Dec 30 2014 Honza Horak <hhorak@redhat.com> - 1:5.5.40-2
+- Fix header to let dependencies to build fine
+  Resolves: #1177836
+
 * Thu Nov 06 2014 Matej Muzila <mmuzila@redhat.com> - 1:5.5.40-1
 - Rebase to 5.5.40
   Also fixes: CVE-2014-4274 CVE-2014-4287 CVE-2014-6463 CVE-2014-6464