bzr commit into mysql-5.1-telco-6.4 tree (frazer:2699) Bug#37986

[Frazer Clement]

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

------------------------------------------------------------
revno: 2699
revision-id: frazer@stripped
parent: jonas@stripped
parent: frazer@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.4
timestamp: Wed 2008-08-06 16:46:41 +0100
message:
  Merge 6.3->6.4
modified:
  storage/ndb/src/ndbapi/NdbScanFilter.cpp
sp1f-ndbscanfilter.cpp-20040414082425-yqoh7jix4jq3puxfxrwibzt3dbe2lt7y
  storage/ndb/src/ndbapi/NdbScanOperation.cpp
sp1f-ndbscanoperation.cpp-20040414082425-yr5memqa2kvjbeg5kez5mhmsjkkzcxmz
  storage/ndb/src/ndbapi/NdbTransaction.cpp
sp1f-ndbconnection.cpp-20040414082424-ftc4cxrlno6yr3fmp3xzpp66xyx2x3kd
  storage/ndb/test/ndbapi/testScanFilter.cpp
sp1f-testscanfilter.cpp-20070301071331-mbylvv5isc5c5zatq2xbm4ffwvj4nt7h
  storage/ndb/test/run-test/daily-basic-tests.txt
sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
    ------------------------------------------------------------
    revno: 2585.7.21
    revision-id: frazer@stripped
    parent: jonas@stripped
    parent: frazer@stripped
    committer: Frazer Clement <frazer@stripped>
    branch nick: mysql-5.1-telco-6.3
    timestamp: Wed 2008-08-06 16:39:54 +0100
    message:
      Merge 6.2->6.3
    modified:
      storage/ndb/src/ndbapi/NdbScanFilter.cpp
sp1f-ndbscanfilter.cpp-20040414082425-yqoh7jix4jq3puxfxrwibzt3dbe2lt7y
      storage/ndb/src/ndbapi/NdbScanOperation.cpp
sp1f-ndbscanoperation.cpp-20040414082425-yr5memqa2kvjbeg5kez5mhmsjkkzcxmz
      storage/ndb/src/ndbapi/NdbTransaction.cpp
sp1f-ndbconnection.cpp-20040414082424-ftc4cxrlno6yr3fmp3xzpp66xyx2x3kd
      storage/ndb/test/ndbapi/testScanFilter.cpp
sp1f-testscanfilter.cpp-20070301071331-mbylvv5isc5c5zatq2xbm4ffwvj4nt7h
      storage/ndb/test/run-test/daily-basic-tests.txt
sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
    ------------------------------------------------------------
    revno: 2572.21.7
    revision-id: frazer@stripped
    parent: jonas@stripped
    committer: Frazer Clement <frazer@stripped>
    branch nick: mysql-5.1-telco-6.2
    timestamp: Wed 2008-08-06 16:33:19 +0100
    message:
      Bug# 37986 NDBAPI : ScanFilter defined before readTuples() call results in SEGV
      
      - Failure in ScanFilter constructor is not tested for sufficiently
      - Before readTuples() call, old Api scan incorrectly marked as NdbRecord scan
    modified:
      storage/ndb/src/ndbapi/NdbScanFilter.cpp
sp1f-ndbscanfilter.cpp-20040414082425-yqoh7jix4jq3puxfxrwibzt3dbe2lt7y
      storage/ndb/src/ndbapi/NdbScanOperation.cpp
sp1f-ndbscanoperation.cpp-20040414082425-yr5memqa2kvjbeg5kez5mhmsjkkzcxmz
      storage/ndb/src/ndbapi/NdbTransaction.cpp
sp1f-ndbconnection.cpp-20040414082424-ftc4cxrlno6yr3fmp3xzpp66xyx2x3kd
      storage/ndb/test/ndbapi/testScanFilter.cpp
sp1f-testscanfilter.cpp-20070301071331-mbylvv5isc5c5zatq2xbm4ffwvj4nt7h
      storage/ndb/test/run-test/daily-basic-tests.txt
sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6

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