diff options
author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-01-05 02:26:20 +0100 |
---|---|---|
committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-01-05 02:26:20 +0100 |
commit | 697cfa3fbccebd5e268f774c0b05fdc81e09f34f (patch) | |
tree | 4a0306206ece86d6e9b230fd4c7d528033908167 | |
parent | 7db33f809a0b48b95c3d55889d6ed1f806293a20 (diff) | |
download | mariadb-git-697cfa3fbccebd5e268f774c0b05fdc81e09f34f.tar.gz |
Fix the last merge
-rw-r--r-- | config.h.cmake | 1 | ||||
-rw-r--r-- | configure.cmake | 4 | ||||
-rw-r--r-- | storage/example/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/config.h.cmake b/config.h.cmake index 259a6eb66d0..452525da24e 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -602,6 +602,7 @@ #define HAVE_SPATIAL 1 #define HAVE_RTREE_KEYS 1 #define HAVE_QUERY_CACHE 1 +#define BIG_TABLES 1 /* Important storage engines (those that really need define diff --git a/configure.cmake b/configure.cmake index 353d70aa571..7b64aa77061 100644 --- a/configure.cmake +++ b/configure.cmake @@ -660,8 +660,8 @@ CHECK_FUNCTION_EXISTS_UNIX(rdtscll HAVE_RDTSCLL) CHECK_SYMBOL_EXISTS_UNIX(sys_errlist "stdio.h" HAVE_SYS_ERRLIST) CHECK_SYMBOL_EXISTS_UNIX(madvise "sys/mman.h" HAVE_DECL_MADVISE) -CHECK_SYMBOL_EXISTS_UNIX(tzname "time.h" HAVE_TZNAME) -CHECK_SYMBOL_EXISTS(lrand48 "stdlib.h" HAVE_LRAND48) +CHECK_SYMBOL_EXISTS(tzname "time.h" HAVE_TZNAME) +CHECK_SYMBOL_EXISTS_UNIX(lrand48 "stdlib.h" HAVE_LRAND48) CHECK_SYMBOL_EXISTS_UNIX(getpagesize "unistd.h" HAVE_GETPAGESIZE) CHECK_SYMBOL_EXISTS_UNIX(TIOCGWINSZ "sys/ioctl.h" GWINSZ_IN_SYS_IOCTL) CHECK_SYMBOL_EXISTS_UNIX(FIONREAD "sys/ioctl.h" FIONREAD_IN_SYS_IOCTL) diff --git a/storage/example/CMakeLists.txt b/storage/example/CMakeLists.txt index 109f4bfa844..5a6f5d78c6b 100644 --- a/storage/example/CMakeLists.txt +++ b/storage/example/CMakeLists.txt @@ -15,4 +15,4 @@ SET(EXAMPLE_PLUGIN_DYNAMIC "ha_example") SET(EXAMPLE_SOURCES ha_example.cc) -MYSQL_ADD_PLUGIN(example ${EXAMPLE_SOURCES} STORAGE_ENGINE) +MYSQL_ADD_PLUGIN(example ${EXAMPLE_SOURCES} STORAGE_ENGINE MODULE_ONLY) |