diff options
Diffstat (limited to 'meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch')
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch | 46 |
1 files changed, 0 insertions, 46 deletions
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 41493a1c5..000000000 --- a/meta-oe/recipes-support/mysql/mariadb/revert-fix-for-MDEV-5120.patch +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | Revert mariadb commit revno 4300 in branch 5.5 which fixes | ||
| 2 | https://mariadb.atlassian.net/browse/MDEV-5120. | ||
| 3 | |||
| 4 | ------------------------------------------------------------ | ||
| 5 | revno: 4300 | ||
| 6 | fixes bug: https://mariadb.atlassian.net/browse/MDEV-5120 | ||
| 7 | committer: Sergei Golubchik <sergii@pisem.net> | ||
| 8 | branch nick: 5.5 | ||
| 9 | timestamp: Thu 2014-10-02 11:57:40 +0200 | ||
| 10 | message: | ||
| 11 | MDEV-5120 Test suite test maria-no-logging fails | ||
| 12 | |||
| 13 | stat structure (from <sys/stat.h>) is conditionally defined | ||
| 14 | to have different layout and size depending on the defined macros. | ||
| 15 | The correct macro is defined in my_config.h, which means it MUST be | ||
| 16 | included first (or, at least before <features.h> - so, practically, | ||
| 17 | before including any system headers). | ||
| 18 | ------------------------------------------------------------ | ||
| 19 | |||
| 20 | It causes modphp fails to build. Bug MDEV-5120 is an test suite test | ||
| 21 | maria-no-logging fails. There is no side effect to revert it. | ||
| 22 | |||
| 23 | Upstream-Status: Backport | ||
| 24 | |||
| 25 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
| 26 | --- | ||
| 27 | --- mariadb-5.5.40/config.h.cmake.orig 2014-11-13 14:23:50.868147145 +0800 | ||
| 28 | +++ mariadb-5.5.40/config.h.cmake 2014-11-13 14:24:23.372148031 +0800 | ||
| 29 | @@ -641,17 +641,4 @@ | ||
| 30 | #cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@ | ||
| 31 | #cmakedefine TIME_T_UNSIGNED @TIME_T_UNSIGNED@ | ||
| 32 | |||
| 33 | -/* | ||
| 34 | - stat structure (from <sys/stat.h>) is conditionally defined | ||
| 35 | - to have different layout and size depending on the defined macros. | ||
| 36 | - The correct macro is defined in my_config.h, which means it MUST be | ||
| 37 | - included first (or at least before <features.h> - so, practically, | ||
| 38 | - before including any system headers). | ||
| 39 | - | ||
| 40 | - __GLIBC__ is defined in <features.h> | ||
| 41 | -*/ | ||
| 42 | -#ifdef __GLIBC__ | ||
| 43 | -#error <my_config.h> MUST be included first! | ||
| 44 | -#endif | ||
| 45 | - | ||
| 46 | #endif | ||