Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb (45203857) · Commits · Software / OSDI20 Artifacts / mariadb

sql/ha_ndbcluster.cc

+2 −4

Original line number	Diff line number	Diff line
		@@ -2281,8 +2281,7 @@ int ha_ndbcluster::set_bounds(NdbIndexScanOperation *op,
		DBUG_PRINT("error", ("key %d unknown flag %d", j, p.key->flag));
		DBUG_ASSERT(FALSE);
		// Stop setting bounds but continue with what we have
		op->end_of_bound(range_no);
		DBUG_RETURN(0);
		DBUG_RETURN(op->end_of_bound(range_no));
		}
		}
		}
		@@ -2329,8 +2328,7 @@ int ha_ndbcluster::set_bounds(NdbIndexScanOperation *op,

		tot_len+= part_store_len;
		}
		op->end_of_bound(range_no);
		DBUG_RETURN(0);
		DBUG_RETURN(op->end_of_bound(range_no));
		}

		/*

+2 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,8 @@ class NdbScanOperation : public NdbOperation {
		public:
		/**
		* Scan flags. OR-ed together and passed as second argument to
		* readTuples.
		* readTuples. Note that SF_MultiRange has to be set if several
		* ranges (bounds) are to be passed.
		*/
		enum ScanFlag {
		SF_TupScan = (1 << 16), // scan TUP order

+8 −2

Original line number	Diff line number	Diff line
		@@ -1793,6 +1793,12 @@ NdbIndexScanOperation::reset_bounds(bool forceSend){
		int
		NdbIndexScanOperation::end_of_bound(Uint32 no)
		{
		DBUG_ENTER("end_of_bound");
		DBUG_PRINT("info", ("Range number %u", no));
		/* Check that SF_MultiRange has been specified if more
		than one range is specified */
		if (no > 0 && !m_multi_range)
		DBUG_RETURN(-1);
		if(no < (1 << 13)) // Only 12-bits no of ranges
		{
		Uint32 bound_head = * m_first_bound_word;
		@@ -1801,9 +1807,9 @@ NdbIndexScanOperation::end_of_bound(Uint32 no)

		m_first_bound_word = theKEYINFOptr + theTotalNrOfKeyWordInSignal;;
		m_this_bound_start = theTupKeyLen;
		return 0;
		DBUG_RETURN(0);
		}
		return -1;
		DBUG_RETURN(-1);
		}

		int