1. 22 Jul, 2005 24 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 134b8536
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
      
      
      134b8536
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2e293683
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
      
      
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
        Auto merged
      storage/ndb/test/include/HugoOperations.hpp:
        Auto merged
      storage/ndb/test/ndbapi/testNdbApi.cpp:
        Auto merged
      storage/ndb/test/src/HugoOperations.cpp:
        Auto merged
      2e293683
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · e3dc8243
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
      
      
      storage/ndb/include/kernel/NodeInfo.hpp:
        Auto merged
      storage/ndb/include/transporter/TransporterCallback.hpp:
        Auto merged
      storage/ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      storage/ndb/src/kernel/vm/TransporterCallback.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ClusterMgr.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ClusterMgr.hpp:
        Auto merged
      storage/ndb/src/ndbapi/TransporterFacade.cpp:
        Auto merged
      storage/ndb/src/ndbapi/TransporterFacade.hpp:
        Auto merged
      e3dc8243
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 62cd4c14
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-5.0
      
      
      62cd4c14
    • unknown's avatar
      bug#11133 - ndb write/lock upgrade · 86999f2a
      unknown authored
        fix test case
        improve testing
      
      
      ndb/test/include/HugoOperations.hpp:
        Partial write (only pk)
      ndb/test/ndbapi/testNdbApi.cpp:
        improve testcase
          use writePartial to verify that ops get correctly converted
          (also test negative)
      ndb/test/src/HugoOperations.cpp:
        write partial + improve prinout in wait_async
      86999f2a
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · bc4e3843
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
      
      
      sql/slave.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/Backup.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        Auto merged
      storage/ndb/tools/restore/Restore.cpp:
        Auto merged
      storage/ndb/tools/restore/consumer_printer.hpp:
        Auto merged
      storage/ndb/tools/restore/restore_main.cpp:
        Auto merged
      bc4e3843
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · c4daaa17
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/wl2347
      
      
      c4daaa17
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 73899048
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      73899048
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 848daad7
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/wl2347
      
      
      848daad7
    • unknown's avatar
      WL#2347 - Load independent heartbeats · f4b56000
      unknown authored
      Reset missed heartbeat count on receipt of signal from node.
      
      This fixes a bug where that under high network load, the heartbeat packets could be
      delayed, causing the appearance of node failure (due to lost heartbeats).
      
      
      ndb/include/kernel/NodeInfo.hpp:
        Add m_heartbeat_cnt to track missed heartbeats
      ndb/include/transporter/TransporterCallback.hpp:
        add prototype for transporter_recv_from()
        
        Called on receipt from a node.
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Add calls to transporter_receive_from when data is received (before unpack)
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        remove NodeRec::alarmCount. missed heartbeat count now kept in NodeInfo
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Use NodeInfo::m_heartbeat_cnt for missed heartbeat count
      ndb/src/kernel/vm/TransporterCallback.cpp:
        add transporter_recv_from(), which is called on receipt of signals.
        It resets missed heartbeat count for that node.
      ndb/src/ndbapi/ClusterMgr.cpp:
        Use NodeInfo::m_heartbeat_cnt for missed heartbeat count
      ndb/src/ndbapi/ClusterMgr.hpp:
        Use NodeInfo::m_heartbeat_cnt instead of ClusterMgr::Node::hbSent for missed
        heartbeat count.
        
        We now use the same storage for API and Kernel heartbeats.
        
        Add ClusterMgr::hb_received(nodeId) to reset hbSent (as if we received a heartbeat,
        but callable from elsewhere - e.g. when signal received)
      ndb/src/ndbapi/TransporterFacade.cpp:
        Implement transporter_recv_from for ndbapi - which resets hbSent
      ndb/src/ndbapi/TransporterFacade.hpp:
        Add hb_received(nodeId)
      f4b56000
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · 93ab1b50
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        Auto merged
      ndb/tools/restore/restore_main.cpp:
        Auto merged
      93ab1b50
    • unknown's avatar
      bug#11675 - ndb backup · 3ea233d5
      unknown authored
        Fix invalid backup log when using #nodes != 2^x
        Fix ndb_restore --printXXX options
          (among other init counters)
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        remove frag_mask since in 5.0 extra frag bit in in bit 0
      ndb/src/kernel/blocks/backup/Backup.hpp:
        remove frag_mask since in 5.0 extra frag bit in in bit 0
      ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        send "real" frag id to backup
      ndb/tools/restore/Restore.cpp:
        Changed prinout (since it's wrong if you only print stuff)
      ndb/tools/restore/consumer_printer.hpp:
        Init log/data count in printer
      ndb/tools/restore/restore_main.cpp:
        Fix if-statements
          for correct handling of ndb_restore flags
      3ea233d5
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 80437546
      unknown authored
      into  mysql.com:/Users/mikron/mysql-5.1
      
      
      80437546
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1.b11754 · f0e62d62
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      strings/ctype-utf8.c:
        Auto merged
      f0e62d62
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · adf5fdcd
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      adf5fdcd
    • unknown's avatar
      Fixed error in constants · 37a4780d
      unknown authored
      
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Set up node group information as default if no node group info is
        passed in create table message.
      37a4780d
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · d1e96a25
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b11754
      
      
      d1e96a25
    • unknown's avatar
      Merge deer.(none):/home/hf/work/mysql-4.1.clean · f1029fd7
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.clean
      
      
      VC++Files/libmysqld/libmysqld.dsp:
        Auto merged
      f1029fd7
    • unknown's avatar
      merging · afd6b4e8
      unknown authored
      afd6b4e8
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-4.0 · 002a020f
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.0.clean
      
      
      002a020f
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7c681137
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      7c681137
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 17725b9d
      unknown authored
      into  radha.local:/Users/patg/mysql-build/mysql-5.0.msvensson
      
      
      17725b9d
    • unknown's avatar
      Applied and tested this patch successfully (bug 10431) to a clean · 606c22ac
      unknown authored
      tree on brian's amd 64 box (which was already approved). 
      
      [patg@zim mysql-5.0]$ bk changes
      ChangeSet@1.1882, 2005-07-21 18:43:55+05:00, gluh@eagle.intranet.mysql.r18.ru
        merge fix
      
      Was the changeset level I applied this patch to.
      
      Master shutdown finished
      Slave shutdown finished
      All 326 tests were successful.
      
      [patg@zim mysql-5.0]$ 
      
      
      client/mysqldump.c:
        This is a fresh application of Magnus Svensson's patch for bug 10431
      mysql-test/r/mysqldump.result:
        Fresh application of Magnus Svensson's patch for bug 10431
      mysql-test/t/mysqldump.test:
        fresh application of Magnus Svensson's patch for bug 10431
      606c22ac
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 24ae2eb0
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
      
      
      storage/innobase/include/sync0sync.h:
        Auto merged
      storage/innobase/sync/sync0sync.c:
        Auto merged
      24ae2eb0
  2. 21 Jul, 2005 16 commits