1. 06 Oct, 2006 1 commit
  2. 05 Oct, 2006 6 commits
    • unknown's avatar
      BUG#23013 make INFORMATION_SCHEMA.FILES easily usable by other engines · ae4afbe0
      unknown authored
      
      sql/ha_ndbcluster.cc:
        update fill_files_table to match new way of doing things
      sql/mysql_priv.h:
        defines for INFORMATION_SCHEMA.FILES column numbers
        add init_fill_schema_files_row()
      sql/sql_show.cc:
        add init_fill_schema_files_row(TABLE*) to help engines with filling schema files.
      ae4afbe0
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug13987-5.0_bugfixonly · df2042a1
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987
      
      Manually merge smaller 5.0 fix with fix-with-test and list sessions for 5.1
      
      
      storage/ndb/include/mgmapi/mgmapi.h:
        Auto merged
      storage/ndb/include/util/InputStream.hpp:
        Auto merged
      storage/ndb/src/common/util/Parser.cpp:
        Auto merged
      storage/ndb/src/common/util/socket_io.cpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/common/util/InputStream.cpp:
        manual merge
      storage/ndb/test/ndbapi/testMgm.cpp:
        manual merge
      df2042a1
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 · 596bf8ec
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987
      
      Merge 5.0-ndb into 5.1-ndb
      
      
      storage/ndb/include/mgmapi/mgmapi.h:
        Auto merged
      storage/ndb/src/kernel/vm/Configuration.cpp:
        Auto merged
      storage/ndb/include/mgmapi/mgmapi_debug.h:
        Auto merged
      storage/ndb/include/util/Parser.hpp:
        Auto merged
      storage/ndb/include/util/socket_io.h:
        Auto merged
      storage/ndb/src/common/util/InputStream.cpp:
        Auto merged
      storage/ndb/src/common/util/Parser.cpp:
        Auto merged
      storage/ndb/src/common/util/socket_io.cpp:
        Auto merged
      storage/ndb/src/cw/cpcd/main.cpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/mgmclient/main.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/Services.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/Services.hpp:
        Auto merged
      storage/ndb/src/mgmsrv/main.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testMgm.cpp:
        Auto merged
      storage/ndb/tools/delete_all.cpp:
        Auto merged
      storage/ndb/tools/drop_index.cpp:
        Auto merged
      storage/ndb/tools/drop_tab.cpp:
        Auto merged
      storage/ndb/tools/listTables.cpp:
        Auto merged
      storage/ndb/tools/select_count.cpp:
        Auto merged
      storage/ndb/tools/waiter.cpp:
        Auto merged
      mysql-test/r/ndb_config.result:
        manual merge
      mysql-test/t/ndb_config.test:
        manual merge
      storage/ndb/include/util/InputStream.hpp:
        manual merge
      storage/ndb/tools/desc.cpp:
        manual merge
      storage/ndb/tools/ndb_condig.cpp:
        manual merge
      storage/ndb/tools/restore/restore_main.cpp:
        manual merge
      storage/ndb/tools/select_all.cpp:
        manual merge
      596bf8ec
    • unknown's avatar
      ndb - bug#17929 · d7bb7cc5
      unknown authored
        guess which scan type to use in handler
      
      
      sql/ha_ndbcluster.cc:
        Add guessing of scan type when starting full-table-scan
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Add methods to check properties of a bitmap of columns
      storage/ndb/include/ndbapi/NdbScanOperation.hpp:
        Add DiskScanFlag
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Add aggregate of #disk columns
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Add #disk columns
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Add disk scan flag
      storage/ndb/tools/delete_all.cpp:
        Add tupscan/diskscan to delete_all
      d7bb7cc5
    • unknown's avatar
      BUG#13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd · db16cae5
      unknown authored
      smaller patch for 5.0.
      
      complete patch going to 5.1 due to more intrusiveness for 'list sessions' etc
      
      
      ndb/include/mgmapi/mgmapi.h:
        add internal get_fd to use in test
      ndb/include/util/InputStream.hpp:
        - add this weird startover member to SocketInputStream
            - this helps work out if we've read a newline yet and should start inserting
                 into buffer from the start
      ndb/src/common/util/InputStream.cpp:
        remove evil, add more.
        
        keep track internally we've retrieved a newline yet (m_startover)
      ndb/src/common/util/Parser.cpp:
        change way detecting of NoLine
        
        remove some trailing whitespace that was uglying the place up a bit
      ndb/src/common/util/socket_io.cpp:
        Always retrieve data from the OS so that we instantly get EOF on disconnect
        and don't end up spinning looking for a newline.
      ndb/src/mgmapi/mgmapi.cpp:
        add internal ndb_mgm_get_fd() for internal testing
        
        handle 'node status' a bit better
      ndb/test/ndbapi/testMgm.cpp:
        Add test for MgmApiSession disconnection (mgmd at 100%)
        
        not fully automated due to smaller patch for 5.0
        
        will be complete in 5.1
      db16cae5
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 83ad64b6
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      83ad64b6
  3. 04 Oct, 2006 5 commits
    • unknown's avatar
      BUG#20809 mysqldump does not backup TS and LG information correctly · 121d7b39
      unknown authored
      restore of the dump (ndb_dd_dump test) was failing for probably a merge problem. fixed now.
      
      
      client/mysqldump.c:
        fix query to make dump restorable
      121d7b39
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · c74ffabe
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/include/mgmapi/mgmapi.h:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      storage/ndb/include/ndb_version.h.in:
        merge
      c74ffabe
    • unknown's avatar
      Merge bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-ndb-bj · e963a7cd
      unknown authored
      into  bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-new-ndb
      
      
      client/mysqltest.c:
        Auto merged
      include/config-netware.h:
        Auto merged
      mysql-test/r/csv.result:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/csv.test:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/ndbapi/Ndb.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      storage/ndb/tools/ndb_condig.cpp:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      storage/csv/ha_tina.cc:
        manual merge.
      storage/innobase/btr/btr0btr.c:
        SCCS merged
      storage/innobase/buf/buf0buf.c:
        SCCS merged
      storage/innobase/dict/dict0dict.c:
        SCCS merged
      storage/innobase/fil/fil0fil.c:
        SCCS merged
      storage/innobase/fsp/fsp0fsp.c:
        SCCS merged
      storage/innobase/handler/ha_innodb.cc:
        SCCS merged
      storage/innobase/include/btr0cur.ic:
        use local
      storage/innobase/include/buf0buf.ic:
        SCCS merged
      storage/innobase/log/log0log.c:
        SCCS merged
      storage/innobase/log/log0recv.c:
        SCCS merged
      storage/innobase/os/os0file.c:
        SCCS merged
      storage/innobase/row/row0mysql.c:
        SCCS merged
      storage/innobase/row/row0sel.c:
        SCCS merged
      storage/innobase/srv/srv0start.c:
        SCCS merged
      storage/innobase/ut/ut0dbg.c:
        SCCS merged
      e963a7cd
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 675f55a6
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
        SCCS merged
      675f55a6
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/5.1/cleanup · 8c6a9560
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/pending
      
      
      storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
        merge
      8c6a9560
  4. 03 Oct, 2006 2 commits
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb · 929cfa7b
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20809
      
      
      929cfa7b
    • unknown's avatar
      BUG#21154 The management server consumes too much CPU · dcf21e94
      unknown authored
      BUG#13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd
      
      fix the actual problem (getting incomplete line of data), introduced with previous
      improvement.
      
      also add list sessions, get session and get session id to mgmapi to allow
      the implementation of a test case for this exact problem.
      
      
      ndb/include/mgmapi/mgmapi.h:
        Add internal ndb_mgm_get_fd for use in test case
      ndb/include/mgmapi/mgmapi_debug.h:
        Add internal get_session_id and get_session
      ndb/include/util/InputStream.hpp:
        - fix warning when building with gcc 4
        - add mutex to be UNLOCKED when blocking (e.g. select(2))
          - this means we can list sessions in a threadsafe way
        - add this weird startover member to SocketInputStream
        	- this helps work out if we've read a newline yet and should start inserting
        	  into buffer from the start
      ndb/include/util/Parser.hpp:
        add mutex to context to pass down to SocketInputStream
      ndb/include/util/socket_io.h:
        readln_socket accepts mutex to UNLOCK around select(2)
      ndb/src/common/util/InputStream.cpp:
        remove evil, add more.
        
        As
      ndb/src/common/util/Parser.cpp:
        set mutex for passing down to InputStream to unlock on select(2).
        
        change way detecting of NoLine
      ndb/src/common/util/socket_io.cpp:
        unlock a mutex around select so that we can nicely do thread safe
        listing of sessions.
        
        Always retrieve data from the OS so that we instantly get EOF on disconnect
        and don't end up spinning looking for a newline.
      ndb/src/mgmapi/mgmapi.cpp:
        add internal ndb_mgm_get_fd() for internal testing
        
        internal/debug:
        ndb_mgm_get_session_id
        
        ndb_mgm_get_session
      ndb/src/mgmsrv/Services.cpp:
        Add list sessions, get session id and get session.
        
        introduce a session mutex
      ndb/src/mgmsrv/Services.hpp:
        Add list and get session.
        
        Add session_id to MgmApiSession.
      ndb/test/ndbapi/testMgm.cpp:
        Add test for MgmApiSession disconnection (mgmd at 100%)
      dcf21e94
  5. 28 Sep, 2006 3 commits
    • unknown's avatar
      Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-19651 · af8903b2
      unknown authored
      into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-19651
      
      
      storage/ndb/include/util/ndb_opts.h:
        Auto merged
      storage/ndb/test/ndbapi/flexScan.cpp:
        Auto merged
      storage/ndb/tools/ndb_condig.cpp:
        Auto merged
      storage/ndb/tools/restore/consumer.hpp:
        merged for push bug#19651
      storage/ndb/tools/restore/consumer_restore.cpp:
        merged for push bug#19651
      storage/ndb/tools/restore/consumer_restore.hpp:
        merged for push bug#19651
      storage/ndb/tools/restore/restore_main.cpp:
        merged for push bug#19651
      af8903b2
    • unknown's avatar
      Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-bug-19651 · c55f25ca
      unknown authored
      into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-19651
      
      
      ndb/test/ndbapi/flexScan.cpp:
        Auto merged
      ndb/tools/ndb_config.cpp:
        Auto merged
      ndb/tools/restore/consumer_restore.cpp:
        Auto merged
      ndb/tools/restore/consumer_restore.hpp:
        Auto merged
      ndb/tools/restore/restore_main.cpp:
        Auto merged
      ndb/include/util/ndb_opts.h:
        C
      c55f25ca
    • unknown's avatar
      Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-ndb-bj · a0a664c8
      unknown authored
      into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-bug-19651
      
      
      a0a664c8
  6. 26 Sep, 2006 12 commits
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · fe8c506c
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      storage/ndb/include/ndbapi/NdbTransaction.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      fe8c506c
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 41844081
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-work
      
      
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      41844081
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 81c9ab54
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      81c9ab54
    • unknown's avatar
      ndb - bug#15303 · add68c0c
      unknown authored
        Fix take-over during SR, remove coupling to lcp/gcp (if systemRestartOngoing())
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Fix take-over during SR
      add68c0c
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 4530566d
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      4530566d
    • unknown's avatar
      ndb - bug#22672 · 5ad0f036
      unknown authored
        handle also CS_CONNECTED as "abort" in handleFailedApi to keep from falling on assertion in releaseApiCon
          in case of committed dirtyRead
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        handle also CS_CONNECTED as "abort" to keep from falling on assertion in releaseApiCon
          in case of committed dirtyRead
      5ad0f036
    • unknown's avatar
      ndb - bug#21690: cleanup: set column properties in any order before create · c9ebf5df
      unknown authored
      
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        compute aggregates only before create table or by user request.
        remove distribution key hacks (set by user/set by us..)
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        compute aggregates only before create table or by user request.
        remove distribution key hacks (set by user/set by us..)
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        compute aggregates only before create table or by user request.
        remove distribution key hacks (set by user/set by us..)
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        compute aggregates only before create table or by user request.
        remove distribution key hacks (set by user/set by us..)
      storage/ndb/test/include/NDBT_Table.hpp:
        compute aggregates only before create table or by user request.
        remove distribution key hacks (set by user/set by us..)
      storage/ndb/test/src/NDBT_Tables.cpp:
        compute aggregates only before create table or by user request.
        remove distribution key hacks (set by user/set by us..)
      c9ebf5df
    • unknown's avatar
      ndb - post merge fixes... · 4d6c4dbe
      unknown authored
      
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        merge
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        merge
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        merge
      4d6c4dbe
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 05ba11bf
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-work
      
      
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/include/ndbapi/NdbTransaction.hpp:
        merge
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        merge
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        merge
      05ba11bf
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 6806ca7d
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      6806ca7d
    • unknown's avatar
      ndb - bug#20895 · 4b6e6da6
      unknown authored
        Fix occational LCP hang!!!
        Make sure only to consider alive nodes in startNextChkpt
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Make sure only to consider alive nodes in startNextChkpt
      4b6e6da6
    • unknown's avatar
      fix for bug#19651, if temporary error occured while retoring, report it in the restore result. · d743ce1e
      unknown authored
      
      ndb/tools/restore/consumer.hpp:
        added a function to judge whether there is temporary error.
      ndb/tools/restore/consumer_restore.cpp:
        record when temporary error occured in restore.
      ndb/tools/restore/consumer_restore.hpp:
        added a member to record temporary error in restore.
      ndb/tools/restore/restore_main.cpp:
        report temporary error in restore.
      d743ce1e
  7. 22 Sep, 2006 6 commits
  8. 21 Sep, 2006 3 commits
  9. 20 Sep, 2006 2 commits