List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:February 21 2011 10:15am
Subject:bzr commit into mysql-5.5 branch (magnus.blaudd:3350)
View as plain text  
#At file:///home/msvensson/mysql/remove_have_ndbcluster_db/5.5/ based on revid:sergey.vojtovich@stripped1081756-ucxoybax7mqwf209

 3350 Magnus Blåudd	2011-02-21
      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"

    modified:
      client/client_priv.h
      include/my_global.h
      include/mysql_embed.h
      sql/ha_ndbcluster_cond.cc
=== modified file 'client/client_priv.h'
--- a/client/client_priv.h	2011-01-16 03:59:05 +0000
+++ b/client/client_priv.h	2011-02-21 10:15:29 +0000
@@ -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,

=== modified file 'include/my_global.h'
--- a/include/my_global.h	2011-01-11 09:07:37 +0000
+++ b/include/my_global.h	2011-02-21 10:15:29 +0000
@@ -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 */
 

=== modified file 'include/mysql_embed.h'
--- a/include/mysql_embed.h	2010-11-09 14:53:53 +0000
+++ b/include/mysql_embed.h	2011-02-21 10:15:29 +0000
@@ -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 */

=== modified file 'sql/ha_ndbcluster_cond.cc'
--- a/sql/ha_ndbcluster_cond.cc	2010-08-14 09:11:33 +0000
+++ b/sql/ha_ndbcluster_cond.cc	2011-02-21 10:15:29 +0000
@@ -1472,4 +1472,4 @@ int ha_ndbcluster_cond::generate_scan_fi
   DBUG_RETURN(0);
 }
 
-#endif /* HAVE_NDBCLUSTER_DB */
+#endif

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110221101529-e7t23w37oj6c7cva.bundle
Thread
bzr commit into mysql-5.5 branch (magnus.blaudd:3350) Magnus Blåudd21 Feb