diff options
| author | unknown <mskold/marty@linux.site> | 2007-02-06 23:42:24 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@linux.site> | 2007-02-06 23:42:24 +0100 |
| commit | b7b6961fe94c75a8935f38fa54bdbc188bbd495e (patch) | |
| tree | e55ecea94295fde0e0eea35eeca866650b41de23 /sql/ha_ndbcluster.cc | |
| parent | 38e5b80b1ca83b22806c2d475d1cb9464cf0a23d (diff) | |
| parent | 8e60d0b07cd8a8d88da2d15cab2e3d90d2b4857b (diff) | |
| download | mariadb-git-b7b6961fe94c75a8935f38fa54bdbc188bbd495e.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/r/ndb_read_multi_range.result:
Auto merged
mysql-test/t/ndb_read_multi_range.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
SCCS merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index a9fc74e8343..18fd49b4115 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -8066,7 +8066,7 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p, } else if ((scanOp= m_active_trans->getNdbIndexScanOperation(idx, tab)) &&!scanOp->readTuples(lm, 0, parallelism, sorted, - FALSE, TRUE, need_pk) + FALSE, TRUE, need_pk, TRUE) &&!generate_scan_filter(m_cond_stack, scanOp) &&!define_read_attrs(end_of_buffer-reclength, scanOp)) { |