Commit 63b02e2b authored by Alexey Botchkov's avatar Alexey Botchkov
Browse files

merging

parents a6fb36d4 ca1adf1d

include/my_global.h

+5 −5
Original line number Diff line number Diff line
@@ -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