merging

17 years ago · 63b02e2b07
1 changed files with 5 additions and 5 deletions
--- 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