1. 09 Feb, 2005 1 commit
    • unknown's avatar
      Impl5 of WL2278 - dynamic port allocation for cluster nodes · 8207d5ce
      unknown authored
      Treat the management server specially.
      
      It should always be the server in a transporter as we then have a known
      port to connect to on node restart.
      
      allows a mgm connection (i.e. to the management server port, our known port)
      to be transformed into a transporter connection.
      
      Also, clean up the struct TransporterConfiguration (used to be a struct for
      each transporter type. now there's just one)
      
      
      ndb/include/transporter/TransporterDefinitions.hpp:
        Clean up XXX_TransporterConfiguration and create one TransporterConfiguration structure.
        
        Makes things easier to read (especially in IPCConfig.cpp)
      ndb/include/transporter/TransporterRegistry.hpp:
        add get_mgm_handle (to compliment the set_mgm_handle function)
        
        clean up createTransporter to use just one TransporterConfiguration struct
      ndb/include/util/SocketClient.hpp:
        Introduce connect_without_auth() to ignore any authentication method that may have been set.
      ndb/src/common/mgmcommon/IPCConfig.cpp:
        Remove dead IPCConfig::configureTransporters(TransporterRegistry*)
        
        Fixup IPCConfig::configureTransporters(Uint32 nodeId...)
        - use the 'one struct TransporterConfiguration to rule them all'
        - make MGM node the server
        - fix switch statement for transporter types
          - close } in strange place
          - possible inadvertent fall through
      ndb/src/common/transporter/OSE_Transporter.cpp:
        a partial fix for the introduction of new parameters.
        
        OSE shouldn't build how it is now. Better to keep the build broken than have it build and fail strangely at runtime.
      ndb/src/common/transporter/OSE_Transporter.hpp:
        a partial fix for the introduction of new parameters.
        
        OSE shouldn't build how it is now. Better to keep the build broken than have it build and fail strangely at runtime.
      ndb/src/common/transporter/SCI_Transporter.cpp:
        should be correct for SCI transporter.
      ndb/src/common/transporter/SCI_Transporter.hpp:
        should be correct for SCI transporter
      ndb/src/common/transporter/SHM_Transporter.cpp:
        add new parameters for Transporter constructor
      ndb/src/common/transporter/SHM_Transporter.hpp:
        add new parameters for Transporter constructor
      ndb/src/common/transporter/TCP_Transporter.cpp:
        add new parameters for Transporter constructor
      ndb/src/common/transporter/TCP_Transporter.hpp:
        add new parameters for Transporter constructor
      ndb/src/common/transporter/Transporter.cpp:
        Add new parameters
         - isMgmConnection
        	requires transforming from mgm to transporter
         - serverNodeId
        	node id that will serve as the server
        
        Treat connection differently if isMgmConnection (send a special mgm command first)
      ndb/src/common/transporter/Transporter.hpp:
        add fields to constructor
        
        add isMgmConnection member (if true, have to transform a mgm connection)
      ndb/src/common/transporter/TransporterRegistry.cpp:
        createTransporter -> createTCPTransporter (etc)
        
        add extra transporter constructor parameters (from config)
        
        modify to use changes to TransporterConfiguration
      ndb/src/common/util/SocketClient.cpp:
        SocketClient::connect_without_auth()
        
        Temporarily disables authentication and connects.
        This is useful if you're trying to change what this
        SocketClient object is for (e.g. from mgm to ndb)
      ndb/src/common/util/SocketServer.cpp:
        Don't runSession or close socket when entering sessionThread if m_stopped
      ndb/src/mgmsrv/ConfigInfo.cpp:
        fixPortNumber
        - Get port number from the MGM node as it will always be the server
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        transporter_connect(sockfd)
        - transform this mgm connection into a transporter connection
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        prototype for transporter_connect
      ndb/src/mgmsrv/Services.cpp:
        add command: "transporter connect"
        
        stops the MgmApiSession and replaces it with a transporter connection
      ndb/src/mgmsrv/Services.hpp:
        prototype for transporter_connect
      8207d5ce
  2. 01 Feb, 2005 1 commit
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb · 098fc224
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl5
      
      
      ndb/src/common/mgmcommon/IPCConfig.cpp:
        Auto merged
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      ndb/src/cw/cpcd/main.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      ndb/src/mgmsrv/main.cpp:
        Auto merged
      098fc224
  3. 29 Jan, 2005 4 commits
  4. 28 Jan, 2005 25 commits
  5. 27 Jan, 2005 9 commits
    • unknown's avatar
      Merge · cca25e4d
      unknown authored
      
      ndb/include/Makefile.am:
        Auto merged
      ndb/include/mgmapi/mgmapi_config_parameters.h:
        Auto merged
      ndb/src/common/mgmcommon/IPCConfig.cpp:
        Auto merged
      ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      ndb/src/kernel/vm/Configuration.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      ndb/tools/delete_all.cpp:
        Auto merged
      ndb/tools/desc.cpp:
        Auto merged
      ndb/tools/drop_index.cpp:
        Auto merged
      ndb/tools/drop_tab.cpp:
        Auto merged
      ndb/tools/listTables.cpp:
        Auto merged
      ndb/tools/restore/restore_main.cpp:
        Auto merged
      ndb/tools/select_all.cpp:
        Auto merged
      ndb/tools/select_count.cpp:
        Auto merged
      ndb/tools/waiter.cpp:
        Auto merged
      ndb/include/util/ndb_opts.h:
        SCCS merged
      ndb/src/mgmsrv/main.cpp:
        resolved merge conflict
      cca25e4d
    • unknown's avatar
      Bug#8167 signal usage clash between mysql server and ndb shared memory · df7bb879
      unknown authored
          added shared memory config parameter, signum for use in signalling
          added global variable for holdign signum to be used for shared memory connection
          only fiddle with signals if it is set
          simplified common ndb client option handling
      
      
      ndb/include/Makefile.am:
        added common defaults file
      ndb/include/mgmapi/mgmapi_config_parameters.h:
        added shared memory config parameter, signum for use in signalling
      ndb/include/transporter/TransporterDefinitions.hpp:
        added shared memory config parameter, signum for use in signalling
      ndb/include/util/ndb_opts.h:
        simplified common ndb client option handling
      ndb/src/common/mgmcommon/IPCConfig.cpp:
        added shared memory config parameter, signum for use in signalling
      ndb/src/common/portlib/NdbThread.c:
        added global variable for holdign signum to be used for shared memory connection
        only block signals if shared memory is used
      ndb/src/common/transporter/SHM_Transporter.cpp:
        use signum in new global variable for shared memory signalling
      ndb/src/common/transporter/TransporterRegistry.cpp:
        use signum in new global variable for shared memory signalling
        only fiddle with signals if it is set
      ndb/src/cw/cpcd/main.cpp:
        ndb_opts not really used
      ndb/src/kernel/vm/Configuration.cpp:
        simplified common ndb client option handling
      ndb/src/mgmclient/main.cpp:
        simplified common ndb client option handling
      ndb/src/mgmsrv/ConfigInfo.cpp:
        added shared memory config parameter, signum for use in signalling
      ndb/src/mgmsrv/main.cpp:
        simplified common ndb client option handling
      ndb/tools/delete_all.cpp:
        simplified common ndb client option handling
      ndb/tools/desc.cpp:
        simplified common ndb client option handling
      ndb/tools/drop_index.cpp:
        simplified common ndb client option handling
      ndb/tools/drop_tab.cpp:
        simplified common ndb client option handling
      ndb/tools/listTables.cpp:
        simplified common ndb client option handling
      ndb/tools/restore/restore_main.cpp:
        simplified common ndb client option handling
      ndb/tools/select_all.cpp:
        simplified common ndb client option handling
      ndb/tools/select_count.cpp:
        simplified common ndb client option handling
      ndb/tools/waiter.cpp:
        simplified common ndb client option handling
      df7bb879
    • unknown's avatar
      Remove unused configure.in name TOOLS_LIBS. · b485ed7b
      unknown authored
      
      configure.in:
        Remove unused TOOLS_LIBS: LIBS and CLIENT_LIBS should
        be enough for the global configure.in
      b485ed7b
    • unknown's avatar
      ndb - post-merge fix · fce978c7
      unknown authored
      
      ndb/include/ndb_constants.h:
        post-merge fix
      fce978c7
    • unknown's avatar
      Merge · 763dfd7b
      unknown authored
      
      mysql-test/r/ndb_index_ordered.result:
        Auto merged
      mysql-test/t/ndb_index_ordered.test:
        Auto merged
      ndb/src/ndbapi/NdbDictionary.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        merge
      ndb/include/ndbapi/NdbDictionary.hpp:
        merge
      ndb/include/util/NdbSqlUtil.hpp:
        merge
      ndb/src/common/util/NdbSqlUtil.cpp:
        merge
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        merge
      ndb/src/ndbapi/NdbRecAttr.cpp:
        merge
      763dfd7b
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 96528854
      unknown authored
      into mysql.com:/export/space/pekka/ndb/version/my41
      
      
      96528854
    • unknown's avatar
      os0file.c: · 1c49d548
      unknown authored
        Add includes for the _stat() call to compile on Windows in Hot Backup build
      
      
      innobase/os/os0file.c:
        Add includes for the _stat() call to compile on Windows in Hot Backup build
      1c49d548
    • unknown's avatar
      ut0mem.c: · 563ebb43
      unknown authored
        Add a note to the error message that is printed when memory allocation fails: 32-bit computers usually have at most 2 GB or 4 GB process memory space
      
      
      innobase/ut/ut0mem.c:
        Add a note to the error message that is printed when memory allocation fails: 32-bit computers usually have at most 2 GB or 4 GB process memory space
      563ebb43
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9c02a351
      unknown authored
      into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
      
      
      9c02a351