List:Commits« Previous MessageNext Message »
From:Frazer Clement Date:June 26 2008 10:46am
Subject:bzr commit into mysql-5.1-telco-6.3 tree (frazer:2633) Bug#37628
View as plain text  
#At file:///home/frazer/bzr/mysql-5.1-telco-6.3/

------------------------------------------------------------
revno: 2633
revision-id: frazer@stripped
parent: frazer@stripped
parent: jonas@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.3
timestamp: Thu 2008-06-26 11:46:06 +0100
message:
  Merge
added:
  storage/ndb/test/run-test/conf-fimafeng08.cnf conffimafeng08.cnf-20080624140805-rbdj4pe7kcnjwsi9-1
modified:
  BUILD/compile-ndb-autotest     sp1f-compilendbautotest-20060621072052-epq5zpjusgpsl2nnt6qmogxenxm6bxrr
  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp sp1f-ndbeventoperationimp-20040414082425-hg5aiqrtvpekpavvqa6cc3kvy2mjllud
  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
    ------------------------------------------------------------
    revno: 2631.1.5
    revision-id: jonas@stripped
    parent: ndbdev@fimafeng08-20080625101727-qyoonxar10as726p
    parent: jonas@stripped
    committer: jonas@stripped
    branch nick: telco-6.3
    timestamp: Wed 2008-06-25 15:00:44 +0200
    message:
      merge
    modified:
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp sp1f-ndbeventoperationimp-20040414082425-hg5aiqrtvpekpavvqa6cc3kvy2mjllud
        ------------------------------------------------------------
        revno: 2572.20.7
        revision-id: jonas@stripped
        parent: jonas@stripped
        parent: tomas.ulin@stripped
        committer: jonas@stripped
        branch nick: telco-6.2
        timestamp: Wed 2008-06-25 14:53:12 +0200
        message:
          merge
        added:
          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
        modified:
          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_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/tools/restore/consumer_restore.cpp sp1f-consumer_restore.cpp-20040609192428-bzxldffntdpxflj7pqxgnvugxrjnrjzy
          storage/ndb/tools/restore/restore_main.cpp sp1f-main.cpp-20040414082418-axtjww22xvsugxaltjnpxdoyy2xk2dyg
        ------------------------------------------------------------
        revno: 2572.20.6
        revision-id: jonas@stripped
        parent: jonas@stripped
        committer: jonas@stripped
        branch nick: telco-6.2
        timestamp: Wed 2008-06-25 14:49:13 +0200
        message:
          ndb - bug#37628
            Fix variable scoping (remove duplicate variable start_gci)
            in complete_out_of_order_buckets
            also correct a printout in same function
        modified:
          storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp sp1f-ndbeventoperationimp-20040414082425-hg5aiqrtvpekpavvqa6cc3kvy2mjllud
    ------------------------------------------------------------
    revno: 2631.1.4
    revision-id: ndbdev@fimafeng08-20080625101727-qyoonxar10as726p
    parent: ndbdev@fimafeng08-20080624140839-7q6ruym7aptubhrg
    committer: Local MySQL user <ndbdev@fimafeng08>
    branch nick: mysql-5.1-telco-6.3
    timestamp: Wed 2008-06-25 12:17:27 +0200
    message:
      add config file for trondheim host also to Makefile
    modified:
      storage/ndb/test/run-test/Makefile.am sp1f-makefile.am-20040526111411-l4ppdj636zpq7aeuphj2i5kst5izlawe
    ------------------------------------------------------------
    revno: 2631.1.3
    revision-id: ndbdev@fimafeng08-20080624140839-7q6ruym7aptubhrg
    parent: ndbdev@fimafeng08-20080624140454-172apq8go3qwvprh
    committer: Local MySQL user <ndbdev@fimafeng08>
    branch nick: mysql-5.1-telco-6.3
    timestamp: Tue 2008-06-24 16:08:39 +0200
    message:
      add config file for trondheim host
    added:
      storage/ndb/test/run-test/conf-fimafeng08.cnf conffimafeng08.cnf-20080624140805-rbdj4pe7kcnjwsi9-1
    modified:
      storage/ndb/test/run-test/autotest-boot.sh sp1f-autotestboot.sh-20070213013847-6htzi6tpzsvgdiips4ks6htfchtbzxlf
    ------------------------------------------------------------
    revno: 2631.1.2
    revision-id: ndbdev@fimafeng08-20080624140454-172apq8go3qwvprh
    parent: ndbdev@fimafeng08-20080624105341-pa34nl2whe9sts4n
    committer: Local MySQL user <ndbdev@fimafeng08>
    branch nick: mysql-5.1-telco-6.3
    timestamp: Tue 2008-06-24 16:04:54 +0200
    message:
      fix usage of hostname for solaris
    modified:
      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
    ------------------------------------------------------------
    revno: 2631.1.1
    revision-id: ndbdev@fimafeng08-20080624105341-pa34nl2whe9sts4n
    parent: tomas.ulin@stripped
    committer: Local MySQL user <ndbdev@fimafeng08>
    branch nick: mysql-5.1-telco-6.3
    timestamp: Tue 2008-06-24 12:53:41 +0200
    message:
      add hook for os-specific configure options for autotest
    modified:
      BUILD/compile-ndb-autotest     sp1f-compilendbautotest-20060621072052-epq5zpjusgpsl2nnt6qmogxenxm6bxrr

Attachment: [text/text/x-diff] patch-2633.diff
Thread
bzr commit into mysql-5.1-telco-6.3 tree (frazer:2633) Bug#37628Frazer Clement26 Jun