List:Commits« Previous MessageNext Message »
From:Frazer Clement Date:August 4 2008 12:56pm
Subject:bzr commit into mysql-5.1-telco-6.4 tree (frazer:2667) Bug#33801, Bug#38204,
Bug#38424, WL#4258, WL#4350, WL#4391
View as plain text  
#At file:///home/frazer/bzr/mysql-5.1-telco-6.4-wl4258/

------------------------------------------------------------
revno: 2667
revision-id: frazer@stripped
parent: frazer@stripped
parent: jonas@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.4-wl4258
timestamp: Mon 2008-08-04 11:55:38 +0100
message:
  Merge with 6.4
removed:
  storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp
sp1f-mgmterrorreporter.hp-20040414082356-ypc4tzcq57igljep5rcilws3jftzbsos
added:
  storage/ndb/src/kernel/blocks/LocalProxy.cpp
localproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-1
  storage/ndb/src/kernel/blocks/LocalProxy.hpp
localproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-2
  storage/ndb/src/kernel/blocks/RestoreProxy.cpp
restoreproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-3
  storage/ndb/src/kernel/blocks/RestoreProxy.hpp
restoreproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-4
  storage/ndb/src/kernel/blocks/backup/BackupProxy.cpp
backupproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-5
  storage/ndb/src/kernel/blocks/backup/BackupProxy.hpp
backupproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-6
  storage/ndb/src/kernel/blocks/dbacc/DbaccProxy.cpp
dbaccproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-7
  storage/ndb/src/kernel/blocks/dbacc/DbaccProxy.hpp
dbaccproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-8
  storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp
dblqhproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-9
  storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.hpp
dblqhproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-10
  storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp
dbtupproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-11
  storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.hpp
dbtupproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-12
  storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp
dbtuxproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-13
  storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp
dbtuxproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-14
  storage/ndb/src/kernel/vm/GlobalData.cpp
globaldata.cpp-20080724175149-az4v3k190hw2zash-1
  storage/ndb/src/kernel/vm/dummy_nonmt.cpp
dummy_nonmt.cpp-20080724175149-az4v3k190hw2zash-2
modified:
  configure.in                  
sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
  mysql-test/suite/ndb/r/ndb_restore.result
sp1f-ndb_restore.result-20050124120423-ikn2jquomq3l4r4jmsadf4bb4ubekggm
  mysql-test/suite/ndb/r/ndb_restore_compressed.result
sp1f-ndb_restore_compress-20071115002850-roep5gkz5e6a5e7ewyh6cqzbyu2licaa
  mysql-test/suite/ndb/t/ndb_restore.test
sp1f-ndb_restore.test-20050124120415-cmxrdjwp26ayjgcbnwb7byz3yrcwg6u4
  storage/ndb/include/debugger/SignalLoggerManager.hpp
sp1f-signalloggermanager.-20040414082352-ejwi3wuo6ntjtsaf73tn4i22cx62uzv2
  storage/ndb/include/kernel/RefConvert.hpp
sp1f-refconvert.hpp-20040414082352-t3eghomxdl4dxvbcscs5qfwtwaqc34yh
  storage/ndb/include/kernel/kernel_config_parameters.h
sp1f-kernel_config_parame-20040526094908-qzsfgcuznm43jcp5blf4pykn343x6hnu
  storage/ndb/include/kernel/kernel_types.h
sp1f-kernel_types.h-20040414082352-hkq7rmddazrpe7newecec7zjlu4sogjq
  storage/ndb/include/kernel/ndb_limits.h
sp1f-ndb_limits.h-20040414082352-7fj33ex7vj432a27xhswhbspi7gsvvmz
  storage/ndb/src/common/debugger/SignalLoggerManager.cpp
sp1f-signalloggermanager.-20040414082407-ghznr5a27ecv5umwswewhu6o5lod3jyl
  storage/ndb/src/common/logger/Logger.cpp
sp1f-logger.cpp-20040414082409-kn6olfcuk4ejsciiqn6mp7yygbokpvxa
  storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
sp1f-configretriever.cpp-20040414082410-k5hty5ou25dt7chktmzxcaoxv2jdprvf
  storage/ndb/src/common/portlib/NdbCondition.c
sp1f-ndbcondition.c-20040414082410-sxbad7hgbi3haxoijl2nsmgwbcvrkks4
  storage/ndb/src/common/transporter/TransporterRegistry.cpp
sp1f-transporterregistry.-20040414082412-kmsf342l5o4sodfonfdwdd3pobckcn6r
  storage/ndb/src/kernel/SimBlockList.cpp
sp1f-simblocklist.cpp-20040414082422-l2wn2wqhsxgjo46wre4pkp4ba56amu2e
  storage/ndb/src/kernel/blocks/Makefile.am
sp1f-makefile.am-20040525095509-7ss3m3ydkvsa4gumomc6m3ez4jn5r65k
  storage/ndb/src/kernel/blocks/backup/Backup.hpp
sp1f-backup.hpp-20040414082418-euc24xpkx33vvubci2qx7xxxesejnarm
  storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
sp1f-backupinit.cpp-20040414082418-pl6lxqyhnsw3wemybj4cxsunfybye43t
  storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
sp1f-dbacc.hpp-20040414082418-tyxbxrc22s6pnc3zcfd6fwglajikiwzz
  storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
sp1f-dbaccinit.cpp-20040414082418-ncwzaahgqlxcybiygexebsgwc5t3aheg
  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
sp1f-dbdict.cpp-20040414082418-iodilitk75ncp4kj2matmhrutqp6ztdo
  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
sp1f-dbdict.hpp-20040414082418-gwtkbqf7bvvqo4zc4b7taupdvcv5ngby
  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
sp1f-dbdih.hpp-20040414082419-kqfnl6h3q4y365sqvodrfkj6yiksuvbl
  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
sp1f-dbdihmain.cpp-20040414082419-ixmi74kjghkfaowxplxf33dygxuu6dma
  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
sp1f-dblqh.hpp-20040414082419-6mgkxaewhwzt5iipa75dwwl6antoikoa
  storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
sp1f-dblqhinit.cpp-20040414082419-jc2dm7yelabrtwbvuh3aejte6tb4a2jf
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
sp1f-dblqhmain.cpp-20040414082419-5mtvgr6eg47fgddawjjch74crdnaduvi
  storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
sp1f-dbtup.hpp-20040414082419-idobqlb5css6uzs7wsmex3judi7tw5e5
  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
sp1f-dbtupgen.cpp-20040414082419-gthvzvbzhvmti2c6o5f7jsqyahpdoycy
  storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
sp1f-dbtux.hpp-20040414082420-gkdow3inwhzmqmmln4ysglr2mn7kxs62
  storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
sp1f-dbtuxgen.cpp-20040414082420-vnbbipvn5hjzx66u4qvhmdnqn6wesb7t
  storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp
sp1f-posixasyncfile.cpp-20071115002958-h6h4wqx64vkrfed3ekvwqvt646q3bm7w
  storage/ndb/src/kernel/blocks/restore.cpp
sp1f-restore.cpp-20051107111915-wup46rfclbtuhipt56ql64jhvw6z25fs
  storage/ndb/src/kernel/blocks/restore.hpp
sp1f-restore.hpp-20051107111915-hksgj7v5an4bmv4hnbibwkqhl5joktrw
  storage/ndb/src/kernel/main.cpp
sp1f-main.cpp-20040414082422-ifhdrjyod62azjl4peccmcmjokvsy3na
  storage/ndb/src/kernel/vm/Configuration.cpp
sp1f-configuration.cpp-20040414082422-ck3k52a6ia33sex2lui5ar4kbkdzaunm
  storage/ndb/src/kernel/vm/GlobalData.hpp
sp1f-globaldata.hpp-20040414082422-euei3clbawzgmwkn3qh3wecflopaxadq
  storage/ndb/src/kernel/vm/Makefile.am
sp1f-makefile.am-20040525095509-jmojzf2t5j2ur4kwkalsjs5nkzbbh7bb
  storage/ndb/src/kernel/vm/SimulatedBlock.cpp
sp1f-simulatedblock.cpp-20040414082423-ygh3kx5ve2xbpfctceugfdnemzczawx6
  storage/ndb/src/kernel/vm/SimulatedBlock.hpp
sp1f-simulatedblock.hpp-20040414082423-tyictvcz5wwr7e7frsog4lkct4zxrvsv
  storage/ndb/src/kernel/vm/TransporterCallback.cpp
sp1f-transportercallback.-20040414082423-orvgt4lovbdsqu5gjdkhc6oefovmavrk
  storage/ndb/src/kernel/vm/mt.cpp
sp1f-mt.cpp-20080101124507-dcic7nm7bej4f37qv3kb4gjt44peijez
  storage/ndb/src/kernel/vm/mt.hpp
sp1f-mt.hpp-20080101124507-tv3rozwnrp6yamtfxskndxfgafnyq5bw
  storage/ndb/src/mgmapi/mgmapi.cpp
sp1f-mgmapi.cpp-20040414082423-a7k5lrztnpv2cjaqrchghgsmiwt2smhv
  storage/ndb/src/mgmclient/CommandInterpreter.cpp
sp1f-commandinterpreter.c-20040414082423-f3zmansbne57pitifvpdlbnj6hjzduph
  storage/ndb/src/mgmsrv/Config.cpp
sp1f-config.cpp-20040414082410-pw6bjfufvgylk3f435i7l2h6rvjx6vsw
  storage/ndb/src/mgmsrv/Config.hpp
sp1f-config.hpp-20040414082410-hxeg7cgyd23tz3mdgeg7wkatox2aryhx
  storage/ndb/src/mgmsrv/ConfigInfo.cpp
sp1f-configinfo.cpp-20040414082410-wshnfbesagiy7ekxuwwh5espziudv52a
  storage/ndb/src/mgmsrv/ConfigInfo.hpp
sp1f-configinfo.hpp-20040414082410-7neh6hliowquijgzgdrmz5bn2frii5r5
  storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
sp1f-initconfigfileparser-20040414082410-njflvxf4bhl7ibktp3poawrv56imjtvz
  storage/ndb/src/mgmsrv/InitConfigFileParser.hpp
sp1f-initconfigfileparser-20040414082410-xjfqcnxkydr76lhuk3mhr2sgeygiyk2x
  storage/ndb/src/mgmsrv/MgmtSrvr.cpp
sp1f-mgmtsrvr.cpp-20040414082424-umdpuhoopirhdgpnkjsxfutesv45x3kn
  storage/ndb/src/mgmsrv/MgmtSrvr.hpp
sp1f-mgmtsrvr.hpp-20040414082424-mpq3ldj3lrh4fqfstpzdxqray6eiclpv
  storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
sp1f-mgmtsrvrconfig.cpp-20040414082424-4gtbeeosc7jrys5jqf7ixwefsui74vdu
  storage/ndb/src/mgmsrv/Services.cpp
sp1f-services.cpp-20040414082424-enzsfwrjz6enkdid4w5oodjwtqm7v5cz
  storage/ndb/src/mgmsrv/Services.hpp
sp1f-services.hpp-20040414082424-otlyxcwbf5vch5k2zucjv3eifmthlmoy
  storage/ndb/src/mgmsrv/main.cpp
sp1f-main.cpp-20040414082424-goq6xnaykyyczfthruryiuhmodj6lny6
  storage/ndb/src/ndbapi/SignalSender.cpp
sp1f-signalsender.cpp-20050908093451-2bptsw62keoy3yieixs5b7vfs3nueda6
  storage/ndb/src/ndbapi/SignalSender.hpp
sp1f-signalsender.hpp-20050908093451-73zwoeotoz7olhehkj726bxufptg5sj3
  storage/ndb/src/ndbapi/TransporterFacade.cpp
sp1f-transporterfacade.cp-20040414082425-7g53fpp472t6eqf5c2az33qijwsnwr5r
  storage/ndb/src/ndbapi/TransporterFacade.hpp
sp1f-transporterfacade.hp-20040414082426-pqplkpocslicfultqmtzrmoisgy3mrha
  storage/ndb/test/include/NDBT_Test.hpp
sp1f-ndbt_test.hpp-20040414082433-xwtu4ad3l6jejmpxybvuza32wyp2eg7l
  storage/ndb/test/include/NdbMgmd.hpp ndbmgmd.hpp-20080623123318-i58qss0o81tc2mlb-1
  storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp
sp1f-ndbrepstress.cpp-20080108223329-m7rnylugoehdes25xt2g3lf34wytmta4
  storage/ndb/test/ndbapi/testBasic.cpp
sp1f-testbasic.cpp-20040414082437-uyttjhu6c6etzk4n3xe5rdqkxixzpmzh
  storage/ndb/test/ndbapi/testBasicAsynch.cpp
sp1f-testbasicasynch.cpp-20040414082434-y5amhwzqbytdgnogttjyp7wbh6w5qlln
  storage/ndb/test/ndbapi/testMgm.cpp
sp1f-testmgm.cpp-20040414082437-aou3ln5hvawx3rszj6qvam7oixyoticz
  storage/ndb/test/ndbapi/testOIBasic.cpp
sp1f-testoibasic.cpp-20040414082437-d643bl36jjvdl5h45jndvvxibkbwrpgh
  storage/ndb/test/ndbapi/testPartitioning.cpp
sp1f-testpartitioning.cpp-20041115204033-cxt3uwultnb4re4wegydlktjon7kcujy
  storage/ndb/test/ndbapi/test_event.cpp
sp1f-test_event.cpp-20040414082438-mn2bippetrmdotxdqygnmo7y2fhcioia
  storage/ndb/test/run-test/autotest-run.sh
sp1f-autotestrun.sh-20070213013847-a5cyfgilhltmal6tvleacwnanazbb3wk
  storage/ndb/test/src/NDBT_Tables.cpp
sp1f-ndbt_tables.cpp-20040414082441-53t3qr3b6c57u3am56dgttl2nwxtxwzb
  storage/ndb/test/src/NDBT_Test.cpp
sp1f-ndbt_test.cpp-20040414082441-artfvezrpus5ncexgq2vu7ei4btyio4f
  storage/ndb/tools/restore/restore_main.cpp
sp1f-main.cpp-20040414082418-axtjww22xvsugxaltjnpxdoyy2xk2dyg
    ------------------------------------------------------------
    revno: 2663.1.27
    revision-id: jonas@stripped
    parent: jonas@stripped
    committer: jonas@stripped
    branch nick: telco-6.4
    timestamp: Mon 2008-08-04 11:11:28 +0200
    message:
      ndb (mt)
         Fix so that futexes are used even if kernel headers are <= 2.6.17
         - use constants for futexes instead of include file, "ugly" but works
    modified:
      configure.in                  
sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
      storage/ndb/src/kernel/vm/mt.cpp
sp1f-mt.cpp-20080101124507-dcic7nm7bej4f37qv3kb4gjt44peijez
    ------------------------------------------------------------
    revno: 2663.1.26
    revision-id: jonas@stripped
    parent: msvensson@stripped
    committer: jonas@stripped
    branch nick: telco-6.4
    timestamp: Mon 2008-08-04 11:04:33 +0200
    message:
          ndb(mt) -
            1) Add assertion that no NdbCondition is created before NdbCondition_init
            2) Don't create condition variables (as fallback for futex) in initializer,
               but add init() method
    modified:
      storage/ndb/src/common/portlib/NdbCondition.c
sp1f-ndbcondition.c-20040414082410-sxbad7hgbi3haxoijl2nsmgwbcvrkks4
      storage/ndb/src/kernel/vm/mt.cpp
sp1f-mt.cpp-20080101124507-dcic7nm7bej4f37qv3kb4gjt44peijez
    ------------------------------------------------------------
    revno: 2663.1.25
    revision-id: msvensson@stripped
    parent: msvensson@stripped
    committer: Magnus Svensson <msvensson@stripped>
    branch nick: 5.1-telco-6.4
    timestamp: Tue 2008-07-29 16:28:33 +0200
    message:
      Call close on EventLogger before program exits, not done automatically
    modified:
      storage/ndb/src/mgmsrv/main.cpp
sp1f-main.cpp-20040414082424-goq6xnaykyyczfthruryiuhmodj6lny6
    ------------------------------------------------------------
    revno: 2663.1.24
    revision-id: msvensson@stripped
    parent: msvensson@stripped
    committer: Magnus Svensson <msvensson@stripped>
    branch nick: 5.1-telco-6.4
    timestamp: Tue 2008-07-29 16:20:49 +0200
    message:
      Fix valgrind warning, initialize adress variable to NULL before calling function
    modified:
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
sp1f-mgmtsrvr.cpp-20040414082424-umdpuhoopirhdgpnkjsxfutesv45x3kn
    ------------------------------------------------------------
    revno: 2663.1.23
    revision-id: msvensson@stripped
    parent: msvensson@stripped
    committer: Magnus Svensson <msvensson@stripped>
    branch nick: 5.1-telco-6.4
    timestamp: Tue 2008-07-29 16:04:27 +0200
    message:
      Don't use assert for code that should be run also in release
    modified:
      storage/ndb/src/mgmsrv/Config.cpp
sp1f-config.cpp-20040414082410-pw6bjfufvgylk3f435i7l2h6rvjx6vsw
    ------------------------------------------------------------
    revno: 2663.1.22
    revision-id: msvensson@stripped
    parent: msvensson@stripped
    parent: msvensson@stripped
    committer: Magnus Svensson <msvensson@stripped>
    branch nick: 6.4
    timestamp: Tue 2008-07-29 15:49:59 +0200
    message:
      Merge WL#4350
    modified:
      storage/ndb/src/common/logger/Logger.cpp
sp1f-logger.cpp-20040414082409-kn6olfcuk4ejsciiqn6mp7yygbokpvxa
      storage/ndb/src/mgmsrv/Config.hpp
sp1f-config.hpp-20040414082410-hxeg7cgyd23tz3mdgeg7wkatox2aryhx
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
sp1f-mgmtsrvr.cpp-20040414082424-umdpuhoopirhdgpnkjsxfutesv45x3kn
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp
sp1f-mgmtsrvr.hpp-20040414082424-mpq3ldj3lrh4fqfstpzdxqray6eiclpv
      storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
sp1f-mgmtsrvrconfig.cpp-20040414082424-4gtbeeosc7jrys5jqf7ixwefsui74vdu
      storage/ndb/src/mgmsrv/Services.cpp
sp1f-services.cpp-20040414082424-enzsfwrjz6enkdid4w5oodjwtqm7v5cz
      storage/ndb/src/mgmsrv/Services.hpp
sp1f-services.hpp-20040414082424-otlyxcwbf5vch5k2zucjv3eifmthlmoy
      storage/ndb/src/mgmsrv/main.cpp
sp1f-main.cpp-20040414082424-goq6xnaykyyczfthruryiuhmodj6lny6
      storage/ndb/src/ndbapi/SignalSender.cpp
sp1f-signalsender.cpp-20050908093451-2bptsw62keoy3yieixs5b7vfs3nueda6
        ------------------------------------------------------------
        revno: 2649.1.16
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: 5.1-telco-6.4
        timestamp: Tue 2008-07-29 15:38:18 +0200
        message:
          WL#4350 Reorg ndb_mgmd startup and shutdown
        modified:
          storage/ndb/src/common/logger/Logger.cpp
sp1f-logger.cpp-20040414082409-kn6olfcuk4ejsciiqn6mp7yygbokpvxa
          storage/ndb/src/mgmsrv/Config.hpp
sp1f-config.hpp-20040414082410-hxeg7cgyd23tz3mdgeg7wkatox2aryhx
          storage/ndb/src/mgmsrv/MgmtSrvr.cpp
sp1f-mgmtsrvr.cpp-20040414082424-umdpuhoopirhdgpnkjsxfutesv45x3kn
          storage/ndb/src/mgmsrv/MgmtSrvr.hpp
sp1f-mgmtsrvr.hpp-20040414082424-mpq3ldj3lrh4fqfstpzdxqray6eiclpv
          storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
sp1f-mgmtsrvrconfig.cpp-20040414082424-4gtbeeosc7jrys5jqf7ixwefsui74vdu
          storage/ndb/src/mgmsrv/Services.cpp
sp1f-services.cpp-20040414082424-enzsfwrjz6enkdid4w5oodjwtqm7v5cz
          storage/ndb/src/mgmsrv/Services.hpp
sp1f-services.hpp-20040414082424-otlyxcwbf5vch5k2zucjv3eifmthlmoy
          storage/ndb/src/mgmsrv/main.cpp
sp1f-main.cpp-20040414082424-goq6xnaykyyczfthruryiuhmodj6lny6
        ------------------------------------------------------------
        revno: 2649.1.15
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: 5.1-telco-6.4
        timestamp: Fri 2008-07-25 13:28:05 +0200
        message:
          Remove processed signals from m_usedBuffer before waiting for
          more signals, this avoids that the m_usedBuffer continues to grow
        modified:
          storage/ndb/src/ndbapi/SignalSender.cpp
sp1f-signalsender.cpp-20050908093451-2bptsw62keoy3yieixs5b7vfs3nueda6
    ------------------------------------------------------------
    revno: 2663.1.21
    revision-id: msvensson@stripped
    parent: pekka@stripped
    parent: msvensson@stripped
    committer: Magnus Svensson <msvensson@stripped>
    branch nick: 6.4
    timestamp: Tue 2008-07-29 15:47:09 +0200
    message:
      Merge
    modified:
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
sp1f-configinfo.cpp-20040414082410-wshnfbesagiy7ekxuwwh5espziudv52a
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
sp1f-mgmtsrvr.cpp-20040414082424-umdpuhoopirhdgpnkjsxfutesv45x3kn
        ------------------------------------------------------------
        revno: 2663.5.2
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: 5.1-telco-6.4
        timestamp: Tue 2008-07-29 13:08:47 +0200
        message:
          Merge
        modified:
          storage/ndb/src/mgmsrv/MgmtSrvr.cpp
sp1f-mgmtsrvr.cpp-20040414082424-umdpuhoopirhdgpnkjsxfutesv45x3kn
            ------------------------------------------------------------
            revno: 2585.7.18
            revision-id: msvensson@stripped
            parent: msvensson@stripped
            parent: msvensson@stripped
            committer: Magnus Svensson <msvensson@stripped>
            branch nick: 5.1-telco-6.3
            timestamp: Tue 2008-07-29 11:41:01 +0200
            message:
              Merge
            modified:
              storage/ndb/src/mgmsrv/MgmtSrvr.cpp
sp1f-mgmtsrvr.cpp-20040414082424-umdpuhoopirhdgpnkjsxfutesv45x3kn
            ------------------------------------------------------------
            revno: 2572.21.4
            revision-id: msvensson@stripped
            parent: msvensson@stripped
            committer: Magnus Svensson <msvensson@stripped>
            branch nick: 5.1-telco-6.2
            timestamp: Tue 2008-07-29 11:39:57 +0200
            message:
              Bug#38424 Ndb_mgmd resource leak in 'sendStopMgmd' if connection to mgmd
fails
            modified:
              storage/ndb/src/mgmsrv/MgmtSrvr.cpp
sp1f-mgmtsrvr.cpp-20040414082424-umdpuhoopirhdgpnkjsxfutesv45x3kn
        ------------------------------------------------------------
        revno: 2663.5.1
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: 5.1-telco-6.4
        timestamp: Mon 2008-07-28 11:43:13 +0200
        message:
          Add missing return
        modified:
          storage/ndb/src/mgmsrv/ConfigInfo.cpp
sp1f-configinfo.cpp-20040414082410-wshnfbesagiy7ekxuwwh5espziudv52a
    ------------------------------------------------------------
    revno: 2663.1.20
    revision-id: pekka@stripped
    parent: msvensson@stripped
    committer: Pekka Nousiainen <pekka@stripped>
    branch nick: my51-wl4391
    timestamp: Sat 2008-07-26 08:13:40 +0300
    message:
      wl#4391 02.diff
      LocalProxy, including READ_CONFIG, and subclasses.
    added:
      storage/ndb/src/kernel/blocks/LocalProxy.cpp
localproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-1
      storage/ndb/src/kernel/blocks/LocalProxy.hpp
localproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-2
      storage/ndb/src/kernel/blocks/RestoreProxy.cpp
restoreproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-3
      storage/ndb/src/kernel/blocks/RestoreProxy.hpp
restoreproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-4
      storage/ndb/src/kernel/blocks/backup/BackupProxy.cpp
backupproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-5
      storage/ndb/src/kernel/blocks/backup/BackupProxy.hpp
backupproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-6
      storage/ndb/src/kernel/blocks/dbacc/DbaccProxy.cpp
dbaccproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-7
      storage/ndb/src/kernel/blocks/dbacc/DbaccProxy.hpp
dbaccproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-8
      storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp
dblqhproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-9
      storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.hpp
dblqhproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-10
      storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp
dbtupproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-11
      storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.hpp
dbtupproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-12
      storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp
dbtuxproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-13
      storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp
dbtuxproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-14
    modified:
      storage/ndb/src/kernel/SimBlockList.cpp
sp1f-simblocklist.cpp-20040414082422-l2wn2wqhsxgjo46wre4pkp4ba56amu2e
      storage/ndb/src/kernel/blocks/Makefile.am
sp1f-makefile.am-20040525095509-7ss3m3ydkvsa4gumomc6m3ez4jn5r65k
      storage/ndb/src/kernel/blocks/backup/Backup.hpp
sp1f-backup.hpp-20040414082418-euc24xpkx33vvubci2qx7xxxesejnarm
      storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
sp1f-backupinit.cpp-20040414082418-pl6lxqyhnsw3wemybj4cxsunfybye43t
      storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
sp1f-dbacc.hpp-20040414082418-tyxbxrc22s6pnc3zcfd6fwglajikiwzz
      storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
sp1f-dbaccinit.cpp-20040414082418-ncwzaahgqlxcybiygexebsgwc5t3aheg
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
sp1f-dblqh.hpp-20040414082419-6mgkxaewhwzt5iipa75dwwl6antoikoa
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
sp1f-dblqhinit.cpp-20040414082419-jc2dm7yelabrtwbvuh3aejte6tb4a2jf
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
sp1f-dbtup.hpp-20040414082419-idobqlb5css6uzs7wsmex3judi7tw5e5
      storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
sp1f-dbtupgen.cpp-20040414082419-gthvzvbzhvmti2c6o5f7jsqyahpdoycy
      storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
sp1f-dbtux.hpp-20040414082420-gkdow3inwhzmqmmln4ysglr2mn7kxs62
      storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
sp1f-dbtuxgen.cpp-20040414082420-vnbbipvn5hjzx66u4qvhmdnqn6wesb7t
      storage/ndb/src/kernel/blocks/restore.cpp
sp1f-restore.cpp-20051107111915-wup46rfclbtuhipt56ql64jhvw6z25fs
      storage/ndb/src/kernel/blocks/restore.hpp
sp1f-restore.hpp-20051107111915-hksgj7v5an4bmv4hnbibwkqhl5joktrw
    ------------------------------------------------------------
    revno: 2663.1.19
    revision-id: msvensson@stripped
    parent: msvensson@stripped
    parent: msvensson@stripped
    committer: Magnus Svensson <msvensson@stripped>
    branch nick: 5.1-telco-6.4
    timestamp: Fri 2008-07-25 18:28:37 +0200
    message:
      Merge
    modified:
      storage/ndb/src/common/logger/Logger.cpp
sp1f-logger.cpp-20040414082409-kn6olfcuk4ejsciiqn6mp7yygbokpvxa
        ------------------------------------------------------------
        revno: 2585.7.17
        revision-id: msvensson@stripped
        parent: gni@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: 5.1-telco-6.3
        timestamp: Fri 2008-07-25 18:27:54 +0200
        message:
          Merge
        modified:
          storage/ndb/src/common/logger/Logger.cpp
sp1f-logger.cpp-20040414082409-kn6olfcuk4ejsciiqn6mp7yygbokpvxa
        ------------------------------------------------------------
        revno: 2572.21.3
        revision-id: msvensson@stripped
        parent: gni@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: 5.1-telco-6.2
        timestamp: Fri 2008-07-25 18:10:36 +0200
        message:
          Bug #38380  Memory leak in LogHandler::addHandler after fail to parse params
        modified:
          storage/ndb/src/common/logger/Logger.cpp
sp1f-logger.cpp-20040414082409-kn6olfcuk4ejsciiqn6mp7yygbokpvxa
        ------------------------------------------------------------
        revno: 2572.21.2
        revision-id: gni@stripped
        parent: gni@stripped
        parent: frazer@stripped
        committer: Guangbao Ni <gni@stripped>
        branch nick: telco6.2-bug33801
        timestamp: Thu 2008-07-24 20:01:08 +0800
        message:
          merge from remote server
        modified:
          storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
sp1f-dblqhmain.cpp-20040414082419-5mtvgr6eg47fgddawjjch74crdnaduvi
          storage/ndb/test/ndbapi/testOIBasic.cpp
sp1f-testoibasic.cpp-20040414082437-d643bl36jjvdl5h45jndvvxibkbwrpgh
    ------------------------------------------------------------
    revno: 2663.1.18
    revision-id: msvensson@stripped
    parent: msvensson@stripped
    committer: Magnus Svensson <msvensson@stripped>
    branch nick: 5.1-telco-6.4
    timestamp: Fri 2008-07-25 18:03:09 +0200
    message:
      Use require instead of assert for code that should be run also in release
    modified:
      storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
sp1f-initconfigfileparser-20040414082410-njflvxf4bhl7ibktp3poawrv56imjtvz
    ------------------------------------------------------------
    revno: 2663.1.17
    revision-id: msvensson@stripped
    parent: msvensson@stripped
    parent: msvensson@stripped
    committer: Magnus Svensson <msvensson@stripped>
    branch nick: 5.1-telco-6.4
    timestamp: Fri 2008-07-25 13:21:41 +0200
    message:
      Merge
    modified:
      storage/ndb/src/mgmsrv/Config.cpp
sp1f-config.cpp-20040414082410-pw6bjfufvgylk3f435i7l2h6rvjx6vsw
      storage/ndb/src/mgmsrv/Config.hpp
sp1f-config.hpp-20040414082410-hxeg7cgyd23tz3mdgeg7wkatox2aryhx
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
sp1f-configinfo.cpp-20040414082410-wshnfbesagiy7ekxuwwh5espziudv52a
      storage/ndb/src/mgmsrv/ConfigInfo.hpp
sp1f-configinfo.hpp-20040414082410-7neh6hliowquijgzgdrmz5bn2frii5r5
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp
sp1f-mgmtsrvr.hpp-20040414082424-mpq3ldj3lrh4fqfstpzdxqray6eiclpv
      storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
sp1f-mgmtsrvrconfig.cpp-20040414082424-4gtbeeosc7jrys5jqf7ixwefsui74vdu
      storage/ndb/src/mgmsrv/main.cpp
sp1f-main.cpp-20040414082424-goq6xnaykyyczfthruryiuhmodj6lny6
        ------------------------------------------------------------
        revno: 2649.1.14
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: 5.1-telco-6.4
        timestamp: Fri 2008-07-25 12:02:59 +0200
        message:
          Print config from the loaded config instead of printing while loading 
          from disk
           - Remove unused functions
              Config::prinAllNameValuePairs,
              Config::printConfigFile and
              MgmtSrvr::saveConfig x 2
        modified:
          storage/ndb/src/mgmsrv/Config.cpp
sp1f-config.cpp-20040414082410-pw6bjfufvgylk3f435i7l2h6rvjx6vsw
          storage/ndb/src/mgmsrv/Config.hpp
sp1f-config.hpp-20040414082410-hxeg7cgyd23tz3mdgeg7wkatox2aryhx
          storage/ndb/src/mgmsrv/ConfigInfo.cpp
sp1f-configinfo.cpp-20040414082410-wshnfbesagiy7ekxuwwh5espziudv52a
          storage/ndb/src/mgmsrv/ConfigInfo.hpp
sp1f-configinfo.hpp-20040414082410-7neh6hliowquijgzgdrmz5bn2frii5r5
          storage/ndb/src/mgmsrv/MgmtSrvr.hpp
sp1f-mgmtsrvr.hpp-20040414082424-mpq3ldj3lrh4fqfstpzdxqray6eiclpv
          storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
sp1f-mgmtsrvrconfig.cpp-20040414082424-4gtbeeosc7jrys5jqf7ixwefsui74vdu
          storage/ndb/src/mgmsrv/main.cpp
sp1f-main.cpp-20040414082424-goq6xnaykyyczfthruryiuhmodj6lny6
    ------------------------------------------------------------
    revno: 2663.1.16
    revision-id: msvensson@stripped
    parent: msvensson@stripped
    parent: pekka@stripped
    committer: Magnus Svensson <msvensson@stripped>
    branch nick: 5.1-telco-6.4
    timestamp: Fri 2008-07-25 13:16:33 +0200
    message:
      Merge
    added:
      storage/ndb/src/kernel/vm/GlobalData.cpp
globaldata.cpp-20080724175149-az4v3k190hw2zash-1
      storage/ndb/src/kernel/vm/dummy_nonmt.cpp
dummy_nonmt.cpp-20080724175149-az4v3k190hw2zash-2
    modified:
      mysql-test/suite/ndb/r/ndb_restore.result
sp1f-ndb_restore.result-20050124120423-ikn2jquomq3l4r4jmsadf4bb4ubekggm
      mysql-test/suite/ndb/r/ndb_restore_compressed.result
sp1f-ndb_restore_compress-20071115002850-roep5gkz5e6a5e7ewyh6cqzbyu2licaa
      mysql-test/suite/ndb/t/ndb_restore.test
sp1f-ndb_restore.test-20050124120415-cmxrdjwp26ayjgcbnwb7byz3yrcwg6u4
      storage/ndb/include/debugger/SignalLoggerManager.hpp
sp1f-signalloggermanager.-20040414082352-ejwi3wuo6ntjtsaf73tn4i22cx62uzv2
      storage/ndb/include/kernel/RefConvert.hpp
sp1f-refconvert.hpp-20040414082352-t3eghomxdl4dxvbcscs5qfwtwaqc34yh
      storage/ndb/include/kernel/kernel_config_parameters.h
sp1f-kernel_config_parame-20040526094908-qzsfgcuznm43jcp5blf4pykn343x6hnu
      storage/ndb/include/kernel/kernel_types.h
sp1f-kernel_types.h-20040414082352-hkq7rmddazrpe7newecec7zjlu4sogjq
      storage/ndb/include/kernel/ndb_limits.h
sp1f-ndb_limits.h-20040414082352-7fj33ex7vj432a27xhswhbspi7gsvvmz
      storage/ndb/src/common/debugger/SignalLoggerManager.cpp
sp1f-signalloggermanager.-20040414082407-ghznr5a27ecv5umwswewhu6o5lod3jyl
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
sp1f-dbdict.cpp-20040414082418-iodilitk75ncp4kj2matmhrutqp6ztdo
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
sp1f-dbdict.hpp-20040414082418-gwtkbqf7bvvqo4zc4b7taupdvcv5ngby
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
sp1f-dbdih.hpp-20040414082419-kqfnl6h3q4y365sqvodrfkj6yiksuvbl
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
sp1f-dbdihmain.cpp-20040414082419-ixmi74kjghkfaowxplxf33dygxuu6dma
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
sp1f-dblqhmain.cpp-20040414082419-5mtvgr6eg47fgddawjjch74crdnaduvi
      storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp
sp1f-posixasyncfile.cpp-20071115002958-h6h4wqx64vkrfed3ekvwqvt646q3bm7w
      storage/ndb/src/kernel/main.cpp
sp1f-main.cpp-20040414082422-ifhdrjyod62azjl4peccmcmjokvsy3na
      storage/ndb/src/kernel/vm/Configuration.cpp
sp1f-configuration.cpp-20040414082422-ck3k52a6ia33sex2lui5ar4kbkdzaunm
      storage/ndb/src/kernel/vm/GlobalData.hpp
sp1f-globaldata.hpp-20040414082422-euei3clbawzgmwkn3qh3wecflopaxadq
      storage/ndb/src/kernel/vm/Makefile.am
sp1f-makefile.am-20040525095509-jmojzf2t5j2ur4kwkalsjs5nkzbbh7bb
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp
sp1f-simulatedblock.cpp-20040414082423-ygh3kx5ve2xbpfctceugfdnemzczawx6
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp
sp1f-simulatedblock.hpp-20040414082423-tyictvcz5wwr7e7frsog4lkct4zxrvsv
      storage/ndb/src/kernel/vm/TransporterCallback.cpp
sp1f-transportercallback.-20040414082423-orvgt4lovbdsqu5gjdkhc6oefovmavrk
      storage/ndb/src/kernel/vm/mt.cpp
sp1f-mt.cpp-20080101124507-dcic7nm7bej4f37qv3kb4gjt44peijez
      storage/ndb/src/kernel/vm/mt.hpp
sp1f-mt.hpp-20080101124507-tv3rozwnrp6yamtfxskndxfgafnyq5bw
      storage/ndb/test/ndbapi/testOIBasic.cpp
sp1f-testoibasic.cpp-20040414082437-d643bl36jjvdl5h45jndvvxibkbwrpgh
      storage/ndb/tools/restore/restore_main.cpp
sp1f-main.cpp-20040414082418-axtjww22xvsugxaltjnpxdoyy2xk2dyg
        ------------------------------------------------------------
        revno: 2663.4.4
        revision-id: pekka@stripped
        parent: pekka@stripped
        committer: Pekka Nousiainen <pekka@stripped>
        branch nick: my51-wl4391
        timestamp: Fri 2008-07-25 11:46:15 +0300
        message:
          wl#4391 fix
          dodgy initialization caused U __cxa_guard_acquire in pb
        modified:
          storage/ndb/src/kernel/vm/mt.cpp
sp1f-mt.cpp-20080101124507-dcic7nm7bej4f37qv3kb4gjt44peijez
        ------------------------------------------------------------
        revno: 2663.4.3
        revision-id: pekka@stripped
        parent: gni@stripped
        committer: Pekka Nousiainen <pekka@stripped>
        branch nick: my51-wl4391
        timestamp: Fri 2008-07-25 08:48:32 +0300
        message:
          wl#4391 01.diff
          Block instances, mapping to threads, log part id, MT LQH switch.
        added:
          storage/ndb/src/kernel/vm/GlobalData.cpp
globaldata.cpp-20080724175149-az4v3k190hw2zash-1
          storage/ndb/src/kernel/vm/dummy_nonmt.cpp
dummy_nonmt.cpp-20080724175149-az4v3k190hw2zash-2
        modified:
          storage/ndb/include/debugger/SignalLoggerManager.hpp
sp1f-signalloggermanager.-20040414082352-ejwi3wuo6ntjtsaf73tn4i22cx62uzv2
          storage/ndb/include/kernel/RefConvert.hpp
sp1f-refconvert.hpp-20040414082352-t3eghomxdl4dxvbcscs5qfwtwaqc34yh
          storage/ndb/include/kernel/kernel_config_parameters.h
sp1f-kernel_config_parame-20040526094908-qzsfgcuznm43jcp5blf4pykn343x6hnu
          storage/ndb/include/kernel/kernel_types.h
sp1f-kernel_types.h-20040414082352-hkq7rmddazrpe7newecec7zjlu4sogjq
          storage/ndb/include/kernel/ndb_limits.h
sp1f-ndb_limits.h-20040414082352-7fj33ex7vj432a27xhswhbspi7gsvvmz
          storage/ndb/src/common/debugger/SignalLoggerManager.cpp
sp1f-signalloggermanager.-20040414082407-ghznr5a27ecv5umwswewhu6o5lod3jyl
          storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
sp1f-dbdict.cpp-20040414082418-iodilitk75ncp4kj2matmhrutqp6ztdo
          storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
sp1f-dbdict.hpp-20040414082418-gwtkbqf7bvvqo4zc4b7taupdvcv5ngby
          storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
sp1f-dbdih.hpp-20040414082419-kqfnl6h3q4y365sqvodrfkj6yiksuvbl
          storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
sp1f-dbdihmain.cpp-20040414082419-ixmi74kjghkfaowxplxf33dygxuu6dma
          storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp
sp1f-posixasyncfile.cpp-20071115002958-h6h4wqx64vkrfed3ekvwqvt646q3bm7w
          storage/ndb/src/kernel/main.cpp
sp1f-main.cpp-20040414082422-ifhdrjyod62azjl4peccmcmjokvsy3na
          storage/ndb/src/kernel/vm/Configuration.cpp
sp1f-configuration.cpp-20040414082422-ck3k52a6ia33sex2lui5ar4kbkdzaunm
          storage/ndb/src/kernel/vm/GlobalData.hpp
sp1f-globaldata.hpp-20040414082422-euei3clbawzgmwkn3qh3wecflopaxadq
          storage/ndb/src/kernel/vm/Makefile.am
sp1f-makefile.am-20040525095509-jmojzf2t5j2ur4kwkalsjs5nkzbbh7bb
          storage/ndb/src/kernel/vm/SimulatedBlock.cpp
sp1f-simulatedblock.cpp-20040414082423-ygh3kx5ve2xbpfctceugfdnemzczawx6
          storage/ndb/src/kernel/vm/SimulatedBlock.hpp
sp1f-simulatedblock.hpp-20040414082423-tyictvcz5wwr7e7frsog4lkct4zxrvsv
          storage/ndb/src/kernel/vm/TransporterCallback.cpp
sp1f-transportercallback.-20040414082423-orvgt4lovbdsqu5gjdkhc6oefovmavrk
          storage/ndb/src/kernel/vm/mt.cpp
sp1f-mt.cpp-20080101124507-dcic7nm7bej4f37qv3kb4gjt44peijez
          storage/ndb/src/kernel/vm/mt.hpp
sp1f-mt.hpp-20080101124507-tv3rozwnrp6yamtfxskndxfgafnyq5bw
        ------------------------------------------------------------
        revno: 2663.4.2
        revision-id: gni@stripped
        parent: frazer@stripped
        parent: gni@stripped
        committer: Guangbao Ni <gni@stripped>
        branch nick: telco6.4-bug33801
        timestamp: Thu 2008-07-24 19:37:36 +0800
        message:
          BUG#33801 ndb_restore fails when not all tables are restored once
        modified:
          mysql-test/suite/ndb/r/ndb_restore.result
sp1f-ndb_restore.result-20050124120423-ikn2jquomq3l4r4jmsadf4bb4ubekggm
          mysql-test/suite/ndb/r/ndb_restore_compressed.result
sp1f-ndb_restore_compress-20071115002850-roep5gkz5e6a5e7ewyh6cqzbyu2licaa
          mysql-test/suite/ndb/t/ndb_restore.test
sp1f-ndb_restore.test-20050124120415-cmxrdjwp26ayjgcbnwb7byz3yrcwg6u4
          storage/ndb/tools/restore/restore_main.cpp
sp1f-main.cpp-20040414082418-axtjww22xvsugxaltjnpxdoyy2xk2dyg
            ------------------------------------------------------------
            revno: 2585.7.16
            revision-id: gni@stripped
            parent: frazer@stripped
            parent: gni@stripped
            committer: Guangbao Ni <gni@stripped>
            branch nick: telco6.3-bug33801
            timestamp: Thu 2008-07-24 18:57:58 +0800
            message:
              BUG#33801 ndb_restore fails when not all tables are restored once
            modified:
              mysql-test/suite/ndb/r/ndb_restore.result
sp1f-ndb_restore.result-20050124120423-ikn2jquomq3l4r4jmsadf4bb4ubekggm
              mysql-test/suite/ndb/r/ndb_restore_compressed.result
sp1f-ndb_restore_compress-20071115002850-roep5gkz5e6a5e7ewyh6cqzbyu2licaa
              mysql-test/suite/ndb/t/ndb_restore.test
sp1f-ndb_restore.test-20050124120415-cmxrdjwp26ayjgcbnwb7byz3yrcwg6u4
              storage/ndb/tools/restore/restore_main.cpp
sp1f-main.cpp-20040414082418-axtjww22xvsugxaltjnpxdoyy2xk2dyg
            ------------------------------------------------------------
            revno: 2572.21.1
            revision-id: gni@stripped
            parent: jonas@stripped
            committer: Guangbao Ni <gni@stripped>
            branch nick: telco6.2-bug33801
            timestamp: Thu 2008-07-24 17:23:05 +0800
            message:
              BUG#33801 ndb_restore fails when not all tables are restored once
            modified:
              mysql-test/suite/ndb/r/ndb_restore.result
sp1f-ndb_restore.result-20050124120423-ikn2jquomq3l4r4jmsadf4bb4ubekggm
              mysql-test/suite/ndb/t/ndb_restore.test
sp1f-ndb_restore.test-20050124120415-cmxrdjwp26ayjgcbnwb7byz3yrcwg6u4
              storage/ndb/tools/restore/restore_main.cpp
sp1f-main.cpp-20040414082418-axtjww22xvsugxaltjnpxdoyy2xk2dyg
        ------------------------------------------------------------
        revno: 2663.4.1
        revision-id: frazer@stripped
        parent: msvensson@stripped
        parent: frazer@stripped
        committer: Frazer Clement <frazer@stripped>
        branch nick: mysql-5.1-telco-6.4
        timestamp: Wed 2008-07-23 12:36:53 +0100
        message:
          Merge
        modified:
          storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
sp1f-dblqhmain.cpp-20040414082419-5mtvgr6eg47fgddawjjch74crdnaduvi
          storage/ndb/test/ndbapi/testOIBasic.cpp
sp1f-testoibasic.cpp-20040414082437-d643bl36jjvdl5h45jndvvxibkbwrpgh
        ------------------------------------------------------------
        revno: 2585.7.15
        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-07-23 12:25:03 +0100
        message:
          Merge 6.2 into 6.3
        modified:
          storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
sp1f-dblqhmain.cpp-20040414082419-5mtvgr6eg47fgddawjjch74crdnaduvi
          storage/ndb/test/ndbapi/testOIBasic.cpp
sp1f-testoibasic.cpp-20040414082437-d643bl36jjvdl5h45jndvvxibkbwrpgh
        ------------------------------------------------------------
        revno: 2572.19.18
        revision-id: frazer@stripped
        parent: jonas@stripped
        committer: Frazer Clement <frazer@stripped>
        branch nick: mysql-5.1-telco-6.2
        timestamp: Wed 2008-07-23 12:15:31 +0100
        message:
          Bug 38204 : NDBAPI : MRR IndexScan fails with certain bound lengths
            
          testOIBasic with mrr (separate patch) fails in some cases.
        modified:
          storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
sp1f-dblqhmain.cpp-20040414082419-5mtvgr6eg47fgddawjjch74crdnaduvi
          storage/ndb/test/ndbapi/testOIBasic.cpp
sp1f-testoibasic.cpp-20040414082437-d643bl36jjvdl5h45jndvvxibkbwrpgh
    ------------------------------------------------------------
    revno: 2663.1.15
    revision-id: msvensson@stripped
    parent: msvensson@stripped
    parent: msvensson@stripped
    committer: Magnus Svensson <msvensson@stripped>
    branch nick: 5.1-telco-6.4
    timestamp: Fri 2008-07-25 11:02:30 +0200
    message:
      Merge
    removed:
      storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp
sp1f-mgmterrorreporter.hp-20040414082356-ypc4tzcq57igljep5rcilws3jftzbsos
    modified:
      storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
sp1f-configretriever.cpp-20040414082410-k5hty5ou25dt7chktmzxcaoxv2jdprvf
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
sp1f-transporterregistry.-20040414082412-kmsf342l5o4sodfonfdwdd3pobckcn6r
      storage/ndb/src/mgmapi/mgmapi.cpp
sp1f-mgmapi.cpp-20040414082423-a7k5lrztnpv2cjaqrchghgsmiwt2smhv
      storage/ndb/src/mgmclient/CommandInterpreter.cpp
sp1f-commandinterpreter.c-20040414082423-f3zmansbne57pitifvpdlbnj6hjzduph
      storage/ndb/src/mgmsrv/Config.cpp
sp1f-config.cpp-20040414082410-pw6bjfufvgylk3f435i7l2h6rvjx6vsw
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
sp1f-configinfo.cpp-20040414082410-wshnfbesagiy7ekxuwwh5espziudv52a
      storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
sp1f-initconfigfileparser-20040414082410-njflvxf4bhl7ibktp3poawrv56imjtvz
      storage/ndb/src/mgmsrv/InitConfigFileParser.hpp
sp1f-initconfigfileparser-20040414082410-xjfqcnxkydr76lhuk3mhr2sgeygiyk2x
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
sp1f-mgmtsrvr.cpp-20040414082424-umdpuhoopirhdgpnkjsxfutesv45x3kn
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp
sp1f-mgmtsrvr.hpp-20040414082424-mpq3ldj3lrh4fqfstpzdxqray6eiclpv
      storage/ndb/src/mgmsrv/Services.cpp
sp1f-services.cpp-20040414082424-enzsfwrjz6enkdid4w5oodjwtqm7v5cz
      storage/ndb/src/mgmsrv/Services.hpp
sp1f-services.hpp-20040414082424-otlyxcwbf5vch5k2zucjv3eifmthlmoy
      storage/ndb/src/ndbapi/SignalSender.cpp
sp1f-signalsender.cpp-20050908093451-2bptsw62keoy3yieixs5b7vfs3nueda6
      storage/ndb/src/ndbapi/SignalSender.hpp
sp1f-signalsender.hpp-20050908093451-73zwoeotoz7olhehkj726bxufptg5sj3
      storage/ndb/src/ndbapi/TransporterFacade.cpp
sp1f-transporterfacade.cp-20040414082425-7g53fpp472t6eqf5c2az33qijwsnwr5r
      storage/ndb/src/ndbapi/TransporterFacade.hpp
sp1f-transporterfacade.hp-20040414082426-pqplkpocslicfultqmtzrmoisgy3mrha
        ------------------------------------------------------------
        revno: 2649.1.13
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: 5.1-telco-6.4
        timestamp: Tue 2008-07-22 15:42:54 +0200
        message:
          Merge
        removed:
          storage/ndb/test/include/NdbGrep.hpp
sp1f-ndbgrep.hpp-20040414082434-atcdt6r4hgtwxkjy53fzbopkxdwpgrai
          storage/ndb/test/run-test/atrt-clear-result.sh
sp1f-atrtclearresult.sh-20040414082441-q2ji34qgefi5fkd7h3qsribppspnrjp5
          storage/ndb/test/src/NdbGrep.cpp
sp1f-ndbgrep.cpp-20040414082441-2j5phukntr4o5d6g5rznsggobdtolk65
        added:
          mysql-test/suite/ndb/r/ndb_hidden_pk.result
ndb_hidden_pk.result-20080619120456-kvd0l74zrvp6fl96-1
          mysql-test/suite/ndb/t/ndb_hidden_pk.test
ndb_hidden_pk.test-20080619120445-10hgl937fdkdln4r-1
          mysql-test/suite/ndb_binlog/r/ndb_binlog_restore.result
ndb_binlog_restore.r-20080618145859-emr3sbe7769wo96b-1
          mysql-test/suite/ndb_binlog/t/ndb_binlog_restore.test
ndb_binlog_restore.t-20080618145852-pjxv318v5mr6381h-1
          storage/ndb/test/include/NdbMgmd.hpp
ndbmgmd.hpp-20080623123318-i58qss0o81tc2mlb-1
          storage/ndb/test/ndbapi/testLimits.cpp
testlimits.cpp-20080630220416-8iqzxrvd280uesgn-1
          storage/ndb/test/ndbapi/testSingleUserMode.cpp
testsingleusermode.c-20080623124733-3dpwgj85v5j8gcpw-1
          storage/ndb/test/run-test/conf-fimafeng08.cnf
conffimafeng08.cnf-20080624140805-rbdj4pe7kcnjwsi9-1
        renamed:
          storage/ndb/src/common/util/ndb_show_compat.cc =>
storage/ndb/src/common/util/ndb_show_compat.cpp
sp1f-ndb_show_compat.cc-20080509073735-ht72kzhd46bw6axycxeyal4cws3qmm47
        modified:
          BUILD/compile-ndb-autotest    
sp1f-compilendbautotest-20060621072052-epq5zpjusgpsl2nnt6qmogxenxm6bxrr
          mysql-test/suite/binlog/r/binlog_multi_engine.result
sp1f-binlog_multi_engine.-20070528105025-fenxgj26mp5ianhpil75kfyagrm47t66
          mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result
sp1f-ndb_binlog_format.re-20070627203253-x3ttcvabztiziy2mz6jclr6jluscl35w
          mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result
sp1f-ndb_binlog_log_bin.r-20070418193943-qsp24qu35irny5fy43kqolit3jvmp2ew
          sql/ha_ndbcluster.cc          
sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
          sql/ha_ndbcluster_binlog.cc   
sp1f-ha_ndbcluster_binlog-20060112185048-3hthowbxyrrly3srxavlrufjf5mmgqm6
          sql/rpl_injector.cc           
sp1f-rpl_injector.cc-20060112185049-nmh4krszzy7lfqbhbaznaczvq36kmykc
          sql/rpl_injector.h            
sp1f-rpl_injector.h-20060112185050-huutlwyo3jmlfj6bkxrzdg3oa4gjjuth
          storage/ndb/include/debugger/SignalLoggerManager.hpp
sp1f-signalloggermanager.-20040414082352-ejwi3wuo6ntjtsaf73tn4i22cx62uzv2
          storage/ndb/include/kernel/ndb_limits.h
sp1f-ndb_limits.h-20040414082352-7fj33ex7vj432a27xhswhbspi7gsvvmz
          storage/ndb/include/kernel/signaldata/LqhKey.hpp
sp1f-lqhkey.hpp-20040414082354-ld6oh4wtfr6a4sbqyfrqj57yhikpt537
          storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp
sp1f-signaldroppedrep.hpp-20040414082355-df6jxc5i3kyyrhmwgqfdihstzekwforb
          storage/ndb/include/kernel/signaldata/SumaImpl.hpp
sp1f-sumaimpl.hpp-20040414082355-4a32if6jnqt7vmrnmkdnkdub7h2rg5wa
          storage/ndb/include/kernel/signaldata/TcKeyRef.hpp
sp1f-tckeyref.hpp-20040414082356-reggyd7mgl7jfqvuh2m6ovbuipv3ayli
          storage/ndb/include/kernel/signaldata/TcKeyReq.hpp
sp1f-tckeyreq.hpp-20040414082356-6vwkm4utk6ka5ubcmxw6qy4tfswjvyap
          storage/ndb/include/ndb_global.h.in
sp1f-ndb_global.h.in-20041111071520-kxp23g4kswod7xz2ymwahokt6nyn4mja
          storage/ndb/include/ndb_version.h.in
sp1f-ndb_version.h.in-20041110204309-x7w2ai7hczf5qqp73k3vch7amzxmle3e
          storage/ndb/include/ndbapi/NdbOperation.hpp
sp1f-ndboperation.hpp-20040414082357-rysaqyizylpcnylrtvyasdp6xnz43ob4
          storage/ndb/include/ndbapi/NdbScanOperation.hpp
sp1f-ndbscanoperation.hpp-20040414082357-fjxe5xe43jqfor2px56dwicnrkjwc2kz
          storage/ndb/include/transporter/TransporterDefinitions.hpp
sp1f-transporterdefinitio-20040414082357-xfma5ydgnsxiqj7b26ujjg2gw6mevrqw
          storage/ndb/include/transporter/TransporterRegistry.hpp
sp1f-transporterregistry.-20040414082357-c4hjrr7xjuzgmvr5cmrdieel2e5webrs
          storage/ndb/src/common/debugger/SignalLoggerManager.cpp
sp1f-signalloggermanager.-20040414082407-ghznr5a27ecv5umwswewhu6o5lod3jyl
          storage/ndb/src/common/transporter/Packer.cpp
sp1f-packer.cpp-20040414082411-jynqrpascvu2tjijvflf45opj26whft2
          storage/ndb/src/common/transporter/Packer.hpp
sp1f-packer.hpp-20040414082411-akfz55vi4i5fst7qliplx5vp3p7bgyhk
          storage/ndb/src/common/transporter/TransporterRegistry.cpp
sp1f-transporterregistry.-20040414082412-kmsf342l5o4sodfonfdwdd3pobckcn6r
          storage/ndb/src/common/util/Makefile.am
sp1f-makefile.am-20040525095507-l3qqnnkie5tx7csdhvl52gkskyrdzoen
          storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
sp1f-cmvmi.cpp-20040414082418-aqbt55ewfxl5gud4aln2oee56ogeigol
          storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
sp1f-dbdict.cpp-20040414082418-iodilitk75ncp4kj2matmhrutqp6ztdo
          storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
sp1f-dblqhmain.cpp-20040414082419-5mtvgr6eg47fgddawjjch74crdnaduvi
          storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
sp1f-dbtc.hpp-20040414082419-ys7w7skv5t7y4kwai7vw6moiecoer3tr
          storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
sp1f-dbtcinit.cpp-20040414082419-toqhykhnfsf67anf3un6jph7vcdweajy
          storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
sp1f-dbtcmain.cpp-20040414082419-hh3omoivivmmi47yllfxfooxzvblqwla
          storage/ndb/src/kernel/blocks/suma/Suma.cpp
sp1f-suma.cpp-20040414082421-p4toipzza63cmyzczerf4mdsbvqbwi5r
          storage/ndb/src/kernel/blocks/suma/Suma.hpp
sp1f-suma.hpp-20040414082421-mkwzqtqusub3liqrqdouvs6vfgbwvnd5
          storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
sp1f-sumainit.cpp-20040414082421-iwgc6ajj4j66v2sbecys247q5toloc4i
          storage/ndb/src/kernel/vm/ArrayPool.hpp
sp1f-arraypool.hpp-20040414082422-7pskdoennkcha5o27xl2lyng2of3pqcr
          storage/ndb/src/kernel/vm/LongSignal.hpp
sp1f-longsignal.hpp-20040414082422-zttdipy55hdqoxdh4ubjdgn4lydokjyq
          storage/ndb/src/kernel/vm/SectionReader.cpp
sp1f-sectionreader.cpp-20040414082423-klxkbo7g5eerzfigdbaqnhxlzn4czgld
          storage/ndb/src/kernel/vm/SimulatedBlock.cpp
sp1f-simulatedblock.cpp-20040414082423-ygh3kx5ve2xbpfctceugfdnemzczawx6
          storage/ndb/src/kernel/vm/SimulatedBlock.hpp
sp1f-simulatedblock.hpp-20040414082423-tyictvcz5wwr7e7frsog4lkct4zxrvsv
          storage/ndb/src/kernel/vm/TransporterCallback.cpp
sp1f-transportercallback.-20040414082423-orvgt4lovbdsqu5gjdkhc6oefovmavrk
          storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp
sp1f-test.cpp-20040414082423-f4ov462s3zct3sv6komrl6yd5dqs7us3
          storage/ndb/src/ndbapi/Ndb.cpp
sp1f-ndb.cpp-20040414082424-w4iietigjbat2axvr45magbzk4yg6et3
          storage/ndb/src/ndbapi/NdbApiSignal.hpp
sp1f-ndbapisignal.hpp-20040414082424-vborymijme4trosxqetjtlnzezwbqjby
          storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
sp1f-ndbeventoperationimp-20040414082425-hg5aiqrtvpekpavvqa6cc3kvy2mjllud
          storage/ndb/src/ndbapi/NdbOperationExec.cpp
sp1f-ndboperationexec.cpp-20040414082425-spfhlvqpx5hh2u7nyud2l5ordg7u43eb
          storage/ndb/src/ndbapi/NdbScanOperation.cpp
sp1f-ndbscanoperation.cpp-20040414082425-yr5memqa2kvjbeg5kez5mhmsjkkzcxmz
          storage/ndb/src/ndbapi/TransporterFacade.cpp
sp1f-transporterfacade.cp-20040414082425-7g53fpp472t6eqf5c2az33qijwsnwr5r
          storage/ndb/src/ndbapi/TransporterFacade.hpp
sp1f-transporterfacade.hp-20040414082426-pqplkpocslicfultqmtzrmoisgy3mrha
          storage/ndb/test/include/NDBT_Table.hpp
sp1f-ndbt_table.hpp-20040414082433-sjal22fgm6hdixesyzpmpdicz4kl7yy3
          storage/ndb/test/include/NDBT_Tables.hpp
sp1f-ndbt_tables.hpp-20040414082433-uahalmcwlpd6b3j3t6b6er7s5wju46lt
          storage/ndb/test/include/NDBT_Test.hpp
sp1f-ndbt_test.hpp-20040414082433-xwtu4ad3l6jejmpxybvuza32wyp2eg7l
          storage/ndb/test/ndbapi/Makefile.am
sp1f-makefile.am-20040525095713-tl5yf462jnjwjeu433tiarunzjz3lmzh
          storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp
sp1f-ndbrepstress.cpp-20080108223329-m7rnylugoehdes25xt2g3lf34wytmta4
          storage/ndb/test/ndbapi/testBasic.cpp
sp1f-testbasic.cpp-20040414082437-uyttjhu6c6etzk4n3xe5rdqkxixzpmzh
          storage/ndb/test/ndbapi/testBasicAsynch.cpp
sp1f-testbasicasynch.cpp-20040414082434-y5amhwzqbytdgnogttjyp7wbh6w5qlln
          storage/ndb/test/ndbapi/testInterpreter.cpp
sp1f-testinterpreter.cpp-20040414082437-uys4lv75hhtotdamd3z2k4dx3od6dlgr
          storage/ndb/test/ndbapi/testMgm.cpp
sp1f-testmgm.cpp-20040414082437-aou3ln5hvawx3rszj6qvam7oixyoticz
          storage/ndb/test/ndbapi/testOIBasic.cpp
sp1f-testoibasic.cpp-20040414082437-d643bl36jjvdl5h45jndvvxibkbwrpgh
          storage/ndb/test/ndbapi/testPartitioning.cpp
sp1f-testpartitioning.cpp-20041115204033-cxt3uwultnb4re4wegydlktjon7kcujy
          storage/ndb/test/ndbapi/testSystemRestart.cpp
sp1f-testsystemrestart.cp-20040414082438-t5ula3y3jcg3cs6hqyti5pdnhkhtglha
          storage/ndb/test/ndbapi/test_event.cpp
sp1f-test_event.cpp-20040414082438-mn2bippetrmdotxdqygnmo7y2fhcioia
          storage/ndb/test/run-test/Makefile.am
sp1f-makefile.am-20040526111411-l4ppdj636zpq7aeuphj2i5kst5izlawe
          storage/ndb/test/run-test/autotest-boot.sh
sp1f-autotestboot.sh-20070213013847-6htzi6tpzsvgdiips4ks6htfchtbzxlf
          storage/ndb/test/run-test/autotest-run.sh
sp1f-autotestrun.sh-20070213013847-a5cyfgilhltmal6tvleacwnanazbb3wk
          storage/ndb/test/run-test/daily-basic-tests.txt
sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
          storage/ndb/test/run-test/daily-devel-tests.txt
sp1f-dailydeveltests.txt-20040623115449-iu24viz54gpubbscxtrzjtan6yuff6in
          storage/ndb/test/run-test/main.cpp
sp1f-main.cpp-20040414082441-zazhzwh42vmmnjuvtjl7tigwox3ffn54
          storage/ndb/test/run-test/test-tests.txt
sp1f-testtests.txt-20070213013848-pnwerxbcymd2vqk2ysdjtkwlqyw2spbr
          storage/ndb/test/src/HugoCalculator.cpp
sp1f-hugocalculator.cpp-20040414082441-lvyx5mvny62j4exc7kc4s3c6qxt3ewvl
          storage/ndb/test/src/HugoOperations.cpp
sp1f-hugooperations.cpp-20040414082441-b5v36w5fnbgtbbja5nwixex76wucu7a6
          storage/ndb/test/src/Makefile.am
sp1f-makefile.am-20040525095510-ivuwog6r2bygefcdfwjwmco6rgmgeftw
          storage/ndb/test/src/NDBT_Tables.cpp
sp1f-ndbt_tables.cpp-20040414082441-53t3qr3b6c57u3am56dgttl2nwxtxwzb
          storage/ndb/test/src/NDBT_Test.cpp
sp1f-ndbt_test.cpp-20040414082441-artfvezrpus5ncexgq2vu7ei4btyio4f
          storage/ndb/tools/restore/consumer_restore.cpp
sp1f-consumer_restore.cpp-20040609192428-bzxldffntdpxflj7pqxgnvugxrjnrjzy
          storage/ndb/tools/restore/restore_main.cpp
sp1f-main.cpp-20040414082418-axtjww22xvsugxaltjnpxdoyy2xk2dyg
          storage/ndb/tools/waiter.cpp  
sp1f-waiter.cpp-20040526112828-dwcgs5vxqyxtj46jj77nm7i6htajsbxk
        ------------------------------------------------------------
        revno: 2649.1.12
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: t4-wl4350
        timestamp: Tue 2008-06-10 22:06:47 +0200
        message:
          Remove the MgmgErrorReporter.hpp file
          - Only thing used from there is MGM_REQUIRE, a define that just prints a
message, replace it 
            with the appropriate 'assert' or 'require'
          - ifdef out all code in 'printAllNameValuePairs' since it never used an shall be
removed
        removed:
          storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp
sp1f-mgmterrorreporter.hp-20040414082356-ypc4tzcq57igljep5rcilws3jftzbsos
        modified:
          storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
sp1f-configretriever.cpp-20040414082410-k5hty5ou25dt7chktmzxcaoxv2jdprvf
          storage/ndb/src/mgmclient/CommandInterpreter.cpp
sp1f-commandinterpreter.c-20040414082423-f3zmansbne57pitifvpdlbnj6hjzduph
          storage/ndb/src/mgmsrv/Config.cpp
sp1f-config.cpp-20040414082410-pw6bjfufvgylk3f435i7l2h6rvjx6vsw
          storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
sp1f-initconfigfileparser-20040414082410-njflvxf4bhl7ibktp3poawrv56imjtvz
          storage/ndb/src/mgmsrv/MgmtSrvr.cpp
sp1f-mgmtsrvr.cpp-20040414082424-umdpuhoopirhdgpnkjsxfutesv45x3kn
        ------------------------------------------------------------
        revno: 2649.1.11
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: t4-wl4350
        timestamp: Tue 2008-06-10 20:10:33 +0200
        message:
          Add member variable m_name to each Session and initialize it with
<hostname>:<port>
          when client connects
          If parse of client command fails, return an error message to the client as well
as log
          it to eventlog using "debug", so this output can be turned on when necessary
        modified:
          storage/ndb/src/mgmsrv/Services.cpp
sp1f-services.cpp-20040414082424-enzsfwrjz6enkdid4w5oodjwtqm7v5cz
          storage/ndb/src/mgmsrv/Services.hpp
sp1f-services.hpp-20040414082424-otlyxcwbf5vch5k2zucjv3eifmthlmoy
        ------------------------------------------------------------
        revno: 2649.1.10
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: t4-wl4350
        timestamp: Tue 2008-06-10 19:35:57 +0200
        message:
          Reduce stack requirement
          - use a smaller buffer for receving two int's and a space
          - use sizeof(buf) to avoid magic numbers in code.
        modified:
          storage/ndb/src/common/transporter/TransporterRegistry.cpp
sp1f-transporterregistry.-20040414082412-kmsf342l5o4sodfonfdwdd3pobckcn6r
        ------------------------------------------------------------
        revno: 2649.1.9
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: t4-wl4350
        timestamp: Tue 2008-06-10 19:21:11 +0200
        message:
          Disconnect mgm server connection only if already connected
        modified:
          storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
sp1f-configretriever.cpp-20040414082410-k5hty5ou25dt7chktmzxcaoxv2jdprvf
        ------------------------------------------------------------
        revno: 2649.1.8
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: t4-wl4350
        timestamp: Tue 2008-06-10 19:19:48 +0200
        message:
          Make sure to reflect that the argument to 'getConfig' is not a member variable
           - rename "m_handle_arg" to "mgm_handle"
        modified:
          storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
sp1f-configretriever.cpp-20040414082410-k5hty5ou25dt7chktmzxcaoxv2jdprvf
        ------------------------------------------------------------
        revno: 2649.1.7
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: t4-wl4350
        timestamp: Tue 2008-06-10 16:15:53 +0200
        message:
          Use a fixed block number when creating SignalSender
          
          SignalSender constructor and TransporterFacade::open now takes a block number
          to use when opening the new block. Default is -1 which means dynamic block
number
        modified:
          storage/ndb/src/ndbapi/SignalSender.cpp
sp1f-signalsender.cpp-20050908093451-2bptsw62keoy3yieixs5b7vfs3nueda6
          storage/ndb/src/ndbapi/SignalSender.hpp
sp1f-signalsender.hpp-20050908093451-73zwoeotoz7olhehkj726bxufptg5sj3
          storage/ndb/src/ndbapi/TransporterFacade.cpp
sp1f-transporterfacade.cp-20040414082425-7g53fpp472t6eqf5c2az33qijwsnwr5r
          storage/ndb/src/ndbapi/TransporterFacade.hpp
sp1f-transporterfacade.hp-20040414082426-pqplkpocslicfultqmtzrmoisgy3mrha
        ------------------------------------------------------------
        revno: 2649.1.6
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: t4-wl4350
        timestamp: Tue 2008-06-10 15:08:20 +0200
        message:
          Replace the magic constant 3 with it's defined name GSN_API_REGREQ
        modified:
          storage/ndb/src/ndbapi/TransporterFacade.cpp
sp1f-transporterfacade.cp-20040414082425-7g53fpp472t6eqf5c2az33qijwsnwr5r
        ------------------------------------------------------------
        revno: 2649.1.5
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: t4-wl4350
        timestamp: Tue 2008-06-10 14:41:07 +0200
        message:
          Remove usage of member variables in 'MgmtSrvr::connect_to_self'
           - Use local variables in the function and remove the member variables from
MgmtSrvr
        modified:
          storage/ndb/src/mgmsrv/MgmtSrvr.cpp
sp1f-mgmtsrvr.cpp-20040414082424-umdpuhoopirhdgpnkjsxfutesv45x3kn
          storage/ndb/src/mgmsrv/MgmtSrvr.hpp
sp1f-mgmtsrvr.hpp-20040414082424-mpq3ldj3lrh4fqfstpzdxqray6eiclpv
        ------------------------------------------------------------
        revno: 2649.1.4
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: t4-wl4350
        timestamp: Tue 2008-06-10 11:21:15 +0200
        message:
          Add ATRIBUTE_FORMAT to reportError and reportWarning
           - Will catch faulty format declarations in sprintf like functions
           - "this" pointer is argument 1
           - Fix one faulty format detected
        modified:
          storage/ndb/src/mgmsrv/ConfigInfo.cpp
sp1f-configinfo.cpp-20040414082410-wshnfbesagiy7ekxuwwh5espziudv52a
          storage/ndb/src/mgmsrv/InitConfigFileParser.hpp
sp1f-initconfigfileparser-20040414082410-xjfqcnxkydr76lhuk3mhr2sgeygiyk2x
        ------------------------------------------------------------
        revno: 2649.1.3
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: t4-wl4350
        timestamp: Mon 2008-06-09 20:30:58 +0200
        message:
          Rename the second parameter to 'ndb_mgm_set_connectstring" from "mgmsrv" to
"connect_string"
        modified:
          storage/ndb/src/mgmapi/mgmapi.cpp
sp1f-mgmapi.cpp-20040414082423-a7k5lrztnpv2cjaqrchghgsmiwt2smhv
    ------------------------------------------------------------
    revno: 2663.1.14
    revision-id: msvensson@stripped
    parent: msvensson@stripped
    committer: Magnus Svensson <msvensson@stripped>
    branch nick: 5.1-telco-6.4
    timestamp: Wed 2008-07-23 12:27:21 +0200
    message:
      Removed unused variables from Services.cpp
    modified:
      storage/ndb/src/mgmsrv/Services.cpp
sp1f-services.cpp-20040414082424-enzsfwrjz6enkdid4w5oodjwtqm7v5cz
    ------------------------------------------------------------
    revno: 2663.1.13
    revision-id: msvensson@stripped
    parent: jonas@stripped
    parent: msvensson@stripped
    committer: Magnus Svensson <msvensson@stripped>
    branch nick: 5.1-telco-6.4
    timestamp: Tue 2008-07-22 15:27:57 +0200
    message:
      Merge
    modified:
      storage/ndb/test/include/NDBT_Test.hpp
sp1f-ndbt_test.hpp-20040414082433-xwtu4ad3l6jejmpxybvuza32wyp2eg7l
      storage/ndb/test/include/NdbMgmd.hpp ndbmgmd.hpp-20080623123318-i58qss0o81tc2mlb-1
      storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp
sp1f-ndbrepstress.cpp-20080108223329-m7rnylugoehdes25xt2g3lf34wytmta4
      storage/ndb/test/ndbapi/testBasic.cpp
sp1f-testbasic.cpp-20040414082437-uyttjhu6c6etzk4n3xe5rdqkxixzpmzh
      storage/ndb/test/ndbapi/testBasicAsynch.cpp
sp1f-testbasicasynch.cpp-20040414082434-y5amhwzqbytdgnogttjyp7wbh6w5qlln
      storage/ndb/test/ndbapi/testMgm.cpp
sp1f-testmgm.cpp-20040414082437-aou3ln5hvawx3rszj6qvam7oixyoticz
      storage/ndb/test/ndbapi/testPartitioning.cpp
sp1f-testpartitioning.cpp-20041115204033-cxt3uwultnb4re4wegydlktjon7kcujy
      storage/ndb/test/ndbapi/test_event.cpp
sp1f-test_event.cpp-20040414082438-mn2bippetrmdotxdqygnmo7y2fhcioia
      storage/ndb/test/src/NDBT_Tables.cpp
sp1f-ndbt_tables.cpp-20040414082441-53t3qr3b6c57u3am56dgttl2nwxtxwzb
      storage/ndb/test/src/NDBT_Test.cpp
sp1f-ndbt_test.cpp-20040414082441-artfvezrpus5ncexgq2vu7ei4btyio4f
        ------------------------------------------------------------
        revno: 2663.3.1
        revision-id: msvensson@stripped
        parent: msvensson@stripped
        committer: Magnus Svensson <msvensson@stripped>
        branch nick: t4-NDBT
        timestamp: Tue 2008-07-22 15:25:43 +0200
        message:
          Make it possible to write test programs without Ndb connection
          Move creation and dropping of tables to initializers and finalizers
          Remove NDBT_NdbApiStep(intended as the starting point for more than one db
driver)
          Add "DummyDriver" and "NdbApiDriver" 
        modified:
          storage/ndb/test/include/NDBT_Test.hpp
sp1f-ndbt_test.hpp-20040414082433-xwtu4ad3l6jejmpxybvuza32wyp2eg7l
          storage/ndb/test/include/NdbMgmd.hpp
ndbmgmd.hpp-20080623123318-i58qss0o81tc2mlb-1
          storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp
sp1f-ndbrepstress.cpp-20080108223329-m7rnylugoehdes25xt2g3lf34wytmta4
          storage/ndb/test/ndbapi/testBasic.cpp
sp1f-testbasic.cpp-20040414082437-uyttjhu6c6etzk4n3xe5rdqkxixzpmzh
          storage/ndb/test/ndbapi/testBasicAsynch.cpp
sp1f-testbasicasynch.cpp-20040414082434-y5amhwzqbytdgnogttjyp7wbh6w5qlln
          storage/ndb/test/ndbapi/testMgm.cpp
sp1f-testmgm.cpp-20040414082437-aou3ln5hvawx3rszj6qvam7oixyoticz
          storage/ndb/test/ndbapi/testPartitioning.cpp
sp1f-testpartitioning.cpp-20041115204033-cxt3uwultnb4re4wegydlktjon7kcujy
          storage/ndb/test/ndbapi/test_event.cpp
sp1f-test_event.cpp-20040414082438-mn2bippetrmdotxdqygnmo7y2fhcioia
          storage/ndb/test/src/NDBT_Tables.cpp
sp1f-ndbt_tables.cpp-20040414082441-53t3qr3b6c57u3am56dgttl2nwxtxwzb
          storage/ndb/test/src/NDBT_Test.cpp
sp1f-ndbt_test.cpp-20040414082441-artfvezrpus5ncexgq2vu7ei4btyio4f
    ------------------------------------------------------------
    revno: 2663.1.12
    revision-id: jonas@stripped
    parent: jonas@stripped
    parent: frazer@stripped
    committer: jonas@stripped
    branch nick: telco-6.4
    timestamp: Wed 2008-07-02 16:06:22 +0200
    message:
      merge
    added:
      storage/ndb/test/ndbapi/testLimits.cpp
testlimits.cpp-20080630220416-8iqzxrvd280uesgn-1
    modified:
      storage/ndb/include/kernel/signaldata/TcKeyRef.hpp
sp1f-tckeyref.hpp-20040414082356-reggyd7mgl7jfqvuh2m6ovbuipv3ayli
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
sp1f-dbdict.cpp-20040414082418-iodilitk75ncp4kj2matmhrutqp6ztdo
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
sp1f-dbtc.hpp-20040414082419-ys7w7skv5t7y4kwai7vw6moiecoer3tr
      storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
sp1f-dbtcinit.cpp-20040414082419-toqhykhnfsf67anf3un6jph7vcdweajy
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
sp1f-dbtcmain.cpp-20040414082419-hh3omoivivmmi47yllfxfooxzvblqwla
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp
sp1f-simulatedblock.cpp-20040414082423-ygh3kx5ve2xbpfctceugfdnemzczawx6
      storage/ndb/src/kernel/vm/TransporterCallback.cpp
sp1f-transportercallback.-20040414082423-orvgt4lovbdsqu5gjdkhc6oefovmavrk
      storage/ndb/test/include/NDBT_Table.hpp
sp1f-ndbt_table.hpp-20040414082433-sjal22fgm6hdixesyzpmpdicz4kl7yy3
      storage/ndb/test/include/NDBT_Tables.hpp
sp1f-ndbt_tables.hpp-20040414082433-uahalmcwlpd6b3j3t6b6er7s5wju46lt
      storage/ndb/test/ndbapi/Makefile.am
sp1f-makefile.am-20040525095713-tl5yf462jnjwjeu433tiarunzjz3lmzh
      storage/ndb/test/ndbapi/testOIBasic.cpp
sp1f-testoibasic.cpp-20040414082437-d643bl36jjvdl5h45jndvvxibkbwrpgh
      storage/ndb/test/ndbapi/testPartitioning.cpp
sp1f-testpartitioning.cpp-20041115204033-cxt3uwultnb4re4wegydlktjon7kcujy
      storage/ndb/test/run-test/daily-basic-tests.txt
sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
      storage/ndb/test/src/HugoCalculator.cpp
sp1f-hugocalculator.cpp-20040414082441-lvyx5mvny62j4exc7kc4s3c6qxt3ewvl
      storage/ndb/test/src/HugoOperations.cpp
sp1f-hugooperations.cpp-20040414082441-b5v36w5fnbgtbbja5nwixex76wucu7a6
      storage/ndb/test/src/NDBT_Tables.cpp
sp1f-ndbt_tables.cpp-20040414082441-53t3qr3b6c57u3am56dgttl2nwxtxwzb
    ------------------------------------------------------------
    revno: 2663.1.11
    revision-id: jonas@stripped
    parent: jonas@stripped
    parent: jonas@stripped
    committer: jonas@stripped
    branch nick: telco-6.4
    timestamp: Wed 2008-07-02 16:04:38 +0200
    message:
      merge
    modified:
      storage/ndb/test/run-test/autotest-run.sh
sp1f-autotestrun.sh-20070213013847-a5cyfgilhltmal6tvleacwnanazbb3wk
    ------------------------------------------------------------
    revno: 2585.7.14
    revision-id: jonas@stripped
    parent: jonas@stripped
    committer: jonas@stripped
    branch nick: telco-6.3
    timestamp: Tue 2008-07-01 13:14:13 +0200
    message:
      ndb - autotest
        solaris (default tar) does not support creating zipped archieve
    modified:
      storage/ndb/test/run-test/autotest-run.sh
sp1f-autotestrun.sh-20070213013847-a5cyfgilhltmal6tvleacwnanazbb3wk

Attachment: [text/text/x-diff] patch-2667.diff
Thread
bzr commit into mysql-5.1-telco-6.4 tree (frazer:2667) Bug#33801, Bug#38204,Bug#38424, WL#4258, WL#4350, WL#4391Frazer Clement4 Aug