summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2009-12-15 20:23:55 +0300
committerSergey Petrunya <psergey@askmonty.org>2009-12-15 20:23:55 +0300
commit59b64720102f8f4f43c856f1e9c2ba2007156b18 (patch)
tree16ea30fc86361b17dd05766e4aaf9b4b12275c09 /sql/ha_ndbcluster.cc
parent2a496c4dcfaa715588fa48009b7779d38b1a137a (diff)
downloadmariadb-git-59b64720102f8f4f43c856f1e9c2ba2007156b18.tar.gz
Backport into MariaDB-5.2 the following:
WL#2474 "Multi Range Read: Change the default MRR implementation to implement new MRR interface" WL#2475 "Batched range read functions for MyISAM/InnoDb" "Index condition pushdown for MyISAM/InnoDB" - Adjust test results (checked) - Code cleanup.
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r--sql/ha_ndbcluster.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index c6b48c5b744..edfec934b2a 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -8702,6 +8702,8 @@ ha_ndbcluster::null_value_index_search(KEY_MULTI_RANGE *ranges,
DBUG_RETURN(FALSE);
}
+#if 0
+/* MRR/NDB is disabled, for details see method declarations in ha_ndbcluster.h */
int
ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p,
KEY_MULTI_RANGE *ranges,
@@ -9074,6 +9076,7 @@ found_next:
m_multi_range_result_ptr += reclength;
DBUG_RETURN(0);
}
+#endif
int
ha_ndbcluster::setup_recattr(const NdbRecAttr* curr)