From 6db864c93193c6e353ef37160e8ff1bcfb8f5337 Mon Sep 17 00:00:00 2001 From: Kang Kai Date: Tue, 18 Nov 2014 17:54:36 +0800 Subject: mariadb: Update from version 5.5.39 to 5.5.40 * rename mariadb_5.5.39.inc -> mariadb.inc * add dependency bision-native for mariadb-native * add revert-fix-for-MDEV-5120.patch to revert an commit for mariadb test suite which causes packages mysql-python and modphp fail to build * add PACKAGECONFIG 'libedit' Signed-off-by: Kai Kang Signed-off-by: Martin Jansa --- .../mysql/mariadb/revert-fix-for-MDEV-5120.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch (limited to 'meta-oe/recipes-support/mysql/mariadb') diff --git a/meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch b/meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch new file mode 100644 index 0000000000..41493a1c56 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch @@ -0,0 +1,46 @@ +Revert mariadb commit revno 4300 in branch 5.5 which fixes +https://mariadb.atlassian.net/browse/MDEV-5120. + +------------------------------------------------------------ +revno: 4300 +fixes bug: https://mariadb.atlassian.net/browse/MDEV-5120 +committer: Sergei Golubchik +branch nick: 5.5 +timestamp: Thu 2014-10-02 11:57:40 +0200 +message: + MDEV-5120 Test suite test maria-no-logging fails + + stat structure (from ) is conditionally defined + to have different layout and size depending on the defined macros. + The correct macro is defined in my_config.h, which means it MUST be + included first (or, at least before - so, practically, + before including any system headers). +------------------------------------------------------------ + +It causes modphp fails to build. Bug MDEV-5120 is an test suite test +maria-no-logging fails. There is no side effect to revert it. + +Upstream-Status: Backport + +Signed-off-by: Kai Kang +--- +--- mariadb-5.5.40/config.h.cmake.orig 2014-11-13 14:23:50.868147145 +0800 ++++ mariadb-5.5.40/config.h.cmake 2014-11-13 14:24:23.372148031 +0800 +@@ -641,17 +641,4 @@ + #cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@ + #cmakedefine TIME_T_UNSIGNED @TIME_T_UNSIGNED@ + +-/* +- stat structure (from ) is conditionally defined +- to have different layout and size depending on the defined macros. +- The correct macro is defined in my_config.h, which means it MUST be +- included first (or at least before - so, practically, +- before including any system headers). +- +- __GLIBC__ is defined in +-*/ +-#ifdef __GLIBC__ +-#error MUST be included first! +-#endif +- + #endif -- cgit 1.2.3-korg