diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-02 16:26:43 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-02 16:26:43 +0100 |
| commit | d5fd757a4279f4fa8f032c6dd63d1d121d8e1fea (patch) | |
| tree | ad5b63e8b1d154ab7b1753f9e156e7741b01899d /include/my_global.h | |
| parent | 791286ee1c3c705cb8853e242cdf718a7b5ce5b7 (diff) | |
| download | mariadb-git-d5fd757a4279f4fa8f032c6dd63d1d121d8e1fea.tar.gz | |
1. add --plugin-dir and --default-auth to mysqltest.
2. dialog plugin now always returns mysql->password if non-empty and the first question is of password type
3. split get_tty_password into get_tty_password_buff and strdup.
4. dialog plugin now uses get_tty_password by default
5. dialog.test
6. moved small tests of individual plugins into a dedicated suite
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index 92aa2352621..58147f85ee3 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1520,18 +1520,20 @@ do { doubleget_union _tmp; \ #define NO_EMBEDDED_ACCESS_CHECKS #endif -#ifdef HAVE_DLOPEN -#if defined(__WIN__) +#if defined(_WIN32) #define dlsym(lib, name) GetProcAddress((HMODULE)lib, name) #define dlopen(libname, unused) LoadLibraryEx(libname, NULL, 0) #define dlclose(lib) FreeLibrary((HMODULE)lib) -#elif defined(HAVE_DLFCN_H) +#define HAVE_DLOPEN +#endif + +#ifdef HAVE_DLFCN_H #include <dlfcn.h> #endif + #ifndef HAVE_DLERROR #define dlerror() "" #endif -#endif /* FreeBSD 2.2.2 does not define RTLD_NOW) */ #ifndef RTLD_NOW |