commit: a67fbb36cf3d44a90396f49a1db5fde57bd968fb Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Fri Oct 17 14:19:37 2014 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Fri Oct 17 14:19:37 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=a67fbb36
Fix header include error for bug 525644 wrt MDEV-6862 --- 00000_index.txt | 7 +++++++ 20012_all_mariadb-debug-header.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/00000_index.txt b/00000_index.txt index b82c694..610392e 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1734,3 +1734,10 @@ @pn mariadb-galera @@ Fix bad comparision of void to ulong @@ Gentoo bug 520092 MDEV-6595 + +@patch 20012_all_mariadb-debug-header.patch +@ver 5.05.40.00 to 5.05.40.99 +@pn mariadb +@pn mariadb-galera +@@ Fix bad header #error which breaks other builds +@@ Gentoo bug 525644 MDEV-6862 diff --git a/20012_all_mariadb-debug-header.patch b/20012_all_mariadb-debug-header.patch new file mode 100644 index 0000000..2791a9b --- /dev/null +++ b/20012_all_mariadb-debug-header.patch @@ -0,0 +1,12 @@ +diff -aurN mysql.orig/config.h.cmake mysql/config.h.cmake +--- mysql.orig/config.h.cmake 2014-10-08 09:19:51.000000000 -0400 ++++ mysql/config.h.cmake 2014-10-17 09:51:33.617709631 -0400 +@@ -650,7 +650,7 @@ + + __GLIBC__ is defined in <features.h> + */ +-#ifdef __GLIBC__ ++#if 0 + #error <my_config.h> MUST be included first! + #endif +
