bzr commit into mysql-5.1 tree (frazer:2706) Bug#38717

[Frazer Clement]

#At file:///home/frazer/bzr/mysql-5.1-telco-6.4/

------------------------------------------------------------
revno: 2706
revision-id: frazer@stripped
parent: jonas@stripped
parent: frazer@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.4
timestamp: Mon 2008-08-11 13:51:32 +0100
message:
  Merge 6.3->6.4
modified:
  storage/ndb/include/ndbapi/NdbScanOperation.hpp
sp1f-ndbscanoperation.hpp-20040414082357-fjxe5xe43jqfor2px56dwicnrkjwc2kz
  storage/ndb/src/ndbapi/NdbScanOperation.cpp
sp1f-ndbscanoperation.cpp-20040414082425-yr5memqa2kvjbeg5kez5mhmsjkkzcxmz
    ------------------------------------------------------------
    revno: 2585.10.7
    revision-id: frazer@stripped
    parent: jonas@stripped
    parent: frazer@stripped
    committer: Frazer Clement <frazer@stripped>
    branch nick: mysql-5.1-telco-6.3
    timestamp: Mon 2008-08-11 13:46:21 +0100
    message:
      Merge 6.2->6.3
    modified:
      storage/ndb/include/ndbapi/NdbScanOperation.hpp
sp1f-ndbscanoperation.hpp-20040414082357-fjxe5xe43jqfor2px56dwicnrkjwc2kz
      storage/ndb/src/ndbapi/NdbScanOperation.cpp
sp1f-ndbscanoperation.cpp-20040414082425-yr5memqa2kvjbeg5kez5mhmsjkkzcxmz
    ------------------------------------------------------------
    revno: 2572.21.12
    revision-id: frazer@stripped
    parent: jonas@stripped
    committer: Frazer Clement <frazer@stripped>
    branch nick: mysql-5.1-telco-6.2
    timestamp: Mon 2008-08-11 13:44:24 +0100
    message:
      Bug#38717 readTuples() can be called > once
      
      Add state to NdbScanOperation to determine whether readTuples() has already been
called.
    modified:
      storage/ndb/include/ndbapi/NdbScanOperation.hpp
sp1f-ndbscanoperation.hpp-20040414082357-fjxe5xe43jqfor2px56dwicnrkjwc2kz
      storage/ndb/src/ndbapi/NdbScanOperation.cpp
sp1f-ndbscanoperation.cpp-20040414082425-yr5memqa2kvjbeg5kez5mhmsjkkzcxmz

Attachment: [text/text/x-diff] patch-2706.diff