1. 20 Dec, 2004 1 commit
    • unknown's avatar
      Part 1 of impl2 of WL2278 (Dynamic port allocation of cluster nodes). · 87c85d6f
      unknown authored
      Implementation of "get connection parameter" mgmd call for getting from mgmd what port to use for a connection between two nodes.
      
      (The actual use of this function is not yet implemented)
      
      
      ndb/include/mgmapi/mgmapi_debug.h:
        Add ndb_mgm_get_connection_int_parameter() prototype
      ndb/src/mgmapi/mgmapi.cpp:
        Add ndb_mgm_get_connection_int_parameter() implementation
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Add implementation of MgmtSrvr::getConnectionDbParameter()
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Add prototype for get_connectionDbParemeter
      ndb/src/mgmsrv/Services.cpp:
        Add "get connection parameter" mgmd command (for over the wire)
        
        add getConnectionParameter handler for it
      ndb/src/mgmsrv/Services.hpp:
        Add prototype for getConnectionParameter
      87c85d6f
  2. 17 Dec, 2004 1 commit
  3. 16 Dec, 2004 6 commits
    • unknown's avatar
      Fix the following: · ae3ea5a9
      unknown authored
      ndb_mgm_set_int_parameter
      ndb_mgm_set_int64_parameter
      ndb_mgm_set_string_parameter
      
      
      ndb/src/mgmapi/mgmapi.cpp:
        Don't include a ': ' at the end of an args.put() name.
        
        It is likely that the following calls don't work before this checkin:
        ndb_mgm_set_int_parameter
        ndb_mgm_set_int64_parameter
        ndb_mgm_set_string_parameter
        
        luckily nobody was actually calling these.
      ae3ea5a9
    • unknown's avatar
      finish Impl 1 "report port" of WL2278 · 90b34155
      unknown authored
      Dynamic port allocation of cluster nodes:
      Impl 1 is reporting the port used back to the mgmd. No actual dynamic ports.
      
      
      ndb/src/common/mgmcommon/IPCConfig.cpp:
        pass correct node id to add_transporter_interface.
        
        remoteNodeId is what we want, and is what we're now passing
      ndb/src/mgmapi/mgmapi.cpp:
        Don't use a ': ' at the end of args.put calls.
      ndb/src/mgmsrv/Services.cpp:
        Fix indenting
      90b34155
    • unknown's avatar
      Add DBUG_PRINT to ndb_mgm_call when we encounter arguments (Properties) that... · 82b5701b
      unknown authored
      Add DBUG_PRINT to ndb_mgm_call when we encounter arguments (Properties) that we are going to ignore (not send to mgmd).
      
      
      ndb/src/mgmapi/mgmapi.cpp:
        Add DBUG_PRINT to ndb_mgm_call when we encounter arguments (Properties)
        that we are going to ignore.
        
        Useful in debugging additions to mgmapi.
      82b5701b
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb · dbb4671b
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port
      
      
      dbb4671b
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb · 007c9e29
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port
      
      
      ndb/include/transporter/TransporterRegistry.hpp:
        Auto merged
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      ndb/src/kernel/main.cpp:
        Auto merged
      007c9e29
    • unknown's avatar
      Further work on WL2278 · ff99dce1
      unknown authored
      Add calls to mgmd after setting up connections.
      (not fully functional yet, checkin for pull)
      
      
      ndb/include/mgmcommon/ConfigRetriever.hpp:
        add get_mgmHandle() member function
      ndb/include/transporter/TransporterRegistry.hpp:
        Add remoteNodeId parameter to add_transporter interface
        
        add get_transporter() and get_localNodeID()
        
        these are required for getting the right information out of TransporterRegistry to inform mgmd of what ports we use to connect to other nodes.
      ndb/src/common/mgmcommon/IPCConfig.cpp:
        call add_transporter_interface with the new nodeId2 parameter
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Implement additional (remoteNodeId) parameter in add_transporter_interface
        
        Implement get_transporter()
      ndb/src/kernel/main.cpp:
        Call ndb_mgm_set_connection_int_parameter() to tell mgmd what ports we use to connect to other nodes.
      ndb/src/kernel/vm/Configuration.hpp:
        add get_config_retriever()
      ndb/src/mgmapi/mgmapi.cpp:
        Add DBUG_ENTER call to ndb_mgm_set_connection_int_parameter
      ndb/src/ndbapi/TransporterFacade.hpp:
        Add get_registry()
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Add call to ndb_mgm_set_connection_int_parameter to tell mgmd what ports we use to connect to other nodes.
      ff99dce1
  4. 15 Dec, 2004 9 commits
    • unknown's avatar
      wl2240 - test prg for distribution keys wrt ordered indexes · 61680336
      unknown authored
      
      ndb/test/include/HugoOperations.hpp:
        Fix pkRead on ordered index
      ndb/test/ndbapi/testPartitioning.cpp:
        Update test prg to handled ordered indexes aswell
      ndb/test/src/HugoOperations.cpp:
        Fix pkRead on ordered index
      ndb/test/src/HugoTransactions.cpp:
        Fix pkRead on ordered index
      61680336
    • unknown's avatar
      wl2240 - ndb - fix typo · ce897872
      unknown authored
      
      ndb/src/ndbapi/NdbOperationSearch.cpp:
        Fix typo
      ce897872
    • unknown's avatar
      wl2240 - ndb partitioning bug fixes for range scans · 7bc419f5
      unknown authored
      
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Fix setting of dist keys for ordered indexes
      ndb/src/ndbapi/NdbOperationSearch.cpp:
        Remove support for combined distribution key and range scan
      sql/ha_ndbcluster.cc:
        Merge error with wl2126
      7bc419f5
    • unknown's avatar
      wl2126 - ndb - merge and ifdef still waiting for inge · 527b18aa
      unknown authored
      
      sql/ha_ndbcluster.cc:
        #ifdef on key_multi_range
      sql/ha_ndbcluster.h:
        Use forward declarations for key_multi_range
      527b18aa
    • unknown's avatar
      Merge · ae971ecd
      unknown authored
      
      ndb/include/kernel/AttributeHeader.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        Auto merged
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      ndb/test/include/HugoOperations.hpp:
        Auto merged
      ndb/test/ndbapi/testOIBasic.cpp:
        Auto merged
      ndb/test/src/HugoOperations.cpp:
        Auto merged
      ndb/test/src/HugoTransactions.cpp:
        Auto merged
      ndb/test/src/UtilTransactions.cpp:
        Auto merged
      ndb/tools/select_count.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      ndb/include/ndbapi/NdbDictionary.hpp:
        SCCS merged
      ndb/src/ndbapi/NdbDictionary.cpp:
        SCCS merged
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        SCCS merged
      ae971ecd
    • unknown's avatar
      wl2240 - ndb - scan only 1 fragment if possible · 7a7ac8f6
      unknown authored
      
      ndb/src/common/debugger/signaldata/ScanTab.cpp:
        Fix printout
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Set distribution key for ordered indexes
      ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Allow create_index_object to modify index_table
      ndb/tools/restore/consumer_restore.cpp:
        Allow create_index_object to modify index_table
      7a7ac8f6
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 09206a94
      unknown authored
      into shark.:/space/ndbdev/clone-mysql-5.0-ndb-daily-2004-12-14
      
      
      09206a94
    • unknown's avatar
      don't compile instance-manager by default, as it never compiles · 14987c6b
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      14987c6b
    • unknown's avatar
      wl2240 - ndb partitioning, bug fixes · 9c81f43b
      unknown authored
      
      ndb/src/common/debugger/signaldata/ScanTab.cpp:
        Fix printout of SCAN_TABREQ
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Set correct status on scanfrag record
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Fix setting of distribution key wrt scan
      ndb/tools/select_count.cpp:
        Fix select_count
      9c81f43b
  5. 14 Dec, 2004 9 commits
    • unknown's avatar
      ndb - major update HugoOperations/Transactions · 3f89a4f3
      unknown authored
           +more code reuse
           +easier testing of indexes
      
      
      ndb/include/ndbapi/NdbDictionary.hpp:
        Remove unimplemented enums
      ndb/test/include/HugoOperations.hpp:
        Pass index on constructor
      ndb/test/include/HugoTransactions.hpp:
        Pass index on constructor
      ndb/test/include/UtilTransactions.hpp:
        Pass index on constructor
      ndb/test/src/HugoAsynchTransactions.cpp:
        Pass index on constructor
      ndb/test/src/HugoOperations.cpp:
        Use getOperation to select operation type
      ndb/test/src/HugoTransactions.cpp:
        Use HugoOpertaions to run transactions
      ndb/test/src/UtilTransactions.cpp:
        Use HugoOpertaions to run transactions
      3f89a4f3
    • unknown's avatar
      wl2240 - ndb partitioning, · 253dab84
      unknown authored
        fix scan take over
      
      
      ndb/include/kernel/AttributeDescriptor.hpp:
        remove deprecated bits
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        removed deprecated parameters
        moved never implemented to Unimplemented
      ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
        removed deprecated parameters
        moved never implemented to Unimplemented
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        removed deprecated parameters
        moved never implemented to Unimplemented
      ndb/src/kernel/vm/MetaData.hpp:
        removed deprecated parameters
        moved never implemented to Unimplemented
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        removed deprecated parameters
        moved never implemented to Unimplemented
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Do scan take over via distribution key code
      253dab84
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · c798d5be
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      c798d5be
    • unknown's avatar
      ndb - Handle connections without corresponding node · 63b36352
      unknown authored
      
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Handle connections without corresponding node
      63b36352
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 249772a2
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      249772a2
    • unknown's avatar
      ndb - fix protection wrt shm · ebee4cfa
      unknown authored
      
      ndb/include/transporter/TransporterRegistry.hpp:
        fix protection
      ebee4cfa
    • unknown's avatar
      merge · f6296657
      unknown authored
      
      ndb/src/kernel/main.cpp:
        Auto merged
      ndb/src/ndbapi/TransporterFacade.cpp:
        Auto merged
      f6296657
    • unknown's avatar
      ndb - shm transporter benchmark result · 7e7a2b32
      unknown authored
      
      ndb/docs/wl2077.txt:
        Add result from micro benchmark with shm-transporter
      ndb/include/transporter/TransporterRegistry.hpp:
        Move pid into transporter registry
      ndb/src/common/transporter/SHM_Transporter.cpp:
        Move pid into transporter registry
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Move pid into transporter registry
      ndb/src/kernel/main.cpp:
        Move pid into transporter registry
      ndb/src/ndbapi/TransporterFacade.cpp:
        Move pid into transporter registry
      7e7a2b32
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb · eab8601c
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port
      
      
      eab8601c
  6. 13 Dec, 2004 8 commits
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 629153d4
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my50-cc
      
      
      629153d4
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 8ff19719
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/src/kernel/main.cpp:
        Auto merged
      ndb/src/ndbapi/TransporterFacade.cpp:
        Auto merged
      8ff19719
    • unknown's avatar
      ndb - Handle shm-transporter wo/ busy-wait + also · f507b377
      unknown authored
            handled mixed tcp/shm transporters
      + bug#7124
      
      
      ndb/src/common/transporter/SHM_Transporter.cpp:
        Add remote/own pid for signaling availability of data on shm-segment
      ndb/src/common/transporter/SHM_Transporter.hpp:
        Add remote/own pid for signaling availability of data on shm-segment
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Add remote/own pid for signaling availability of data on shm-segment
      ndb/src/kernel/main.cpp:
        Set pid to use for shm-signaling
      ndb/src/mgmsrv/ConfigInfo.cpp:
        bug#7124
      ndb/src/ndbapi/TransporterFacade.cpp:
        Set pid to use for shm-signaling
      f507b377
    • unknown's avatar
      ndb: nothing · a2649d0d
      unknown authored
      
      ndb/test/ndbapi/Makefile.am:
        foo
      a2649d0d
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 756572e1
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my50-cc
      
      
      756572e1
    • unknown's avatar
      ndb - Fix memory leak in HugoLoad · a59a6361
      unknown authored
      
      ndb/test/src/HugoTransactions.cpp:
        Fix memory leak in HugoLoad
      a59a6361
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb · 995eb1f1
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port
      
      
      995eb1f1
    • unknown's avatar
      Most of impl 1, "report port" of WL2278. · 6d005f57
      unknown authored
      Add facility to report back to ndb_mgmd what port was used for a connection.
      
      We do not actually do the reporting back yet.
      
      
      ndb/include/mgmapi/mgmapi_debug.h:
        Add prototype for ndb_mgm_set_connection_int_parameter
      ndb/src/mgmapi/mgmapi.cpp:
        Add ndb_mgm_set_connection_int_parameter.
        
        Do 'set connection parameter' ndb_mgm_call
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Add MgmtSrvr::setConnectionDbParameter.
        
        Find the connection between node1 and node2,
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Add prototype for setConnectionDbParameter
      ndb/src/mgmsrv/Services.cpp:
        Add 'set connection parameter' cmd and MgmApiSession::setConnectionParameter handler.
      ndb/src/mgmsrv/Services.hpp:
        add setConnectionParameter prototype.
      6d005f57
  7. 12 Dec, 2004 6 commits
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · 286387d3
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      286387d3
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · c0564421
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      c0564421
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b9520662
      unknown authored
      into mysql.com:/home/cps/mysql/trees/autofail/mysql-5.0
      
      
      b9520662
    • unknown's avatar
      fix autobuild failures · 596876f9
      unknown authored
      
      server-tools/instance-manager/buffer.cc:
        fix typo
      server-tools/instance-manager/commands.cc:
        get rid of compiler warnings
      server-tools/instance-manager/guardian.cc:
        fix compiler warning
      server-tools/instance-manager/instance.cc:
        fix warnings
      server-tools/instance-manager/instance_map.cc:
        fix return value
      server-tools/instance-manager/instance_map.h:
        fix problem, caused autobuild failure. Looks like a gcc problem - 
        "friend class <name>" doesn't work if specified before enclosed class
        <name> (this is not present in newer gcc versions)
      596876f9
    • unknown's avatar
      Fix test results that may change from run to run · 5ae35e32
      unknown authored
      Added comments (from code review on pull)
      
      
      mysql-test/r/heap.result:
        Fix results that may change from run to run
      mysql-test/r/ps_5merge.result:
        Fix wrong result
      mysql-test/t/heap.test:
        Make results predictable
      sql/sql_show.cc:
        Add comments
        Fixed typo
      5ae35e32
    • unknown's avatar
      ndb: wl-1732 support all charsets · a7fe1c39
      unknown authored
      
      ndb/include/kernel/AttributeDescriptor.hpp:
        wl-1732 support all charsets
      ndb/include/kernel/ndb_limits.h:
        wl-1732 support all charsets
      ndb/include/kernel/signaldata/TuxBound.hpp:
        wl-1732 support all charsets
      ndb/include/util/NdbSqlUtil.hpp:
        wl-1732 support all charsets
      ndb/src/common/util/NdbSqlUtil.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
        wl-1732 support all charsets
      ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
        wl-1732 support all charsets
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        wl-1732 support all charsets
      ndb/src/ndbapi/NdbOperationDefine.cpp:
        wl-1732 support all charsets
      ndb/src/ndbapi/NdbOperationSearch.cpp:
        wl-1732 support all charsets
      ndb/src/ndbapi/NdbScanOperation.cpp:
        wl-1732 support all charsets
      ndb/src/ndbapi/ndberror.c:
        wl-1732 support all charsets
      ndb/test/ndbapi/Makefile.am:
        wl-1732 support all charsets
      ndb/test/ndbapi/testOIBasic.cpp:
        wl-1732 support all charsets
      ndb/tools/desc.cpp:
        wl-1732 support all charsets
      a7fe1c39