bzr commit into mysql-5.1-telco-6.4 tree (frazer:2631) Bug#37158

[Frazer Clement]

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

------------------------------------------------------------
revno: 2631
revision-id: frazer@stripped
parent: frazer@stripped
parent: jonas@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.4
timestamp: Wed 2008-06-04 14:57:16 +0100
message:
  Merge
modified:
  storage/ndb/src/ndbapi/NdbTransaction.cpp
sp1f-ndbconnection.cpp-20040414082424-ftc4cxrlno6yr3fmp3xzpp66xyx2x3kd
  storage/ndb/src/ndbapi/TransporterFacade.cpp
sp1f-transporterfacade.cp-20040414082425-7g53fpp472t6eqf5c2az33qijwsnwr5r
  storage/ndb/test/ndbapi/testDict.cpp
sp1f-testdict.cpp-20040414082437-up57fojv5zipbzkv3mijrxhignscrlpl
  storage/ndb/test/ndbapi/testNdbApi.cpp
sp1f-testndbapi.cpp-20040414082437-mjif6fqfd5ohitwss3gjohzfn6pzn3sg
  storage/ndb/test/run-test/daily-basic-tests.txt
sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
    ------------------------------------------------------------
    revno: 2629.1.2
    revision-id: jonas@stripped
    parent: jonas@stripped
    committer: jonas@stripped
    branch nick: telco-6.4
    timestamp: Wed 2008-06-04 13:36:09 +0200
    message:
      ndb -
       add missing test prg (FailCreateHashmap)
       that got lost in bzr merge confusion
    modified:
      storage/ndb/test/ndbapi/testDict.cpp
sp1f-testdict.cpp-20040414082437-up57fojv5zipbzkv3mijrxhignscrlpl
    ------------------------------------------------------------
    revno: 2629.1.1
    revision-id: jonas@stripped
    parent: monty@stripped
    parent: jonas@stripped
    committer: jonas@stripped
    branch nick: telco-6.4
    timestamp: Tue 2008-06-03 18:28:09 +0200
    message:
      merge
    modified:
      storage/ndb/src/ndbapi/NdbTransaction.cpp
sp1f-ndbconnection.cpp-20040414082424-ftc4cxrlno6yr3fmp3xzpp66xyx2x3kd
      storage/ndb/src/ndbapi/TransporterFacade.cpp
sp1f-transporterfacade.cp-20040414082425-7g53fpp472t6eqf5c2az33qijwsnwr5r
      storage/ndb/test/ndbapi/testNdbApi.cpp
sp1f-testndbapi.cpp-20040414082437-mjif6fqfd5ohitwss3gjohzfn6pzn3sg
      storage/ndb/test/run-test/daily-basic-tests.txt
sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
    ------------------------------------------------------------
    revno: 2585.4.1
    revision-id: jonas@stripped
    parent: monty@stripped
    parent: jonas@stripped
    committer: jonas@stripped
    branch nick: telco-6.3
    timestamp: Tue 2008-06-03 18:18:01 +0200
    message:
      merge
    modified:
      storage/ndb/src/ndbapi/NdbTransaction.cpp
sp1f-ndbconnection.cpp-20040414082424-ftc4cxrlno6yr3fmp3xzpp66xyx2x3kd
      storage/ndb/test/ndbapi/testNdbApi.cpp
sp1f-testndbapi.cpp-20040414082437-mjif6fqfd5ohitwss3gjohzfn6pzn3sg
      storage/ndb/test/run-test/daily-basic-tests.txt
sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
    ------------------------------------------------------------
    revno: 2572.18.1
    revision-id: jonas@stripped
    parent: monty@stripped
    committer: jonas@stripped
    branch nick: telco-6.2
    timestamp: Tue 2008-06-03 14:37:17 +0200
    message:
      ndb - bug#37158
        ndbapi could get confused if tckeyref/tckeyconf came in not common
          order
    modified:
      storage/ndb/src/ndbapi/NdbTransaction.cpp
sp1f-ndbconnection.cpp-20040414082424-ftc4cxrlno6yr3fmp3xzpp66xyx2x3kd
      storage/ndb/test/ndbapi/testNdbApi.cpp
sp1f-testndbapi.cpp-20040414082437-mjif6fqfd5ohitwss3gjohzfn6pzn3sg
      storage/ndb/test/run-test/daily-basic-tests.txt
sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6

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