Commit cef338ec authored by unknown's avatar unknown
Browse files

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


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
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
parents bc365a8b fd2c17db

mysql-test/r/ndb_read_multi_range.result

+7 −0
Original line number Diff line number Diff line
@@ -459,3 +459,10 @@ INSERT INTO t1 VALUES (1,1),(2,2),(3,3); 
UPDATE t1 SET var2 = 9 WHERE var1 IN(1,2,3);

DROP TRIGGER testtrigger;

DROP TABLE t1, t2;

create table t2 (a int, b int, primary key (a), key ab (a,b)) engine=ndbcluster;

insert into t2 values (1,1), (10,10);

select * from t2 use index (ab) where a in(1,10) order by a;

a	b

1	1

10	10

drop table t2;

mysql-test/t/ndb_read_multi_range.test

+9 −0
Original line number Diff line number Diff line
@@ -301,3 +301,12 @@ UPDATE t1 SET var2 = 9 WHERE var1 IN(1,2,3); 
DROP TRIGGER testtrigger;



DROP TABLE t1, t2;



#bug#25821

create table t2 (a int, b int, primary key (a), key ab (a,b)) engine=ndbcluster;



insert into t2 values (1,1), (10,10);



select * from t2 use index (ab) where a in(1,10) order by a;



drop table t2;

sql/ha_ndbcluster.cc

+1 −1
Original line number Diff line number Diff line
@@ -8231,7 +8231,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))

        {

storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp

+4 −2
Original line number Diff line number Diff line
@@ -64,12 +64,14 @@ public: 
                        bool order_by,

                        bool order_desc = false,

                        bool read_range_no = false,

			bool keyinfo = false) {

			bool keyinfo = false,

			bool multi_range = false) {

    Uint32 scan_flags =

      (SF_OrderBy & -(Int32)order_by) |

      (SF_Descending & -(Int32)order_desc) |

      (SF_ReadRangeNo & -(Int32)read_range_no) | 

      (SF_KeyInfo & -(Int32)keyinfo);

      (SF_KeyInfo & -(Int32)keyinfo) |

      (SF_MultiRange & -(Int32)multi_range);

    

    return readTuples(lock_mode, scan_flags, parallel, batch);

  }

storage/ndb/include/ndbapi/NdbScanOperation.hpp

+4 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ public: 
    SF_OrderBy = (1 << 24),     // index scan in order

    SF_Descending = (2 << 24),  // index scan in descending order

    SF_ReadRangeNo = (4 << 24), // enable @ref get_range_no

    SF_MultiRange = (8 << 24),  // scan is part of multi-range scan

    SF_KeyInfo = 1              // request KeyInfo to be sent back

  };
@@ -72,7 +73,8 @@ public: 
   */ 

#ifdef ndb_readtuples_impossible_overload

  int readTuples(LockMode lock_mode = LM_Read, 

		 Uint32 batch = 0, Uint32 parallel = 0, bool keyinfo = false);

		 Uint32 batch = 0, Uint32 parallel = 0, 

                 bool keyinfo = false, bool multi_range);

#endif

  

  inline int readTuples(int parallell){
@@ -264,6 +266,7 @@ protected: 
  bool m_descending;

  Uint32 m_read_range_no;

  NdbRecAttr *m_curr_row; // Pointer to last returned row

  bool m_multi_range; // Mark if operation is part of multi-range scan

  bool m_executed; // Marker if operation should be released at close

};