bzr commit into mysql-5.1 branch (holyfoot:2716)

[Alexey Botchkov]

#At file:///home/hf/work/mysql_common/51mrg/

 2716 Alexey Botchkov	2008-11-19 [merge]
      merging
modified:
  include/my_global.h

=== modified file 'include/my_global.h'
--- a/include/my_global.h	2008-05-20 07:38:17 +0000
+++ b/include/my_global.h	2008-06-16 03:04:45 +0000
@@ -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