1. 05 Jun, 2007 4 commits
    • unknown's avatar
      Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca · ab4c64b4
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      mysql-test/ndb/ndb_config_2_node.ini:
        Auto merged
      storage/ndb/include/ndb_global.h.in:
        Auto merged
      storage/ndb/src/common/portlib/NdbTick.c:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/restore.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
        Auto merged
      storage/ndb/src/kernel/vm/WatchDog.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/tools/restore/Restore.cpp:
        Auto merged
      ab4c64b4
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · 98708b01
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
      
      
      mysql-test/ndb/ndb_config_2_node.ini:
        Auto merged
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        manual merge
      98708b01
    • unknown's avatar
      Bug #28751 Lots of memory locked in memory causes high kswapd · 35b2f212
      unknown authored
      - add odirect option for lcp+backup+redo log to lower CPU/kswapd usage
      - writing odirect removes need for kernel write buffers avoiding kswapd to kick in
      
      
      mysql-test/ndb/ndb_config_2_node.ini:
        run mysql-test-run using ODirect
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
        add new config parameter to choose ODirect
      storage/ndb/include/ndb_global.h.in:
        specify alignment needed for odirect
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        read odirect config param
        open LCP and Backup datafiles with odirect if specified
        insert empty padding record if odirect is used
        allocate buffers aligned to be able to use odirect
      storage/ndb/src/kernel/blocks/backup/Backup.hpp:
        odirect and padding options
      storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
        add empty_record in file format
      storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
        read odirect config and allocate aligned
      storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp:
        correct debug printouts
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        read odirect config param and align buffers
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
        read odirect config param and align buffers
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        read config params and open redo log files with odirect if set
      storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
        aligned writing for odirect
        correct odirect open options with test+fallback if odirect fails
      storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
        align + odirect check
      storage/ndb/src/kernel/blocks/restore.cpp:
        restor block to ignore new lcp padding empty_record
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
        alligend log buffer allocation for odirect
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
        alligend log buffer allocation for odirect
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        new config param for odirect, default false
      storage/ndb/tools/restore/Restore.cpp:
        ndb_restore to skip empty_record alignment padding in backup file
      35b2f212
    • unknown's avatar
      Bug #28899 not possible to set separate watchdog timeout at startup · 1182b801
      unknown authored
      
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
        add new configuration parameter TimeBetweenWatchDogCheckInitial
      storage/ndb/include/portlib/NdbTick.h:
        enable timing code
      storage/ndb/src/common/portlib/NdbTick.c:
        enable timing code
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        read watchdog timeout to set it after malloc
      storage/ndb/src/kernel/vm/Configuration.cpp:
        read initial watchdog timeout and set it in the beginning
      storage/ndb/src/kernel/vm/Configuration.hpp:
        read initial watchdog timeout and set it in the beginning
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
        introduce new state for "action" malloc of memory
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
        introduce new state for "action" malloc of memory
      storage/ndb/src/kernel/vm/WatchDog.cpp:
        rewrite watchdog to check every 100ms for being stuch, but keep shutdown after 3 * interval
        for "action" == 9 (malloc)  keep old behavior and only output every interval
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        add new configuration parameter TimeBetweenWatchDogCheckInitial
      1182b801
  2. 04 Jun, 2007 5 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · f635b715
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      f635b715
    • unknown's avatar
      ndb - bug#28726 · 253c2808
      unknown authored
        make sure to remove LCP files aswell if specifying --initial
      
      
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Add removal of LCP/X directories
      253c2808
    • unknown's avatar
      ndb - · f8057c4b
      unknown authored
        update dl145a config for autotest
      
      
      storage/ndb/test/run-test/conf-dl145a.cnf:
        update dl145a config for autotest
      f8057c4b
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · dfb34b07
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      mysql-test/ndb/ndb_config_1_node.ini:
        Auto merged
      mysql-test/ndb/ndb_config_2_node.ini:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      dfb34b07
    • unknown's avatar
      ndb - make size of redo log files (fragment log files) configurable · c8e0d0db
      unknown authored
        using new config variable FragmentLogFileSize (4M - 1G)
      
      
      mysql-test/ndb/ndb_config_1_node.ini:
        change log file size (test)
      mysql-test/ndb/ndb_config_2_node.ini:
        change log file size (test)
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
        add new confif parameter
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        make logfile size configurable
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
        make logfile size configurable
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        make logfile size configurable
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        add new config variable
      storage/ndb/src/ndbapi/ndberror.c:
        update error message
      c8e0d0db
  3. 03 Jun, 2007 2 commits
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · b5445c15
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      storage/ndb/src/kernel/blocks/pgman.cpp:
        Auto merged
      b5445c15
    • unknown's avatar
      Bug#20612. · 1a166bc4
      unknown authored
      
      storage/ndb/src/kernel/blocks/pgman.cpp:
        a) in one case pl_queue.remove(ptr) was not followed
        by state &= ~ Page_entry::ONQUEUE.
        
        b) when collecting initial hot entries have to remove
        from queue if somehow got there.
        
        b) is easy to get with large buffer cache (256M).
        a) or b) is probably cause of bug#20612.
      1a166bc4
  4. 30 May, 2007 8 commits
  5. 29 May, 2007 9 commits
    • unknown's avatar
      shorten some files for tar to work · a14059db
      unknown authored
      
      storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp:
        Rename: storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index.cpp -> storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp
      storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp:
        Rename: storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp
      storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp:
        Rename: storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp
      storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp:
        Rename: storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp -> storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp
      storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp:
        Rename: storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual.cpp -> storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp
      a14059db
    • unknown's avatar
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · 92bea0c3
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
      
      
      92bea0c3
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 07fcd267
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
      
      
      07fcd267
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · 840dfc39
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      840dfc39
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · 4efc39f9
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
      
      
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      4efc39f9
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 34cbf35e
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
      
      
      storage/ndb/test/run-test/daily-basic-tests.txt:
        merge
      34cbf35e
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · f75c300a
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/test/run-test/daily-basic-tests.txt:
        merge
      f75c300a
    • unknown's avatar
      ndb - fix typo · bfc82a63
      unknown authored
      bfc82a63
  6. 28 May, 2007 12 commits