diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2008-12-13 19:42:12 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2008-12-13 19:42:12 +0000 |
| commit | 19f859a27e60270f3cdc7e2edc34e88c29536c21 (patch) | |
| tree | 3ca8c469534126c025304d8d96dbeb2b359a6c00 /include | |
| parent | 5c16a315ca28c18949e27b91cddf0886329d1dd4 (diff) | |
| parent | ba816c14a9bc8012759da9d58f858f1e73bec708 (diff) | |
| download | mariadb-git-19f859a27e60270f3cdc7e2edc34e88c29536c21.tar.gz | |
merge 5.1 --> 5.1-rpl
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/my_global.h b/include/my_global.h index c6ac90d4a34..25ba94f7d3e 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -18,11 +18,6 @@ #ifndef _global_h #define _global_h -#ifndef EMBEDDED_LIBRARY -#define HAVE_REPLICATION -#define HAVE_EXTERNAL_CLIENT -#endif - /* InnoDB depends on some MySQL internals which other plugins should not need. This is because of InnoDB's foreign key support, "safe" binlog @@ -101,6 +96,11 @@ #endif #endif /* !EMBEDDED_LIBRARY */ +#ifndef EMBEDDED_LIBRARY +#define HAVE_REPLICATION +#define HAVE_EXTERNAL_CLIENT +#endif + /* Some defines to avoid ifdefs in the code */ #ifndef NETWARE_YIELD #define NETWARE_YIELD |