Commit graph

120 commits

Author SHA1 Message Date
unknown
56c99820c3 BUG#17411 cannot have path longer than 128 characters
Use the POSIX limits.h define of PATH_MAX for maximum path length.

This has been being hit in pushbuild


ndb/include/util/File.hpp:
  use PATH_MAX for maximum filename length
ndb/src/common/portlib/NdbConfig.c:
  use PATH_MAX for max path name length instead of hardcoding 128
ndb/src/common/util/File.cpp:
  use PATH_MAX for maximum filename length
2006-02-15 16:37:09 +11:00
unknown
07908a4544 bug#16125 - ndb bitfield of exact 32 bits, incorrect assertion (i.e. only noticable in debug compiled)
mysql-test/r/ndb_bitfield.result:
  bug#16125
mysql-test/t/ndb_bitfield.test:
  bug#16125
ndb/include/util/Bitmask.hpp:
  bug#16125
2006-01-02 14:38:38 +01:00
unknown
2a49fa62a0 WL#2835: Base64 mysys functions
mysys/Makefile.am:
  Added Base64 to mysys
ndb/config/type_ndbapi.mk.am:
  NDBAPI now dependent on mysys
ndb/config/type_util.mk.am:
  NDB UTIL now dependent on mysys
ndb/src/common/util/Makefile.am:
  Remove Base64
ndb/src/common/util/Parser.cpp:
  Removed dead code
ndb/src/mgmapi/mgmapi.cpp:
  Use of mysys Base64
ndb/src/mgmsrv/Services.cpp:
  Use of mysys Base64
include/base64.h:
  Making Base64 mysys-style
mysys/base64.c:
  Making Base64 mysys-compatible
2005-10-14 01:14:23 +02:00
unknown
4efcca023b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0


mysql-test/t/rpl_slave_status.test:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
2005-09-12 14:11:28 +02:00
unknown
0a3202bedf removed a few aborts from mgmapi
corrected typo in ndb Parser
2005-09-12 14:03:23 +02:00
unknown
dd45e41689 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
mysql-test/t/openssl_1.test:
  Manual merge
ndb/include/util/ndb_opts.h:
  Manual merge
ndb/tools/Makefile.am:
  Manual merge
ndb/tools/restore/restore_main.cpp:
  Manual merge
2005-09-05 22:49:36 +02:00
unknown
4a584b17e8 added --core-file option to ndb executables
added parseable printout in ndb_restore
2005-09-05 16:33:40 +02:00
unknown
fd152f682f Merge
ndb/include/util/SocketServer.hpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/util/SocketClient.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/mgmclient/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged
ndb/include/util/ndb_opts.h:
  merge
ndb/src/common/mgmcommon/IPCConfig.cpp:
  merge
ndb/src/common/transporter/TransporterRegistry.cpp:
  merge
ndb/src/mgmapi/mgmapi.cpp:
  merge
ndb/src/mgmclient/CommandInterpreter.cpp:
  merge
ndb/src/mgmsrv/MgmtSrvr.cpp:
  merge
ndb/src/mgmsrv/Services.cpp:
  merge
ndb/src/mgmsrv/main.cpp:
  merge
ndb/src/ndbapi/TransporterFacade.cpp:
  merge
2005-07-15 01:41:59 +02:00
unknown
638fe9ec3f misc (memleak) fixes:
added using ndb_end and showing mem allocation stat at exit
    added init of variable
    added destruction of LocalConfig to still memleak
    added delete of theFacade on exit
    stopSessions(true) on socket server to ensure destuction of threads
    added destruction of arbit manager thread
    added true option to stopSessions in transporter facade to ensure destructions of threads


ndb/include/util/ndb_opts.h:
  added using ndb_end and showing mem allocation stat at exit
ndb/src/common/logger/LogHandler.cpp:
  added init of variable
ndb/src/mgmapi/mgmapi.cpp:
  added destruction of LocalConfig to still memleak
  debug printouts
ndb/src/mgmclient/main.cpp:
  added using ndb_end and showing mem allocation stat at exit
ndb/src/mgmsrv/MgmtSrvr.cpp:
  added delete of theFacade on exit
  removed area51
  added debug prints
ndb/src/mgmsrv/main.cpp:
  added using ndb_end and showing mem allocation stat at exit
  moved glob struct to heap to enable ndb_end usage
  moved options out of glob struct
  stopSessions(true) on socket server to ensure destuction of threads
ndb/src/ndbapi/ClusterMgr.cpp:
  added destruction of arbit manager thread
  debug printouts
ndb/src/ndbapi/TransporterFacade.cpp:
  added true option to stopSessions in transporter facade to ensure destructions of threads
  + debug prints
2005-07-14 18:08:01 +02:00
unknown
f7c3e51016 stilled mem leak in usage on getVersionString
added __LINE__ so systemErrorLab for better error printout


ndb/include/ndb_version.h.in:
  stilled mem leak in usage on getVersionString
ndb/include/util/version.h:
  stilled mem leak in usage on getVersionString
ndb/src/common/util/version.c:
  stilled mem leak in usage on getVersionString
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  added __LINE__ so systemErrorLab for better error printout
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  stilled mem leak in usage on getVersionString
  added __LINE__ so systemErrorLab for better error printout
ndb/tools/restore/restore_main.cpp:
  stilled mem leak in usage on getVersionString
2005-07-14 18:02:33 +02:00
unknown
66fccd8261 added debug prints
ndb/include/portlib/NdbTCP.h:
  added debug prints
ndb/include/util/SocketServer.hpp:
  added debug prints
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  debug prints
ndb/src/common/mgmcommon/IPCConfig.cpp:
  debug prints
ndb/src/common/portlib/NdbMutex.c:
  debug prints
ndb/src/common/portlib/NdbTCP.cpp:
  debug printout
ndb/src/common/portlib/NdbThread.c:
  debug printout
ndb/src/common/transporter/TransporterRegistry.cpp:
  debug printout
ndb/src/common/util/Parser.cpp:
  debug printout
ndb/src/common/util/SocketClient.cpp:
  debug printout
ndb/src/common/util/SocketServer.cpp:
  debug printout
2005-07-14 18:02:32 +02:00
unknown
43ebae40aa BUG#9626 Several serious errors reported by Valgrind in latest 5.0 bk tree
- Fix several valgrind warnings.


ndb/include/kernel/AttributeList.hpp:
  Include ndb_limits.h
ndb/include/ndbapi/Ndb.hpp:
  Add new function internalize_table_name
  Proper formatting
ndb/include/util/SimpleProperties.hpp:
  Add function "add" for adding strings/data to word buffers without reading after the string/data 
  Fix comment for UtilBufferWriter
ndb/src/common/util/SimpleProperties.cpp:
  Add function "add" for adding strings/data to word buffers without reading after the string/data
ndb/src/ndbapi/DictCache.cpp:
  Add DBUG printouts to all functions in GlobalDictCache
  Change ndbout_c to DBUG_PRINT
  Add function GlobalDictCache::printCache
ndb/src/ndbapi/DictCache.hpp:
  Add function GlobalDictCache::printCache
ndb/src/ndbapi/Ndb.cpp:
  Change DEBUG_TRACE to DBUG_PRINT, DBUG_ENTER
  Use new function internalize_table_name, and create internal tabname on stack
ndb/src/ndbapi/NdbDictionary.cpp:
  Add DBUG_ENTER calls
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Pass BaseString as reference when passing internal table name to internal functions.
  Remove check for exceeding MAX_SECTION_SIZE.
  Remove pekkas fix that saves internalName in save_me variable, not needed when tablename is stack variable.
  NdbDictInterface::gettable(int tableid, ...) - Not used
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Remove include of ndb_limits.h
  Use BaseString& for internal functions
  Remove m_namebuf, not needed, uses m_buffer
  Formatting
  NdbDictInterface::getTable(int tableId, ...) - Not used
ndb/src/ndbapi/NdbImpl.hpp:
  Remove buffer for m_internalname, placed on stack of caller.
  Moved impl of internalize_table_name and internalize_index_anme to Ndb::internalize_table_name and Ndb::internalize_index_name
ndb/src/ndbapi/NdbLinHash.hpp:
  Save also the terminating null character in chain->str to get nicer printouts.
ndb/src/ndbapi/NdbTransaction.cpp:
  Remove hardcoded buffer sizes.
  Remove include of ndb_limits.h
sql/ha_ndbcluster.cc:
  Fix "typo", use file_name var since that is the current files name,
2005-06-02 14:32:06 +02:00
unknown
5e7c6e0e20 ndb - fix small memory leak
ndb/include/util/Vector.hpp:
  fix small memory leak
ndb/src/mgmapi/mgmapi.cpp:
  fix small memory leak
2005-03-31 16:22:46 +02:00
unknown
477205f776 ndb - wl-1203 alignment fix
ndb/include/ndb_constants.h:
  consistent names
ndb/include/ndbapi/NdbDictionary.hpp:
  consistent names
ndb/include/util/NdbSqlUtil.hpp:
  consistent names
ndb/src/common/util/NdbSqlUtil.cpp:
  minor completion
ndb/src/ndbapi/NdbOperationInt.cpp:
  alignment fix
2005-02-26 16:56:39 +01:00
unknown
8a40c5c71d corrected error in ndb programs debug switch 2005-02-21 23:15:30 +01:00
unknown
448a4fd1f1 ndb - fix TUP filtering of LIKE / NOT_LIKE
ndb/include/util/NdbSqlUtil.hpp:
  1. fix wild_* chars 2. use correct wildcmp return value
ndb/src/common/util/NdbSqlUtil.cpp:
  1. fix wild_* chars 2. use correct wildcmp return value
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  1. fix wild_* chars 2. use correct wildcmp return value
2005-02-21 14:17:21 +01:00
unknown
e7038f4339 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2005-02-21 14:17:20 +01:00
unknown
e8be468b04 changed switch name from --ndb-mgmd-host to --ndb-mgmd
+ simplified code
2005-02-21 13:42:55 +01:00
unknown
2403965d13 ndb - allow LIKE with Binary strings
ndb/include/util/NdbSqlUtil.hpp:
  allow LIKE with Binary strings
ndb/src/common/util/NdbSqlUtil.cpp:
  allow LIKE with Binary strings
2005-02-21 10:44:37 +01:00
unknown
edea22632e added options to give nodeid and mgmd host directly as switches (without using the connectstring)
ndb/src/mgmapi/LocalConfig.cpp:
  added options to give nodeid and mgmd host directly as switches (without using the connectstring)
  reset nodeid on init
  allow only nodeid to be specified in the connectstring
  allow mgmd-host in connectstring
ndb/src/mgmapi/mgmapi.cpp:
  just some extra debug printouts
2005-02-18 15:20:05 +01:00
unknown
ac2e5124d8 ndb - TUP scan filter support for LIKE/NOT_LIKE
ndb/include/ndbapi/NdbScanFilter.hpp:
  TUP scan filter support for LIKE/NOT_LIKE
ndb/include/util/NdbSqlUtil.hpp:
  TUP scan filter support for LIKE/NOT_LIKE
ndb/src/common/util/NdbSqlUtil.cpp:
  TUP scan filter support for LIKE/NOT_LIKE
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  TUP scan filter support for LIKE/NOT_LIKE
ndb/src/ndbapi/NdbScanFilter.cpp:
  TUP scan filter support for LIKE/NOT_LIKE
2005-02-17 17:12:36 +01:00
unknown
de5fa1dc33 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2005-02-16 21:29:19 +01:00
unknown
fced35f74a ndb - fix new decimal type mysql vs. ndb
mysql-test/r/ndb_index_ordered.result:
  fix new decimal mysql vs. ndb
mysql-test/t/ndb_index_ordered.test:
  fix new decimal mysql vs. ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  fix new decimal mysql vs. ndb
ndb/include/ndb_constants.h:
  fix new decimal mysql vs. ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  fix new decimal mysql vs. ndb
ndb/include/util/NdbSqlUtil.hpp:
  fix new decimal mysql vs. ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionary.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbRecAttr.cpp:
  fix new decimal mysql vs. ndb
ndb/test/include/NdbSchemaOp.hpp:
  fix new decimal mysql vs. ndb
ndb/test/src/HugoCalculator.cpp:
  fix new decimal mysql vs. ndb
ndb/tools/restore/consumer.cpp:
  fix new decimal mysql vs. ndb
sql/ha_ndbcluster.cc:
  fix new decimal mysql vs. ndb
2005-02-16 21:19:42 +01:00
unknown
163d99432d Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2005-02-16 17:27:58 +01:00
unknown
0be9c0ef75 Merge
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
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
2005-02-16 13:14:21 +01:00
unknown
dbff1150c5 ndb - fix old decimal type mysql vs ndb
mysql-test/r/ndb_index_ordered.result:
  fix old decimal type mysql vs ndb (re-commit 3)
mysql-test/t/ndb_index_ordered.test:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/ndbapi/NdbDictionary.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/util/NdbSqlUtil.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/common/util/NdbSqlUtil.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionary.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbRecAttr.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/test/include/NdbSchemaOp.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/tools/restore/consumer.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
sql/ha_ndbcluster.cc:
  fix old decimal type mysql vs ndb (re-commit 3)
2005-02-16 12:45:59 +01:00
unknown
6bd9c85acd WL2278 Dynamic ports - Impl 6, "deal with mgm server restart and multiple mgm servers"
- when connecting to a mgm server as a transporter, create a NdbMgmHandle
  - over this mgm handle, report the dynamic ports
  - then turn it into a transporter
- this will re-report dynamic ports to mgmds when they restart (as we'll have to
set up our transporter again). This will also report it to all mgmds (as we'll
have transporters to all of them).


ndb/include/mgmapi/mgmapi.h:
  Add ndb_mgm_convert_to_transporter
   - converts to a transporter connect
   - destroys the handle (without disconnecting)
   - returns socket
ndb/include/transporter/TransporterRegistry.hpp:
  Add prototype for connect_ndb_mgmd
ndb/include/util/SocketClient.hpp:
  Remove connect_without_auth
  
  Add get_port() and get_server_name()
ndb/src/common/transporter/Transporter.cpp:
  use TransporterRegistry::connect_ndb_mgmd() to make the connection if isMgmConnection
ndb/src/common/transporter/TransporterRegistry.cpp:
  Impliment TransporterRegistry::connect_ndb_mgmd
  
  - takes a SocketClient and constructs a connectstring.
  - uses this connect string to make a NdbMgmHandle
  - send dynamic ports to this mgm server
  - transform into a transporter connect
  - return socket
ndb/src/common/util/SocketClient.cpp:
  Remove connect_without_auth
ndb/src/kernel/main.cpp:
  Don't relay dynamic ports. We now do this on transporter connect
ndb/src/mgmapi/mgmapi.cpp:
  Impliment ndb_mgm_convert_to_transporter
  - converts the mgm connection into a transporter connection
  - destroys the handle
  - returns the socket that should now be used as a transporter
2005-02-11 15:43:43 +11:00
unknown
8207d5cefd Impl5 of WL2278 - dynamic port allocation for cluster nodes
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
2005-02-10 00:11:21 +11:00
unknown
098fc22417 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
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
2005-02-01 11:45:05 +11:00
unknown
a332e08e31 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/export/space/pekka/ndb/version/my50
2005-01-28 10:52:54 +01:00
unknown
bc12f67343 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/export/space/pekka/ndb/version/my41
2005-01-28 10:52:31 +01:00
unknown
cca25e4d49 Merge
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
2005-01-28 00:47:41 +01:00
unknown
df7bb879cd Bug#8167 signal usage clash between mysql server and ndb shared memory
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
2005-01-28 00:42:41 +01:00
unknown
763dfd7b10 Merge
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
2005-01-27 18:41:23 +01:00
unknown
1ed40339e2 ndb - make YEAR and TIMESTAMP into ndb types
mysql-test/r/ndb_index_ordered.result:
  make YEAR and TIMESTAMP into ndb types
mysql-test/t/ndb_index_ordered.test:
  make YEAR and TIMESTAMP into ndb types
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/include/ndbapi/NdbDictionary.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/include/util/NdbSqlUtil.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/common/util/NdbSqlUtil.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionary.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbRecAttr.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/test/include/NdbSchemaOp.hpp:
  make YEAR and TIMESTAMP into ndb types
sql/ha_ndbcluster.cc:
  make YEAR and TIMESTAMP into ndb types
2005-01-27 17:33:35 +01:00
unknown
e4862d91cd Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2005-01-20 13:01:24 +11:00
unknown
7cbe4d19e4 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-01-19 07:37:42 +01:00
unknown
d357a5a058 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3


ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2005-01-19 15:16:13 +11:00
unknown
982e0b8cfb changed "formatting" after sergs comments on prev chanset 2005-01-19 04:43:54 +01:00
unknown
a66d80d17e removed default usage of shared memory transporter as it is not verified on enough platforms 2005-01-18 22:09:15 +01:00
unknown
3705bf9dfb wl2240 - ndb - new testcase for validating startTransation with hint
ndb/include/ndbapi/NdbDictionary.hpp:
  NdbDictionaryColumn::getSizeInBytes
ndb/include/ndbapi/NdbOperation.hpp:
  NdbOperation::getTable
ndb/include/ndbapi/NdbTransaction.hpp:
  Make getConnectionNodeId public (for test programs)
ndb/include/util/Base64.hpp:
  base64(void*)
ndb/src/common/util/Base64.cpp:
  base64(void*)
ndb/src/kernel/blocks/ERROR_codes.txt:
  New error code for REF'ing non-local TCKEYREQ
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Easy clearing of ERROR_INSERT
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  New error code for REF'ing non-local TCKEYREQ
ndb/src/ndbapi/NdbDictionary.cpp:
  NdbDictionaryColumn::getSizeInBytes
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  If m_noIfDistKyes == 0, then each PK is dist key
ndb/src/ndbapi/NdbOperation.cpp:
  NdbOperation::getTable
ndb/src/ndbapi/NdbOperationSearch.cpp:
  remove d-key handling for pk ops
ndb/test/include/HugoCalculator.hpp:
  remove unimpletemented methods
ndb/test/include/HugoOperations.hpp:
  1) HugoOperation::setTransaction 
  2) Type independant value handling
  3) Some more util methods
ndb/test/ndbapi/testPartitioning.cpp:
  new testcase for validating startTransation with hint
ndb/test/run-test/atrt-mysql-test-run:
  fix checks of return values
ndb/test/src/HugoCalculator.cpp:
  Better generation of values
   -- depends on fact that srand(K), rand() == srand(K), rand()
  Generate string with base64
ndb/test/src/HugoOperations.cpp:
  1) HugoOperation::setTransaction 
  2) Type independant value handling
  3) Some more util methods
2005-01-14 08:58:50 +01:00
unknown
61eec3db43 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl3


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
2005-01-12 11:25:49 +11:00
unknown
69da579aeb Finish WL2278 Impl 3 - Dynamic port allocation of cluster nodes.
ndb/include/util/SocketClient.hpp:
  Add SocketClient::set_port(unsigned short port)
  - Sets both m_port and m_servaddr.sin_port
ndb/src/common/transporter/Transporter.hpp:
  Fix set_r_port to call m_socket_client->set_port(port) (if there's a socket client).
ndb/src/common/transporter/TransporterRegistry.cpp:
  Handle non-TCP Transporter nodes correctly
ndb/src/mgmsrv/main.cpp:
  Better document and error check connecting back to our own ndb_mgmd
2005-01-10 10:19:15 +11:00
unknown
91a3e90baf ndb - wl-1442 merge fix 5.0 -> 5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 merge fix 5.0 -> 5.0-ndb
2005-01-09 01:14:11 +01:00
unknown
f029af067b Merge
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndb_constants.h:
  merge 5.0->5.0-ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge 5.0->5.0-ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  merge 5.0->5.0-ndb
ndb/include/util/NdbSqlUtil.hpp:
  merge 5.0->5.0-ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  merge 5.0->5.0-ndb
2005-01-09 00:45:06 +01:00
unknown
09a4872661 ndb - wl-1442 4.1->5.0 merge fixes
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/include/ndb_constants.h:
  wl-1442 4.1->5.0 merge fixes
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 4.1->5.0 merge fixes
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 4.1->5.0 merge fixes
2005-01-08 23:24:25 +01:00
unknown
2c12921a64 Merge
client/mysql.cc:
  Auto merged
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
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
sql/ha_ndbcluster.cc:
  merge
2005-01-08 22:34:16 +01:00
unknown
3186b340da ndb - wl-1442 fix Time ordering
mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Time.  adds new type id 25
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Time.  adds new type id 25
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Time.  adds new type id 25
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Time.  adds new type id 25
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Time.  adds new type id 25
sql/ha_ndbcluster.cc:
  wl-1442 fix Time.  adds new type id 25
2005-01-08 19:28:44 +01:00
unknown
633ee9b099 ndb - wl-1442 fix Date ordering
mysql-test/r/ndb_index_ordered.result:
  wl-1442 fix Date.  reuses old unused Timespec type id
mysql-test/t/ndb_index_ordered.test:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/test/include/NdbSchemaOp.hpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
ndb/tools/restore/consumer.cpp:
  wl-1442 fix Date.  reuses old unused Timespec type id
sql/ha_ndbcluster.cc:
  wl-1442 fix Date.  reuses old unused Timespec type id
2005-01-08 16:57:51 +01:00
unknown
2331344909 ndb - wl-1442 new varchar
mysql-test/r/ndb_alter_table.result:
  wl-1442 new varchar
mysql-test/r/ndb_bitfield.result:
  wl-1442 new varchar
mysql-test/r/ndb_charset.result:
  wl-1442 new varchar
mysql-test/t/ndb_charset.test:
  wl-1442 new varchar
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  wl-1442 new varchar
ndb/include/ndb_constants.h:
  wl-1442 new varchar
ndb/include/ndbapi/NdbDictionary.hpp:
  wl-1442 new varchar
ndb/include/util/NdbSqlUtil.hpp:
  wl-1442 new varchar
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  wl-1442 new varchar
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionary.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbOperationDefine.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbOperationSearch.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbRecAttr.cpp:
  wl-1442 new varchar
ndb/src/ndbapi/NdbTransaction.cpp:
  wl-1442 new varchar
ndb/test/ndbapi/testOIBasic.cpp:
  wl-1442 new varchar
sql/ha_ndbcluster.cc:
  wl-1442 new varchar
2005-01-07 11:55:20 +01:00