diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-15 21:45:22 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-15 21:45:22 +0300 |
| commit | 7a6e5c3f4cbbfeabd370e074ad03fb7dae90b964 (patch) | |
| tree | c5bdf39edfe6126050810bb9269e5bb4fc8cf16d /include/my_global.h | |
| parent | 3394cbf72cc09ca4735f88c2669ccd853134dfa8 (diff) | |
| parent | fd433cfb96adcbb013b27838cd80576dff92989d (diff) | |
| download | mariadb-git-7a6e5c3f4cbbfeabd370e074ad03fb7dae90b964.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index f95c8aa2441..79d1ea7891c 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright (C) 2000-2003 MySQL AB, 2009 Sun Microsystems, Inc This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -83,6 +83,16 @@ #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 */ + /* Make it easier to add conditionl code for windows */ #ifdef __WIN__ #define IF_WIN(A,B) (A) |