diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-19 17:23:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-19 17:23:39 +0100 |
| commit | 3495801e2e94df5a10cae6e056f65defa038a6b6 (patch) | |
| tree | de524b4bf45dbc19a95262843f2b72d0f5adb7bc /config.h.cmake | |
| parent | df7b27f1fe308fd4011fa020bebd7c69bcd43383 (diff) | |
| parent | 496fda66fdc34b447ef4dec26d1250b034a321e3 (diff) | |
| download | mariadb-git-3495801e2e94df5a10cae6e056f65defa038a6b6.tar.gz | |
5.5 merge
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config.h.cmake b/config.h.cmake index 86ebf43ef24..6a0527719f9 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -663,9 +663,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 |