Merge recent changes from mysql-next-mr into

mysql-next-4284.

Merge recent changes from mysql-next-mr into
mysql-next-4284.
2e45eeb6 · Dmitry Lenev · 5b72c6d3 · ec0f9fea · 2e45eeb6
Commit 2e45eeb6 authored Feb 26, 2010 by Dmitry Lenev
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

include/my_global.h include/my_global.h +0 -6

No files found.
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -83,12 +83,6 @@
 #endif
 #endif /* _WIN32... */
-#ifdef EMBEDDED_LIBRARY
-#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
-#undef WITH_PERFSCHEMA_STORAGE_ENGINE
-#endif
-#endif /* EMBEDDED_LIBRARY */
 #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
 #define HAVE_PSI_INTERFACE
 #endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */