summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMagnus Blåudd <magnus.blaudd@oracle.com>2011-02-21 11:15:29 +0100
committerMagnus Blåudd <magnus.blaudd@oracle.com>2011-02-21 11:15:29 +0100
commit4846dac064bf397ec99dcdcd140aa921ebe5553b (patch)
tree5928a58f02a8ef0480075be4dfbbe10fb3033c4f /include
parent95b4ff0081fe614eeba9d7fa60cb667477836c1c (diff)
downloadmariadb-git-4846dac064bf397ec99dcdcd140aa921ebe5553b.tar.gz
Remove last traces of HAVE_NDBCLUSTER_DB define - it has not had an effect in a long time and is just confusing.
At the same time backport the removal of OPT_NDB_CONNECTSTRING and OPT_NDBCLUSTER values from "enum options_client"
Diffstat (limited to 'include')
-rw-r--r--include/my_global.h1
-rw-r--r--include/mysql_embed.h1
2 files changed, 0 insertions, 2 deletions
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 */