bzr commit into mysql-5.1 tree (frazer:2734) Bug#39026, Bug#39036, Bug#39038, WL#4258

[Frazer Clement]

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

------------------------------------------------------------
revno: 2734
revision-id: frazer@stripped
parent: frazer@stripped
parent: frazer@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.4-wl4258
timestamp: Tue 2008-08-26 22:32:47 +0100
message:
  Merge
modified:
  mysql-test/mysql-test-run.pl  
sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh3
  storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
sp1f-ndbindexscanoperatio-20040526093855-tiiep5fhck6uukkvxquaq5jtbzjcssp2
  storage/ndb/include/transporter/TransporterDefinitions.hpp
sp1f-transporterdefinitio-20040414082357-xfma5ydgnsxiqj7b26ujjg2gw6mevrqw
  storage/ndb/src/common/transporter/TCP_Transporter.cpp
sp1f-tcp_transporter.cpp-20040414082412-dt2akzuysvsvrqj52hh2yt5dvgkgnpui
  storage/ndb/test/run-test/atrt-backtrace.sh
atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
    ------------------------------------------------------------
    revno: 2585.13.2
    revision-id: frazer@stripped
    parent: frazer@stripped
    parent: jonas@stripped
    committer: Frazer Clement <frazer@stripped>
    branch nick: mysql-5.1-telco-6.3
    timestamp: Tue 2008-08-26 17:15:12 +0100
    message:
      merge
    added:
      storage/ndb/test/run-test/atrt-backtrace.sh
atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
    modified:
      configure.in                  
sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
      mysql-test/mysql-test-run.pl  
sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh3
      storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
sp1f-ndbindexscanoperatio-20040526093855-tiiep5fhck6uukkvxquaq5jtbzjcssp2
      storage/ndb/src/common/transporter/TCP_Transporter.cpp
sp1f-tcp_transporter.cpp-20040414082412-dt2akzuysvsvrqj52hh2yt5dvgkgnpui
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
sp1f-dblqhmain.cpp-20040414082419-5mtvgr6eg47fgddawjjch74crdnaduvi
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
sp1f-dbtcmain.cpp-20040414082419-hh3omoivivmmi47yllfxfooxzvblqwla
      storage/ndb/src/kernel/blocks/restore.cpp
sp1f-restore.cpp-20051107111915-wup46rfclbtuhipt56ql64jhvw6z25fs
      storage/ndb/src/mgmapi/mgmapi.cpp
sp1f-mgmapi.cpp-20040414082423-a7k5lrztnpv2cjaqrchghgsmiwt2smhv
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
sp1f-mgmtsrvr.cpp-20040414082424-umdpuhoopirhdgpnkjsxfutesv45x3kn
      storage/ndb/src/ndbapi/NdbScanOperation.cpp
sp1f-ndbscanoperation.cpp-20040414082425-yr5memqa2kvjbeg5kez5mhmsjkkzcxmz
      storage/ndb/test/ndbapi/testIndex.cpp
sp1f-testindex.cpp-20040414082437-zfarvzzo5k654cznuxnv455imfhz3cbd
      storage/ndb/test/ndbapi/testNodeRestart.cpp
sp1f-testnoderestart.cpp-20040414082437-etfhgguaz47l6ipytlcbazdgfr7avgh3
      storage/ndb/test/ndbapi/testSystemRestart.cpp
sp1f-testsystemrestart.cp-20040414082438-t5ula3y3jcg3cs6hqyti5pdnhkhtglha
      storage/ndb/test/run-test/Makefile.am
sp1f-makefile.am-20040526111411-l4ppdj636zpq7aeuphj2i5kst5izlawe
      storage/ndb/test/run-test/atrt-analyze-result.sh
sp1f-atrtanalyzeresult.sh-20040414082440-h22jyrpvwqov3z7423ipibvlv266miuk
      storage/ndb/test/run-test/files.cpp
sp1f-files.cpp-20070213013848-m3ns747totrda5ytxbxh74x5lxdw2xv2
        ------------------------------------------------------------
        revno: 2585.11.24
        revision-id: jonas@stripped
        parent: jonas@stripped
        parent: tomas.ulin@stripped
        committer: Jonas Oreland <jonas@stripped>
        branch nick: telco-6.3
        timestamp: Tue 2008-08-26 12:10:22 +0200
        message:
          merge
        modified:
          mysql-test/mysql-test-run.pl  
sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh3
            ------------------------------------------------------------
            revno: 2585.14.1
            revision-id: tomas.ulin@stripped
            parent: jonas@stripped
            committer: Tomas Ulin <tomas.ulin@stripped>
            branch nick: cge-6.3-issue-27036
            timestamp: Tue 2008-08-26 12:05:18 +0200
            message:
              bug#39026
            modified:
              mysql-test/mysql-test-run.pl  
sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh3
        ------------------------------------------------------------
        revno: 2585.11.23
        revision-id: jonas@stripped
        parent: jonas@stripped
        parent: jonas@stripped
        committer: Jonas Oreland <jonas@stripped>
        branch nick: telco-6.3
        timestamp: Tue 2008-08-26 12:08:29 +0200
        message:
          merge 6.2 to 6.3
        modified:
          storage/ndb/src/common/transporter/TCP_Transporter.cpp
sp1f-tcp_transporter.cpp-20040414082412-dt2akzuysvsvrqj52hh2yt5dvgkgnpui
          storage/ndb/test/run-test/atrt-backtrace.sh
atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
            ------------------------------------------------------------
            revno: 2572.21.33
            revision-id: jonas@stripped
            parent: jonas@stripped
            committer: Jonas Oreland <jonas@stripped>
            branch nick: telco-6.2
            timestamp: Tue 2008-08-26 12:03:43 +0200
            message:
              ndb - bug#39038 - compile error on HP-UX
            modified:
              storage/ndb/src/common/transporter/TCP_Transporter.cpp
sp1f-tcp_transporter.cpp-20040414082412-dt2akzuysvsvrqj52hh2yt5dvgkgnpui
            ------------------------------------------------------------
            revno: 2572.21.32
            revision-id: jonas@stripped
            parent: jonas@stripped
            committer: Jonas Oreland <jonas@stripped>
            branch nick: telco-6.2
            timestamp: Mon 2008-08-25 09:57:58 +0200
            message:
              ndb - atrt bt - more typos / printouts
            modified:
              storage/ndb/test/run-test/atrt-backtrace.sh
atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
        ------------------------------------------------------------
        revno: 2585.11.22
        revision-id: jonas@stripped
        parent: jonas@stripped
        committer: Jonas Oreland <jonas@stripped>
        branch nick: telco-6.3
        timestamp: Tue 2008-08-26 12:07:22 +0200
        message:
          ndb - bug#39036 - compile error with forte
        modified:
          storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
sp1f-ndbindexscanoperatio-20040526093855-tiiep5fhck6uukkvxquaq5jtbzjcssp2
        ------------------------------------------------------------
        revno: 2585.11.21
        revision-id: jonas@stripped
        parent: jonas@stripped
        parent: jonas@stripped
        committer: Jonas Oreland <jonas@stripped>
        branch nick: telco-6.3
        timestamp: Sun 2008-08-24 23:49:34 +0200
        message:
          merge 6.2 to 6.3
        modified:
          storage/ndb/test/run-test/atrt-backtrace.sh
atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
        ------------------------------------------------------------
        revno: 2572.21.31
        revision-id: jonas@stripped
        parent: jonas@stripped
        committer: Jonas Oreland <jonas@stripped>
        branch nick: telco-6.2
        timestamp: Sun 2008-08-24 23:49:05 +0200
        message:
          ndb - atrt bt - more typos
        modified:
          storage/ndb/test/run-test/atrt-backtrace.sh
atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
    ------------------------------------------------------------
    revno: 2585.13.1
    revision-id: frazer@stripped
    parent: tomas.ulin@stripped
    committer: Frazer Clement <frazer@stripped>
    branch nick: mysql-5.1-telco-6.3
    timestamp: Tue 2008-08-26 15:12:34 +0100
    message:
      WL4258 Long Signal Transactions
      
      Prepare 6.3 for upgrade with 6.4.0 by adding support for receiving signals up to
32kB
    modified:
      storage/ndb/include/transporter/TransporterDefinitions.hpp
sp1f-transporterdefinitio-20040414082357-xfma5ydgnsxiqj7b26ujjg2gw6mevrqw
      storage/ndb/src/common/transporter/Packer.cpp
sp1f-packer.cpp-20040414082411-jynqrpascvu2tjijvflf45opj26whft2
      storage/ndb/src/common/transporter/SHM_Transporter.cpp
sp1f-shm_transporter.cpp-20040414082412-xprc7in3wmoqf3h5beq4cf75yvbqv7fm
      storage/ndb/src/common/transporter/SendBuffer.cpp
sp1f-sendbuffer.cpp-20040414082412-bds6q7ilhv4xae7javuuwyilbxlw7zyc
      storage/ndb/src/common/transporter/TCP_Transporter.cpp
sp1f-tcp_transporter.cpp-20040414082412-dt2akzuysvsvrqj52hh2yt5dvgkgnpui
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
sp1f-transporterregistry.-20040414082412-kmsf342l5o4sodfonfdwdd3pobckcn6r
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
sp1f-dbtupexecquery.cpp-20040414082419-mq6uenb66nxl6kcdp3v27evwjkcs2ttz

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