List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:February 21 2011 11:35am
Subject:bzr commit into mysql-trunk branch (magnus.blaudd:3688)
View as plain text  
#At file:///home/msvensson/mysql/trunk/ based on revid:jorgen.loland@stripped

 3688 Magnus Blåudd	2011-02-21 [merge]
      Merge

    modified:
      include/my_global.h
      include/mysql_embed.h
      sql/ha_ndbcluster_cond.cc
=== modified file 'include/my_global.h'
--- a/include/my_global.h	2011-02-01 07:52:46 +0000
+++ b/include/my_global.h	2011-02-21 11:33:20 +0000
@@ -1485,7 +1485,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:38:42 +0000
+++ b/sql/ha_ndbcluster_cond.cc	2011-02-21 11:33:20 +0000
@@ -1471,4 +1471,4 @@ int ha_ndbcluster_cond::generate_scan_fi
   DBUG_RETURN(0);
 }
 
-#endif /* HAVE_NDBCLUSTER_DB */
+#endif

No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-trunk branch (magnus.blaudd:3688) Magnus Blåudd21 Feb