Commit graph

691 commits

Author SHA1 Message Date
unknown
0a6dda5518 Merge
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbReceiver.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  SCCS merged
2004-09-02 12:11:46 +00:00
unknown
3b124d4fb2 added connect thread to Ndb_cluster_connection +
some other small fixes


ndb/include/mgmcommon/ConfigRetriever.hpp:
  added options to do_connect to contol how connects failures should be treated
ndb/include/mgmcommon/NdbConfig.h:
  method to retrieve datadir path (to user for chdir)
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Added connect thread
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  added options to do_connect to contol how connects failures should be treated
ndb/src/common/mgmcommon/NdbConfig.c:
  method to retrieve datadir path (to user for chdir)
ndb/src/kernel/main.cpp:
  ndbd to do chdir
ndb/src/kernel/vm/WatchDog.cpp:
  added my_thread_init for debug
ndb/src/ndbapi/ClusterMgr.cpp:
  added my_thread_init for debug
ndb/src/ndbapi/TransporterFacade.cpp:
  removed call to atexit
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  added connect thread
2004-09-02 12:04:50 +00:00
unknown
59e2b96438 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2004-09-01 14:58:12 +00:00
unknown
a047513299 added class Ndb_cluster_connection to prepare for making order of starting mysqld and ndbd irrelevant
ndb/src/mgmsrv/Makefile.am:
  changed so that datadir is "." by default so that behaviour is the same as before
2004-09-01 14:56:53 +00:00
unknown
b7ffde86a0 Piggy back close scan req 2004-09-01 13:42:58 +02:00
unknown
25086da570 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl2025


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2004-09-01 04:52:50 +02:00
unknown
15135482ad Fix bug in trans counter for read 2004-09-01 04:50:17 +02:00
unknown
22f3bcdec7 Also update printer 2004-08-31 22:17:58 +02:00
unknown
540c90e407 Added some more options to TC timers, such as:
1) explicit start/stop timer (instead of perodical reports)
2) scan & range scan reporting
2004-08-31 22:12:08 +02:00
unknown
db210b0919 bug#4591
ndb/src/mgmsrv/MgmtSrvr.cpp:
  bug#4591
  Wait for not started instead of (! no contact)
2004-08-31 21:34:11 +02:00
unknown
f34a7ff423 run in loop 2004-08-31 16:27:31 +02:00
unknown
dfad106cc3 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl2025


ndb/src/ndbapi/NdbOperationInt.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-08-31 15:07:43 +02:00
unknown
042d620948 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-31 15:00:50 +02:00
unknown
54c1dc12f8 Update test prg
1) merge join
2) lookups
2004-08-31 14:53:59 +02:00
unknown
2bad0cee50 Interpreter fix + tets prg
ndb/src/ndbapi/NdbOperationInt.cpp:
  Fix so that interpreter is possible together with index scans
ndb/test/ndbapi/Makefile.am:
  New test prog
2004-08-31 10:14:36 +02:00
unknown
9ed92fea50 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-tux


ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-08-30 15:31:30 +02:00
unknown
629768d576 merge
BitKeeper/etc/logging_ok:
  auto-union
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
2004-08-30 12:13:11 +02:00
unknown
42a7e96adb see resp. file
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  adder error insert for error during shutdown
ndb/src/kernel/error/ErrorHandlingMacros.hpp:
  seeror set method for signal handler
ndb/src/kernel/main.cpp:
  adder error insert for error during shutdown
ndb/src/kernel/vm/Emulator.cpp:
  adder error insert for error during shutdown
  + check for error handler invoked by signal handler
ndb/src/kernel/vm/Emulator.hpp:
  enum so signal that Shatdown is invoked by signal handler
2004-08-30 10:13:09 +00:00
unknown
7776439c7b fixed so that error handler is only invoked once 2004-08-30 08:25:17 +00:00
unknown
5fac485a0e wl2025 - bug fixes
1) Release _all_ attr bufs
2) Handle out of attr bufs


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Release _all_ attr bufs
  Handle out of attr bufs
2004-08-29 21:35:33 +02:00
unknown
5c5cf8c465 small fixes of select count(*)
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix init
ndb/tools/select_count.cpp:
  row count is 64 bit
2004-08-27 22:50:06 +02:00
unknown
fa5d6ac3b3 Added 3 psuedo columns
Cleaned up code
Changed ndb_select_all


ndb/include/kernel/AttributeHeader.hpp:
  Added commit count to psuedo columns
  Added bit for psuedo columns
ndb/include/kernel/GlobalSignalNumbers.h:
  Changed into READ_PSUEDO
ndb/include/ndbapi/NdbDictionary.hpp:
  Added 3 psuedo columns
ndb/include/ndbapi/NdbOperation.hpp:
  Added 3 psuedo columns
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/ndbapi/NdbDictionary.cpp:
  Added 3 psuedo columns
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Added 3 psuedo columns
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Added 3 psuedo columns
ndb/src/ndbapi/NdbOperation.cpp:
  Added 3 psuedo columns
ndb/tools/select_count.cpp:
  Changed select_count into using new features
2004-08-27 22:31:16 +02:00
unknown
d02da1d978 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-27 19:42:04 +02:00
unknown
43acfcae1f Better handling of transaction ids,
make *sure* that no one gets same transid twice
(wo/ restarting process)
2004-08-27 19:41:00 +02:00
unknown
3f45e53790 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-27 19:36:54 +02:00
unknown
ff136de460 Handle drop ordered index with table id > pool size 2004-08-27 19:33:46 +02:00
unknown
353fb4c8d4 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/Users/mikron/mysql-4.1-ndb
2004-08-27 18:04:12 +02:00
unknown
a173bdfd3f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-27 15:37:01 +02:00
unknown
0f194e61b4 added debug to ndb test 2004-08-27 13:37:00 +00:00
unknown
aa243adb8f bug-5252 fix (tinyblob)
ndb/src/ndbapi/NdbBlob.cpp:
  theBlobTable is NULL for tinyblob
2004-08-27 15:10:53 +02:00
unknown
fbe70897a7 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


BitKeeper/etc/logging_ok:
  auto-union
ndb/include/ndb_global.h:
  Auto merged
ndb/src/common/mgmcommon/NdbConfig.c:
  Auto merged
2004-08-27 14:11:50 +02:00
unknown
3d6675cce1 small fixes
mysql-test/ndb/ndbcluster.sh:
  use new shutdown command
ndb/src/common/mgmcommon/Makefile.am:
  compile error fix
2004-08-27 12:11:49 +00:00
unknown
47eb0b464c tux optim 14 - use pointers to cmp functions
ndb/test/ndbapi/testOIBasic.cpp:
  null related options, not related to this changeset
2004-08-27 13:57:51 +02:00
unknown
987fc11395 see respective file
ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Rename: ndb/src/common/mgmcommon/InitConfigFileParser.hpp -> ndb/src/mgmsrv/InitConfigFileParser.hpp
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Rename: ndb/src/common/mgmcommon/InitConfigFileParser.cpp -> ndb/src/mgmsrv/InitConfigFileParser.cpp
ndb/src/mgmsrv/ConfigInfo.hpp:
  Rename: ndb/src/common/mgmcommon/ConfigInfo.hpp -> ndb/src/mgmsrv/ConfigInfo.hpp
ndb/src/common/mgmcommon/Makefile.am:
  moved files to mgmsrv
ndb/src/mgmclient/CommandInterpreter.cpp:
  added shutdown command
ndb/src/mgmclient/CommandInterpreter.hpp:
  added shutdown command
ndb/src/mgmsrv/Config.cpp:
  .
ndb/src/mgmsrv/Config.hpp:
  .
ndb/src/mgmsrv/ConfigInfo.cpp:
  wait with this
ndb/src/mgmsrv/Makefile.am:
  moved files to mgmsrv
ndb/test/include/NdbBackup.hpp:
  backup not necessarily in file system path
ndb/test/ndbapi/testDict.cpp:
  compile error
ndb/test/src/NdbBackup.cpp:
  aligned with new config param
2004-08-27 11:48:27 +00:00
unknown
cbbfa20e4f Decreased chunks per fragment
Fixed missing initialisation bug


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  4 times number of nodes is decreases worst case compared to
  8 times number of node groups
  Missing initialisation
ndb/src/kernel/vm/pc.hpp:
  Decreased chunks per fragment
2004-08-27 11:44:39 +02:00
unknown
b5ebc0f259 Fix ordered index scan with partially specified key 2004-08-27 00:59:16 +02:00
unknown
6566af8c35 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb


ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
2004-08-26 21:45:46 +00:00
unknown
3212cc473d new parameter BackupDataDir 2004-08-26 21:43:07 +00:00
unknown
68750ccfda Fixed wrong number of fragment records in DIH
Fixed bug in failed create table
Fixed new test case for failed create table using new ERROR_INSERT


ndb/src/kernel/blocks/ERROR_codes.txt:
  Added new error insert for test of failed create table
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Added new error insert for test of failed create table
  Fixed bug in handling failed create table
  Moved some constants to pc.hpp
ndb/src/kernel/vm/Configuration.cpp:
  Added new error insert for test of failed create table
  Fixed bug in handling failed create table
  Moved some constants to pc.hpp
ndb/src/kernel/vm/pc.hpp:
  Constants moved here from DIH
ndb/test/ndbapi/testDict.cpp:
  New test case for failed create table
2004-08-26 18:25:48 +02:00
unknown
c42ce28591 ndb cluster config fixes, se respective files
mysql-test/ndb/ndb_config_2_node.ini:
  added new config parameter datadir
ndb/include/mgmapi/mgmapi_config_parameters.h:
  added new config parameter datadir and backup data dir
ndb/include/mgmcommon/ConfigRetriever.hpp:
  changed verify config so that it can be used by mgmt srvr
ndb/include/mgmcommon/NdbConfig.h:
  added option to set path for ndb files
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  changed token names for DB, MGM and API
  added config parametsers for datadir and backup data dir
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  changed verify config so that it can be used by mgmt srvr
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
  no need anymore to make uppercase
ndb/src/common/mgmcommon/NdbConfig.c:
  bugfix+
  added method to set datadir
ndb/src/kernel/Makefile.am:
  added debug libs to ndbd
ndb/src/kernel/vm/Configuration.cpp:
  added debug libs to ndbd
ndb/src/mgmsrv/MgmtSrvr.cpp:
  added verify config to mgmt srvr
ndb/src/mgmsrv/main.cpp:
  .
2004-08-26 14:35:33 +00:00
unknown
536ce70814 FileLogHandler.cpp, ndb_global.h:
sco and others: use PATH_MAX always


ndb/include/ndb_global.h:
  sco and others: use PATH_MAX always
ndb/src/common/logger/FileLogHandler.cpp:
  sco and others: use PATH_MAX always
2004-08-26 14:06:39 +02:00
unknown
76ec262247 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-08-26 13:25:10 +02:00
unknown
08595c46e7 sco compile fix: MAXPATHLEN 2004-08-26 13:25:09 +02:00
unknown
c1825f208c Fix ndb home path 2004-08-26 12:10:32 +02:00
unknown
40358d1af9 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl2025


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2004-08-25 15:08:22 +02:00
unknown
3621ff8ce2 Improved STR_VALUE macro 2004-08-25 14:55:04 +02:00
unknown
e387719d46 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/Users/mikron/mysql-4.1-ndb
2004-08-25 14:27:55 +02:00
unknown
6fe88305d9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-08-25 12:27:54 +00:00
unknown
926a055e5c small fixes, see respective file
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  removed debug code
ndb/src/mgmsrv/main.cpp:
  changed to use my_init and some help test changes
2004-08-25 12:27:26 +00:00
unknown
a95fd2d9a1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
2004-08-25 11:42:15 +00:00