diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2016-10-28 12:29:37 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-10-31 12:18:23 +0400 |
| commit | 71e11bce34339a69576321d6c40838fa65208dc7 (patch) | |
| tree | 8b37076306c7f8c8f91aa475dc363fa69fd8f199 /wsrep | |
| parent | 40ad9466830cd16793fb892180aae2bf491ce348 (diff) | |
| download | mariadb-git-71e11bce34339a69576321d6c40838fa65208dc7.tar.gz | |
MDEV-8791 - AIX: Unresolved Symbols during linking
Clean-up nolock.h: it doesn't serve any purpose anymore. Appropriate code moved
to x86-gcc.h and my_atomic.h.
If gcc sync bultins were detected, we want to make use of them independently of
__GNUC__ definition. E.g. XLC simulates those, but doesn't define __GNUC__.
HS/Spider: According to AIX manual alloca() returns char*, which cannot be
casted to any type with static_cast. Use explicit cast instead.
MDL: Removed namemangling pragma, which didn't let MariaDB build with XLC.
WSREP: _int64 seem to be conflicting name with XLC, replaced with _integer64.
CONNECT: RTLD_NOLOAD is GNU extention. Removed rather meaningless check if
library is loaded. Multiple dlopen()'s of the same library are permitted,
and it never gets closed anyway. Except for error, which was a bug: it may
close library, which can still be referenced by other subsystems.
InnoDB: __ppc_get_timebase() is GNU extention. Only use it when __GLIBC__ is
defined.
Based on contribution by flynn1973.
Diffstat (limited to 'wsrep')
| -rw-r--r-- | wsrep/wsrep_api.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wsrep/wsrep_api.h b/wsrep/wsrep_api.h index e713be094df..1d6bc059d3d 100644 --- a/wsrep/wsrep_api.h +++ b/wsrep/wsrep_api.h @@ -502,7 +502,7 @@ struct wsrep_stats_var const char* name; //!< variable name wsrep_var_type_t type; //!< variable value type union { - int64_t _int64; + int64_t _integer64; double _double; const char* _string; } value; //!< variable value |