diff options
author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-02-01 14:09:48 +0200 |
---|---|---|
committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-02-01 14:09:48 +0200 |
commit | c7e5feb2596e2a032207191320dbf1387d440959 (patch) | |
tree | b4a5f850c3ab553a9a3c6b1b58bc5280ed42a861 /include/my_global.h | |
parent | 08b2c516da4df91082ae9fbe5e060959c4bb5faa (diff) | |
parent | d01dbe66a8bf9cb6031f95159c49100f9299a768 (diff) | |
download | mariadb-git-c7e5feb2596e2a032207191320dbf1387d440959.tar.gz |
Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34
Conflicts:
storage/innobase/lock/lock0lock.cc
storage/xtradb/lock/lock0lock.cc
storage/xtradb/lock/lock0wait.cc
support-files/mysql.server.sh
Diffstat (limited to 'include/my_global.h')
-rw-r--r-- | include/my_global.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index b43ba93e080..5ea761d587e 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1099,11 +1099,19 @@ static inline char *dlerror(void) #ifndef HAVE_DLERROR #define dlerror() "" #endif +#ifndef HAVE_DLADDR +#define dladdr(A, B) 0 +/* Dummy definition in case we're missing dladdr() */ +typedef struct { const char *dli_fname, dli_fbase; } Dl_info; +#endif #else #define dlerror() "No support for dynamic loading (static build?)" #define dlopen(A,B) 0 #define dlsym(A,B) 0 #define dlclose(A) 0 +#define dladdr(A, B) 0 +/* Dummy definition in case we're missing dladdr() */ +typedef struct { const char *dli_fname, dli_fbase; } Dl_info; #endif /* |