List:Commits« Previous MessageNext Message »
From:jonas oreland Date:March 30 2011 11:28am
Subject:bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3464)
View as plain text  
#At file:///home/jonas/src/70-spj-svs/ based on revid:jonas@stripped

 3464 jonas oreland	2011-03-30
      ndb - change #ifdef 7.2 as forte is poor at nested macros

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-03-30 10:54:30 +0000
+++ b/sql/ha_ndbcluster.cc	2011-03-30 11:28:05 +0000
@@ -250,19 +250,25 @@ static MYSQL_THDVAR_UINT(
   0                                  /* block */
 );
 
+#if NDB_VERSION_D < NDB_MAKE_VERSION(7,2,0)
 static MYSQL_THDVAR_BOOL(
   join_pushdown,                     /* name */
   PLUGIN_VAR_OPCMDARG,
   "Enable pushing down of join to datanodes",
   NULL,                              /* check func. */
   NULL,                              /* update func. */
-#if NDB_VERSION_D < NDB_MAKE_VERSION(7,2,0)
   FALSE                              /* default */
+);
 #else
-  TRUE
-#endif
+static MYSQL_THDVAR_BOOL(
+  join_pushdown,                     /* name */
+  PLUGIN_VAR_OPCMDARG,
+  "Enable pushing down of join to datanodes",
+  NULL,                              /* check func. */
+  NULL,                              /* update func. */
+  TRUE                               /* default */
 );
-
+#endif
 /*
   Default value for max number of transactions createable against NDB from
   the handler. Should really be 2 but there is a transaction to much allocated


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20110330112805-0lkovf7c9in2lfi2.bundle
Thread
bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3464) jonas oreland30 Mar
  • Re: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3464)Magnus BlĂ„udd1 Apr