List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:August 25 2011 6:26am
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4475 to 4476)
View as plain text  
 4476 Jonas Oreland	2011-08-25
      ndb - set ndb_index_stat_enable=TRUE in >= 7.2.0

    modified:
      sql/ha_ndbcluster.cc
 4475 Ole John Aske	2011-08-22
      Fix for SPJ regression introduced by revno4456 to branch 'mysql-5.1-telco-7.0'
      
      My previous 'correlation.patch' stores a TupleCorrelation (Uint32) together
      with each received row directly in the NdbReceiver buffer.
      
      This causes problem when there are RecAttr's in the received data.
      NdbReceiver has an assumption that everything not being a NdbRecord
      are NdbRecAttr in this buffer. It therefore try to parse this TupleCorrelation
      as a NdbRecAttr which will fail.
      
      Instead of storing the TupleCorrelations together with the row, we now
      allocate a separate array of TupleCorrelations as part of each NdbResultSet
      where the TupleCorrelations are stored.

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-07-23 14:38:08 +0000
+++ b/sql/ha_ndbcluster.cc	2011-08-25 06:25:01 +0000
@@ -164,6 +164,11 @@ static MYSQL_THDVAR_ULONG(
   0                                  /* block */
 );
 
+#if NDB_VERSION_D < NDB_MAKE_VERSION(7,2,0)
+#define DEFAULT_NDB_INDEX_STAT_ENABLE FALSE
+#else
+#define DEFAULT_NDB_INDEX_STAT_ENABLE TRUE
+#endif
 
 static MYSQL_THDVAR_BOOL(
   index_stat_enable,                 /* name */
@@ -171,7 +176,7 @@ static MYSQL_THDVAR_BOOL(
   "Use ndb index statistics in query optimization.",
   NULL,                              /* check func. */
   NULL,                              /* update func. */
-  FALSE                              /* default */
+  DEFAULT_NDB_INDEX_STAT_ENABLE      /* default */
 );
 
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4475 to 4476) Jonas Oreland25 Aug