bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4120)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4120 Magnus Blåudd	2011-01-14
      ndb
       - add support for compiling with against new read range interface, i.e disable
        all read range code.

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_glue.h
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-01-14 14:37:28 +0000
+++ b/sql/ha_ndbcluster.cc	2011-01-14 15:12:39 +0000
@@ -10682,7 +10682,9 @@ ulonglong ha_ndbcluster::table_flags(voi
     HA_NULL_IN_KEY |
     HA_AUTO_PART_KEY |
     HA_NO_PREFIX_CHAR_KEYS |
+#ifndef NDB_WITH_NEW_MRR_INTERFACE
     HA_NEED_READ_RANGE_BUFFER |
+#endif
     HA_CAN_GEOMETRY |
     HA_CAN_BIT_FIELD |
     HA_PRIMARY_KEY_REQUIRED_FOR_POSITION |
@@ -11764,7 +11766,7 @@ int ha_ndbcluster::write_ndb_file(const
   DBUG_RETURN(error);
 }
 
-
+#ifndef NDB_WITH_NEW_MRR_INTERFACE
 bool 
 ha_ndbcluster::null_value_index_search(KEY_MULTI_RANGE *ranges,
 				       KEY_MULTI_RANGE *end_range,
@@ -11794,6 +11796,7 @@ ha_ndbcluster::null_value_index_search(K
   }
   DBUG_RETURN(FALSE);
 }
+#endif
 
 void ha_ndbcluster::check_read_before_write_removal()
 {
@@ -11834,7 +11837,7 @@ void ha_ndbcluster::check_read_before_wr
   DBUG_VOID_RETURN;
 }
 
-
+#ifndef NDB_WITH_NEW_MRR_INTERFACE
 /*
   This is used to check if an ordered index scan is needed for a range in
   a multi range read.
@@ -12424,6 +12427,7 @@ ha_ndbcluster::read_multi_range_fetch_ne
   }
   return 0;
 }
+#endif
 
 /**
   @param[in] comment  table comment defined by user

=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2011-01-14 14:15:54 +0000
+++ b/sql/ha_ndbcluster.h	2011-01-14 15:12:39 +0000
@@ -416,6 +416,7 @@ class ha_ndbcluster: public handler
   int read_range_next();
   int alter_tablespace(st_alter_tablespace *info);
 
+#ifndef NDB_WITH_NEW_MRR_INTERFACE
   /**
    * Multi range stuff
    */
@@ -426,6 +427,7 @@ class ha_ndbcluster: public handler
   bool null_value_index_search(KEY_MULTI_RANGE *ranges,
 			       KEY_MULTI_RANGE *end_range,
 			       HANDLER_BUFFER *buffer);
+#endif
 
   bool get_error_message(int error, String *buf);
   ha_rows records();

=== modified file 'sql/ha_ndbcluster_glue.h'
--- a/sql/ha_ndbcluster_glue.h	2011-01-14 14:37:28 +0000
+++ b/sql/ha_ndbcluster_glue.h	2011-01-14 15:12:39 +0000
@@ -320,4 +320,11 @@ bool mysql_truncate_table(THD *thd, TABL
 #endif
 }
 
+#if MYSQL_VERSION_ID >= 50600
+
+/* New multi range read interface replaced original mrr */
+#define NDB_WITH_NEW_MRR_INTERFACE
+
+#endif
+
 #endif

Attachment: [text/bzr-bundle] bzr/[e-mail]