wl2126 - ndb - merge and ifdef still waiting for inge

sql/ha_ndbcluster.cc

@@ -4794,6 +4794,7 @@ int ha_ndbcluster::write_ndb_file()
   DBUG_RETURN(error);
 }
 
+#ifdef key_multi_range
 int
 ha_ndbcluster::read_multi_range_first(key_multi_range **found_range_p,
 				      key_multi_range *ranges, 
@@ -5135,5 +5136,6 @@ ha_ndbcluster::setup_recattr(const NdbRecAttr* curr)
   
   DBUG_RETURN(0);
 }
+#endif
 
 #endif /* HAVE_NDBCLUSTER_DB */

sql/ha_ndbcluster.h

@@ -113,10 +113,10 @@ class ha_ndbcluster: public handler
   /**
    * Multi range stuff
    */
-  int read_multi_range_first(key_multi_range **found_range_p,
-			     key_multi_range *ranges, uint range_count,
-			     bool sorted, handler_buffer *buffer);
-  int read_multi_range_next(key_multi_range **found_range_p);
+  int read_multi_range_first(struct key_multi_range **found_range_p,
+			     struct key_multi_range *ranges, uint range_count,
+			     bool sorted, struct handler_buffer *buffer);
+  int read_multi_range_next(struct key_multi_range **found_range_p);
 
   bool get_error_message(int error, String *buf);
   void info(uint);