diff options
| author | Magnus Blåudd <magnus.blaudd@oracle.com> | 2011-02-21 12:47:27 +0100 |
|---|---|---|
| committer | Magnus Blåudd <magnus.blaudd@oracle.com> | 2011-02-21 12:47:27 +0100 |
| commit | c96018458402a12c0aa129a1e29d2aa8ce105405 (patch) | |
| tree | c2787facf98f4bdb5c0a926d2547fd54ddf9f507 | |
| parent | 5d42003fbd50d5480da3393fa6b2b2ea88ac8317 (diff) | |
| parent | 6ae9c15048cc163a583001669ec1c33fd41db84c (diff) | |
| download | mariadb-git-c96018458402a12c0aa129a1e29d2aa8ce105405.tar.gz | |
Merge
| -rw-r--r-- | client/client_priv.h | 3 | ||||
| -rw-r--r-- | include/my_global.h | 1 | ||||
| -rw-r--r-- | include/mysql_embed.h | 1 | ||||
| -rw-r--r-- | sql/ha_ndbcluster_cond.cc | 2 |
4 files changed, 1 insertions, 6 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index cc589e55d52..0652444be64 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -50,9 +50,6 @@ enum options_client OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_SERVER_ARG, OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME, OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY, OPT_COUNT, -#ifdef HAVE_NDBCLUSTER_DB - OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING, -#endif OPT_TRIGGERS, OPT_MYSQL_ONLY_PRINT, OPT_MYSQL_LOCK_DIRECTORY, diff --git a/include/my_global.h b/include/my_global.h index c1ae8a6d6bc..02f4eb596d0 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1476,7 +1476,6 @@ static inline double rint(double x) #undef HAVE_OPENSSL #undef HAVE_SMEM /* No shared memory */ -#undef HAVE_NDBCLUSTER_DB /* No NDB cluster */ #endif /* EMBEDDED_LIBRARY */ diff --git a/include/mysql_embed.h b/include/mysql_embed.h index e860a4486eb..3b6f851bd6f 100644 --- a/include/mysql_embed.h +++ b/include/mysql_embed.h @@ -25,7 +25,6 @@ #undef HAVE_DLOPEN /* No udf functions */ #undef HAVE_SMEM /* No shared memory */ -#undef HAVE_NDBCLUSTER_DB /* No NDB cluster */ #endif /* EMBEDDED_LIBRARY */ #endif /* MYSQL_EMBED_INCLUDED */ diff --git a/sql/ha_ndbcluster_cond.cc b/sql/ha_ndbcluster_cond.cc index 8a96ae41453..9ab7fb6208d 100644 --- a/sql/ha_ndbcluster_cond.cc +++ b/sql/ha_ndbcluster_cond.cc @@ -1472,4 +1472,4 @@ int ha_ndbcluster_cond::generate_scan_filter_from_key(NdbScanOperation *op, DBUG_RETURN(0); } -#endif /* HAVE_NDBCLUSTER_DB */ +#endif |