diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-01-05 11:00:51 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-01-08 11:58:43 +0100 |
commit | ce6304feb23c63d8a06fb946ffab18dc5a544243 (patch) | |
tree | c37c7246f8aee98daf00eb3c31d7732be2f9937b /meta-oe | |
parent | aecb603d4da9e99ae092741020138ec245a56397 (diff) | |
download | meta-openembedded-contrib-ce6304feb23c63d8a06fb946ffab18dc5a544243.tar.gz |
mariadb: update to 5.5.41
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb-native_5.5.41.bb (renamed from meta-oe/recipes-support/mysql/mariadb-native_5.5.40.bb) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb.inc | 5 | ||||
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch | 46 | ||||
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb_5.5.41.bb (renamed from meta-oe/recipes-support/mysql/mariadb_5.5.40.bb) | 0 |
4 files changed, 2 insertions, 49 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.40.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.5.41.bb index 4ce960d7da..4ce960d7da 100644 --- a/meta-oe/recipes-support/mysql/mariadb-native_5.5.40.bb +++ b/meta-oe/recipes-support/mysql/mariadb-native_5.5.41.bb diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index a04288d6f1..cacb0d5e0f 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -11,11 +11,10 @@ SRC_URI = "http://mirror.stshosting.co.uk/mariadb/mariadb-${PV}/source/mariadb-$ file://my.cnf \ file://mysqld.service \ file://configure.cmake-fix-valgrind.patch \ - file://revert-fix-for-MDEV-5120.patch \ " -SRC_URI[md5sum] = "561bede89a8bd19c374dad2d8f24fdfe" -SRC_URI[sha256sum] = "cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a" +SRC_URI[md5sum] = "d2415efc6a6d73d7a58f3c79bb42f2e8" +SRC_URI[sha256sum] = "a16dc62e4bcabecd5c483f2f8b657483a8c51934e7be5ad4ab21b8baea1f5332" S = "${WORKDIR}/mariadb-${PV}" 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 deleted file mode 100644 index 41493a1c56..0000000000 --- a/meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 <sergii@pisem.net> -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 <sys/stat.h>) 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 <features.h> - 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 <kai.kang@windriver.com> ---- ---- 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 <sys/stat.h>) 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 <features.h> - so, practically, -- before including any system headers). -- -- __GLIBC__ is defined in <features.h> --*/ --#ifdef __GLIBC__ --#error <my_config.h> MUST be included first! --#endif -- - #endif diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.40.bb b/meta-oe/recipes-support/mysql/mariadb_5.5.41.bb index 8f998a3a56..8f998a3a56 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.5.40.bb +++ b/meta-oe/recipes-support/mysql/mariadb_5.5.41.bb |