Commit graph

892 commits

Author SHA1 Message Date
unknown
dc37e041d2 removed debug printout that slipped in 2004-09-09 21:53:01 +00:00
unknown
e2252a49f7 fixed compile error 2004-09-09 20:43:42 +00:00
unknown
fb7d91e708 added possibility to use comma-separated connectstring
compile error/warning fixes
added force of heartbeat
added ability to force heartbeat


ndb/src/common/mgmcommon/LocalConfig.cpp:
  added possibility to use comma-separated connectstring
ndb/src/common/mgmcommon/NdbConfig.c:
  compile error/warning fixes
ndb/src/mgmsrv/MgmtSrvr.cpp:
  added force of heartbeat
ndb/src/mgmsrv/main.cpp:
  changed help text
ndb/src/ndbapi/ClusterMgr.cpp:
  added ability to force heartbeat
ndb/src/ndbapi/Ndbinit.cpp:
  added comment
2004-09-09 19:52:03 +00:00
unknown
dc21dcd2a1 Merge
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  SCCS merged
2004-09-09 16:43:11 +00:00
unknown
4ea4e9ee2e main.cpp:
removed shhor switch for nodaemon


ndb/src/mgmsrv/main.cpp:
  removed shhor switch for nodaemon
2004-09-09 16:41:20 +00:00
unknown
0450e21c91 MgmtSrvr.cpp:
Added ability to force heartbeat


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Added ability to force heartbeat
2004-09-09 16:40:15 +00:00
unknown
647d895acc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into build.mysql.com:/users/tulin/mysql-4.1-ndb-merge


ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-09-09 16:22:47 +02:00
unknown
10ce6d0b26 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-09-09 14:22:46 +00:00
unknown
ea018f2042 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-09-09 13:57:23 +00:00
unknown
0a7f9e24d8 improved show command
fixed some mutex locks for Ndb objects
moved TranspoterFacade::stop_instance to cluster connection
moved Socket Server::start_server outside the TransporterFacade::start_instance thread


ndb/include/mgmapi/mgmapi.h:
  improved show command
ndb/src/mgmapi/mgmapi.cpp:
  improved show command
ndb/src/mgmclient/CommandInterpreter.cpp:
  improved show command
ndb/src/mgmsrv/MgmtSrvr.cpp:
  improved show command
ndb/src/mgmsrv/MgmtSrvr.hpp:
  improved show command
ndb/src/mgmsrv/Services.cpp:
  improved show command
ndb/src/ndbapi/Ndbinit.cpp:
  fixed some mutex locks for Ndb objects
  moved TranspoterFacade::stop_instance to cluster connection
ndb/src/ndbapi/TransporterFacade.cpp:
  movet Socket Server::start_server outside the TransporterFacade::start_instance thread
ndb/src/ndbapi/TransporterFacade.hpp:
  movet Socket Server::start_server outside the TransporterFacade::start_instance thread
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  movet Socket Server::start_server outside the TransporterFacade::start_instance thread
2004-09-09 13:55:14 +00:00
unknown
2aa6973450 merge
ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/common/mgmcommon/NdbConfig.c:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
2004-09-09 14:39:01 +02:00
unknown
cfcdabf3f8 fix NdbDictionary 2004-09-09 14:20:11 +02:00
unknown
2cd71180ef better error printouts on cannot alloc node id
put ByteOrder config param back as depricated


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  put ByteOrder config param back as depricated
ndb/src/mgmsrv/MgmtSrvr.cpp:
  better error printouts on cannot alloc node id
2004-09-09 09:04:53 +00:00
unknown
c59228f85c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into ndbmaster.mysql.com:/ndb/clone-mysql-4.1-ndb-daily-2004-09-08
2004-09-09 08:41:37 +02:00
unknown
6bbbccbe3a wl1292 -
Fix autotest of backups
Fix autotest with mysql-test-run


ndb/test/run-test/atrt-testBackup:
  Rename: ndb/test/ndbapi/atrt-testBackup -> ndb/test/run-test/atrt-testBackup
ndb/test/run-test/Makefile.am:
  Install atrt wrappers
ndb/test/run-test/atrt-mysql-test-run:
  Take args from caller
ndb/test/run-test/daily-devel-tests.txt:
  Use wrapper to test backup
ndb/test/run-test/main.cpp:
  Add MYSQL_BASE_DIR to environment of test programs
2004-09-09 08:40:20 +02:00
unknown
5c571cc58c Ndb backup/restore also handle indexes
ndb/src/kernel/blocks/backup/Backup.cpp:
  Save meta data for indexes (but not actual data)
ndb/src/kernel/blocks/backup/Backup.hpp:
  Save meta data for indexes (but not actual data)
ndb/src/kernel/blocks/backup/restore/consumer.hpp:
  Introduced endOfTables into Consumer interface
ndb/src/kernel/blocks/backup/restore/consumer_restore.cpp:
  Store indexes and create then when endOfTables is called
ndb/src/kernel/blocks/backup/restore/consumer_restore.hpp:
  Store indexes and create then when endOfTables is called
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Run endOfTables
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Split getIndexImpl into 2 methods
  (one being used by restore)
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Split getIndexImpl into 2 methods
  (one being used by restore)
2004-09-08 22:30:05 +02:00
unknown
9b44664537 removed unnecesary check in ConfigInfo
added retries to tryBind


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  removed unnecesary check in ConfigInfo
ndb/src/mgmsrv/main.cpp:
  added retries to tryBind
2004-09-08 16:31:52 +00:00
unknown
50729d601d dded method to retrieve mysqld, ndbd, and ndb_mgmd aliases for API,MGM and DB
added sanity checks for config file
changed so that ndb_0 is replaced by ndb_pid#### in ndb files
added error_string for to some functions, alloc_node_id(), start()
added better error printout for failed alloc node id
better error printouts for failures when starting ndb_mgmd


ndb/include/mgmapi/mgmapi.h:
  added method to retrieve mysqld, ndbd, and ndb_mgmd aliases for API,MGM and DB
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  added sanity checks for config file
ndb/src/common/mgmcommon/NdbConfig.c:
  changed so that ndb_0 is replaced by ndb_pid#### in ndb files
ndb/src/kernel/error/ErrorReporter.cpp:
  removed usage of tracefile early in startup (when it's normally filled with zeroes)
ndb/src/mgmapi/mgmapi.cpp:
  added method to retrieve mysqld, ndbd, and ndb_mgmd aliases for API,MGM and DB
ndb/src/mgmsrv/MgmtSrvr.cpp:
  added error_string for to some functions, alloc_node_id(), start()
ndb/src/mgmsrv/MgmtSrvr.hpp:
  added error_string for to some functions, alloc_node_id(), start()
ndb/src/mgmsrv/Services.cpp:
  added better error printout for failed alloc node id
ndb/src/mgmsrv/main.cpp:
  better error printouts for failures when starting ndb_mgmd
2004-09-08 14:30:39 +00:00
unknown
c49a08dd75 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-08 13:44:52 +02:00
unknown
f128a98b35 Restore transid when flushing 2004-09-08 13:42:44 +02:00
unknown
e2a42454b8 wl1292 - mysql-test-run in autotest
Reset SIGCHLD before exec-ing


ndb/src/cw/cpcd/Process.cpp:
  Reset SIGCHLD before exec-ing
2004-09-08 11:18:22 +02:00
unknown
d69d79377c Removed usage of "useFullyQualifiedNames" 2004-09-08 08:02:59 +02:00
unknown
d7773916ca bug#at - testNdbApi WaitUntilReady, MaxNdb
fix delete of dictionary before connection has been established


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix delete of dictionary before connection has been established
2004-09-08 06:48:03 +02:00
unknown
7fa2b4ef4e BUG#ndb_blob on 1 node
Make sure to flush buffer when sending long sig so that order is maintained
2004-09-08 06:26:44 +02:00
unknown
c2e13da240 Bug#5429
Use const table * in NDB API


ndb/include/ndbapi/Ndb.hpp:
  Removed useFullyQualifiedNames(bool)
  Changed so that auto increment methods takes const pointer
ndb/include/ndbapi/NdbBlob.hpp:
  Changed to const table pointer
ndb/include/ndbapi/NdbConnection.hpp:
  Changed to const table pointer
ndb/include/ndbapi/NdbIndexOperation.hpp:
  Changed to const table pointer
ndb/include/ndbapi/NdbOperation.hpp:
  Changed to const table pointer
ndb/include/ndbapi/NdbScanOperation.hpp:
  Changed to const table pointer
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Corrected size & array size in case of blob usage
ndb/src/kernel/blocks/backup/restore/consumer_restore.cpp:
  Removed use fully qualified name
  Handle blob tables
ndb/src/kernel/blocks/backup/restore/consumer_restore.hpp:
  Introduced mapping between old/new table (wrt ids)
ndb/src/kernel/blocks/backup/restore/main.cpp:
  removed extra Uint32
ndb/src/ndbapi/Ndb.cpp:
  Changed to const table pointer
ndb/src/ndbapi/NdbConnection.cpp:
  Changed to const table pointer
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Changed to const table pointer
ndb/src/ndbapi/NdbOperation.cpp:
  Changed to const table pointer
ndb/src/ndbapi/NdbScanOperation.cpp:
  Changed to const table pointer
sql/ha_ndbcluster.cc:
  Changed to const table pointer
2004-09-07 21:53:59 +02:00
unknown
180689917e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-07 14:30:12 +02:00
unknown
7540feca8e fixed NdbConnection::restart and made use of it in ha_ndbcluster
added testcase
2004-09-07 12:30:11 +00:00
unknown
6d26e972ac Fix scan with keyinfo
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Dont't use signal->theData for checking as it is overwritten when
  using keyinfo
2004-09-07 13:24:12 +02:00
unknown
b8f24215a0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-09-07 10:56:07 +00:00
unknown
d3650df62e fixed and added test case for bug#5431
+ fix for support of multiple mgmt servers


mysql-test/r/ndb_alter_table.result:
  added test case for bug #5431
mysql-test/t/ndb_alter_table.test:
  added test case for bug #5431
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  fix to make multiple mgmt srvrs work
sql/ha_ndbcluster.cc:
  fixed and added test case for bug#5431
2004-09-07 10:54:31 +00:00
unknown
6204a73cf9 Fix braces wrt to DBUG_xxx 2004-09-06 21:49:04 +02:00
unknown
c5e99453f8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-09-06 18:31:43 +00:00
unknown
d90b95ed31 fixed so that ndbcluster and mysqld can be started independently
fixed some error codes in Ndb so that 4009-cluster failure is returned when cluster is not up
2004-09-06 18:30:57 +00:00
unknown
b306777f73 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-06 15:17:09 +02:00
unknown
ed04735543 testReadPerf fixes
ndb/test/ndbapi/testReadPerf.cpp:
  clear g_times if compiler don't do it for you
2004-09-06 15:15:35 +02:00
unknown
5cccb45385 -d default on ndb_mgmd and ndbd
-i depricated on ndbd
fixed bug in shutdown command in ndb_mgm


ndb/src/mgmsrv/main.cpp:
  added config.ini as default configuration file
  -d default on ndb_mgmd and ndbd
  -i depricated on ndbd
  fixed bug in shutdown command in ndb_mgm
2004-09-06 12:36:01 +00:00
unknown
d1f54f28d4 testReadPerf
Divide by loops aswell


ndb/test/ndbapi/testReadPerf.cpp:
  Divide by loops aswell
2004-09-06 13:29:49 +02:00
unknown
862d056d4a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb


sql/sql_class.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2004-09-06 10:47:04 +00:00
unknown
c7e942a8ff added ndb_mgm_destroy_configuration call
fixed memory leak in object map
fixed uninitialized value blobs_pending


ndb/include/mgmapi/mgmapi.h:
  added ndb_mgm_destroy_configuration call
ndb/src/mgmapi/mgmapi.cpp:
  added ndb_mgm_destroy_configuration call
ndb/src/ndbapi/ObjectMap.hpp:
  fixed memory leak
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  added ndb_mgm_destroy_configuration call
sql/ha_ndbcluster.cc:
  fixed uninitialized value blobs_pending
2004-09-06 10:46:23 +00:00
unknown
3d390679e4 removed faked do_work 2004-09-06 10:13:54 +02:00
unknown
f809e037e9 Added testReadPerf that compares different access methods
- pk read (batch and serial)
- unique index read (batch and serial)
- eq-bound ordered index
- range ordered index
- sorted range ordered index
- interpretered scan


ndb/test/ndbapi/Makefile.am:
  Added testReadPerf
ndb/test/ndbapi/testScanPerf.cpp:
  Removed old #ifdef'ed code
2004-09-06 07:08:40 +02:00
unknown
73b4f5efd6 Fixed initialization of trans id 2004-09-03 22:20:03 +02:00
unknown
9fd78ea3d3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb


sql/ha_ndbcluster.cc:
  Auto merged
2004-09-03 15:12:34 +00:00
unknown
e8c2e41841 renamed ha_recovery_logging to ha_enable_transaction
added tests to alter table for "large" alter tables and truncates in ndbcluster
added debug printout in restart() in ndbcluster
added flag THD::transaction.on to enable/disable transaction


mysql-test/r/ndb_alter_table.result:
  added tests to alter table for "large" alter tables and truncates
mysql-test/t/ndb_alter_table.test:
  added tests to alter table for "large" alter tables and truncates
ndb/src/ndbapi/NdbConnection.cpp:
  added debug printout in restart()
sql/ha_ndbcluster.cc:
  added support for large alter table and truncate
sql/handler.cc:
  renamed ha_recovery_logging to ha_enable_transaction
sql/handler.h:
  renamed ha_recovery_logging to ha_enable_transaction
sql/sql_class.cc:
  added flag THD::transaction.on to enable/disable transaction
sql/sql_class.h:
  added flag THD::transaction.on to enable/disable transaction
sql/sql_delete.cc:
  added disable transaction for mysql_truncate
sql/sql_table.cc:
  renamed ha_recovery_logging to ha_enable_transaction
2004-09-03 15:11:09 +00:00
unknown
1bef804e77 introduced my_init() in backwards compatible Ndb constructor 2004-09-03 11:24:14 +00:00
unknown
c83d39c90d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-09-02 15:52:46 +00:00
unknown
0d3ade0bb5 fixed wrong initial auto increment value bug#5369
ndb/tools/waiter.cpp:
  added option to set timeout to ndb_waiter
2004-09-02 15:51:44 +00:00
unknown
4803d9f179 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/Users/mikron/mysql-4.1-ndb
2004-09-02 17:02:47 +02:00
unknown
9e9490612c Fix for overwriting of the stack when table name length was larger
than 32 bytes. getWords interpreted length as number of words and
got number of bytes.
2004-09-02 15:13:50 +02:00
unknown
d5bf76c133 Fix for bug overwriting stack when table name larger than 32 bytes.
getWords interprets the length as number of words and previously
number of bytes was sent in.
2004-09-02 15:08:17 +02:00