Commit graph

565 commits

Author SHA1 Message Date
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
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
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
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
3212cc473d new parameter BackupDataDir 2004-08-26 21:43:07 +00: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
db2343e8d7 merge
BitKeeper/etc/logging_ok:
  auto-union
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
2004-08-25 12:17:43 +02:00
unknown
64a5170be6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/Volumes/Backup1/wl2056


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2004-08-25 10:28:49 +02:00
unknown
00ca62f046 merge count(*) optim with wl2025
BitKeeper/etc/logging_ok:
  auto-union
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
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
2004-08-25 08:49:46 +02:00
unknown
4797675ac7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-25 01:31:48 +02:00
unknown
8bb0aaa516 Merge
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
ndb/src/common/mgmcommon/ConfigInfo.hpp:
  Auto merged
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
  Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
  SCCS merged
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  SCCS merged
2004-08-24 22:35:14 +00:00
unknown
d2c8f1a762 Implemented general purpose psuedo columns: row_count & fragment
Implemented new interpreter instruction: exit_ok_last

This two new features combined can be used to make fast select count
 


ndb/include/kernel/AttributeHeader.hpp:
  Psuedo columns fragment & row_count
ndb/include/kernel/GlobalSignalNumbers.h:
  Impl. READ_ROWCOUNT
ndb/include/kernel/signaldata/TupKey.hpp:
  Remove unused pageId pageIndex and replace with lastRow flag
ndb/include/ndbapi/NdbOperation.hpp:
  New instruction for last_row
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  REQ_ROWCOUNT + last row
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  REQ_ROWCOUNT + last row
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add readers for new psuedo columns
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Add readers for new psuedo columns
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Add readers for new psuedo columns
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Use exit ok (not ok_last)
ndb/src/ndbapi/NdbOperationExec.cpp:
  Use exit ok (not ok_last)
ndb/src/ndbapi/NdbOperationInt.cpp:
  New instruction
2004-08-24 23:27:32 +02:00
unknown
45c94a288d enables case insensitivity in ndb config file 2004-08-24 19:07:09 +00:00
unknown
f7e31ee94c merge
configure.in:
  Auto merged
mysql-test/t/ndb_blob.test:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-08-24 13:29:11 +02:00
unknown
f546ed0931 Manual Merge
ndb/src/common/mgmcommon/LocalConfig.cpp:
  Auto merged
2004-08-24 11:55:28 +02:00
unknown
b0d64c68b8 Removed some error codes since the errors are hard errors which
need ndbrequire instead.
2004-08-24 00:15:04 +02:00
unknown
1091fe23f6 further simplifications of ndb config and aligned usage of mysql datadir in ndb
acinclude.m4:
  added configure switch for ndb base port
configure.in:
  ndb gcc compile now works with -fno-implicit-templates
mysql-test/ndb/ndb_config_2_node.ini:
  further simplifications of config, removed need for [COMPUTER] section
ndb/include/ndb_global.h:
  moved this to configure option
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  changed config to take to take strings instead of ints
ndb/src/common/mgmcommon/ConfigInfo.hpp:
  changed config to take to take strings instead of ints
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
  string to number convert to accept "0x" prefix on numbers
ndb/src/common/mgmcommon/InitConfigFileParser.hpp:
  movet convert function to public and static
ndb/src/common/mgmcommon/LocalConfig.cpp:
  define NDB_BASE_PORT now string instead of number
ndb/src/common/mgmcommon/Makefile.am:
  added mysqld defines in mgmcommon to be able to configure default data dir to be the same as for mysqld
2004-08-23 16:29:04 +00:00
unknown
a3e0b69bfb Fix for bug#5171 2004-08-23 17:24:03 +02:00
unknown
000b69a357 Long signal buffer size configurable
Dbutil decreased memory footprint
Suma decreased memory footprint
(16M memory removed from default config)


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Long signal buffer size configurable
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Long signal buffer size configurable
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Long signal buffer size configurable
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Decrease size of memory for prepared operations in Dbutil
ndb/src/kernel/blocks/dbutil/DbUtil.hpp:
  Decrease size of memory for prepared operations in Dbutil
ndb/src/kernel/blocks/suma/Suma.cpp:
  Removed GREP use of SUMA that wasted 13.2M of memory
ndb/src/kernel/blocks/suma/Suma.hpp:
  Removed GREP use of SUMA that wasted 13.2M of memory
ndb/src/kernel/blocks/suma/SumaInit.cpp:
  Removed GREP use of SUMA that wasted 13.2M of memory
ndb/src/kernel/vm/TransporterCallback.cpp:
  Long signal buffer size configurable
2004-08-23 12:01:40 +02:00
unknown
f49dff14a1 merge
BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
2004-08-22 21:42:52 +02:00
unknown
3831c7a294 Merge build.mysql.com:/home/bk/mysql-4.1-ndb
into build.mysql.com:/users/mronstrom/wl2025


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
2004-08-21 15:17:10 +02:00
unknown
2c7754be96 Merge build.mysql.com:/home/bk/mysql-4.1-ndb
into build.mysql.com:/users/mronstrom/wl2056


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
ndb/src/common/mgmcommon/LocalConfig.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-21 15:11:47 +02:00
unknown
b85e699ec8 New config parameters for Log Page Buffers
Fixing issue with NO_OF_FRAG_PER_NODE
Also removed some OSE code no longer needed when configurable log pages 


ndb/include/kernel/signaldata/FsCloseReq.hpp:
  Removing annoying compiler warning
ndb/include/mgmapi/mgmapi_config_parameters.h:
  New config parameters for Log Page Buffers
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  New config parameters for Log Page Buffers
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
ndb/src/kernel/vm/pc.hpp:
  New config parameters for Log Page Buffers
  Fixing issue with NO_OF_FRAG_PER_NODE
2004-08-21 13:14:27 +02:00
unknown
1e5716ceca New config parameters
malloc -> NdbMem_Allocate


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Added Meta Data config parameter constants
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Added Meta Data config parameters
ndb/src/common/mgmcommon/LocalConfig.cpp:
  malloc -> NdbMem_Allocate
ndb/src/common/mgmcommon/NdbConfig.c:
  malloc -> NdbMem_Allocate
ndb/src/common/portlib/NdbCondition.c:
  malloc -> NdbMem_Allocate
ndb/src/common/portlib/NdbMutex.c:
  malloc -> NdbMem_Allocate
ndb/src/common/portlib/NdbThread.c:
  malloc -> NdbMem_Allocate
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Removed memory allocation as part of new of TcIndexOperation
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Some minor things + change of config parameter for consistency
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Removed memory allocation as part of new of TcIndexOperation
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  malloc -> NdbMem_Allocate
ndb/src/kernel/vm/Configuration.cpp:
  malloc -> NdbMem_Allocate
  + New config parameters for more consistency
ndb/src/kernel/vm/pc.hpp:
  Not so many fragments allocated. Saves 140kBytes per table
  160 kb -> 20 kb per table
2004-08-21 09:16:50 +02:00
unknown
25c2c2a77c fix compile error on some platforms 2004-08-20 16:04:06 +00:00
unknown
149d9e2f4d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb


ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
2004-08-19 11:13:49 +02:00
unknown
d8e92342c5 Merge joreland@bk-internal.mysql.com:wl2025
into mysql.com:/home/jonas/src/wl2025


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
2004-08-19 10:37:46 +02:00
unknown
9dc57a2a7f Some platfom compile/build fixes for ndb
ndb/include/kernel/Interpreter.hpp:
  R1 defined on some platforms
ndb/include/util/BaseString.hpp:
  fix for compiler bug
2004-08-19 08:24:27 +00:00
unknown
68da9ff339 wl2025 - fix suma & backup
pluse remove "first_batch_size" and instead put
batch_size on next_scan_req


ndb/include/kernel/signaldata/ScanFrag.hpp:
  Rename
  * concurrency -> batch_size_bytes
  * batch_byte_size -> batch_size_bytes
  
  Removed first_batch_size and
  added size parameters to SCAN_NEXTREQ
ndb/src/kernel/blocks/backup/Backup.cpp:
  Adopt to SCAN_FRAG_CHANGES
ndb/src/kernel/blocks/backup/Backup.hpp:
  Adopt to SCAN_FRAG_CHANGES
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Renamed
  scanCompletedOperations -> m_curr_batch_size_rows
  scanConcurrentOperations -> m_max_batch_size_rows
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Renamed
  scanCompletedOperations -> m_curr_batch_size_rows
  scanConcurrentOperations -> m_max_batch_size_rows
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Adopt to SCAN_FRAG_CHANGES
ndb/src/kernel/blocks/suma/Suma.cpp:
  Adopt to SCAN_FRAG_CHANGES
2004-08-19 07:43:06 +02:00
unknown
86fdb8b977 Fix for WL#1731 Handler: multiple databases 2004-08-18 19:13:39 +02:00
unknown
c378cb825a Merge joreland@bk-internal.mysql.com:/users/mronstrom/wl2025
into mysql.com:/home/jonas/src/wl2025


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
2004-08-18 12:04:21 +02:00
unknown
a443bee804 Added configuration parameters for batch size, batch byte size
and max scan batch size
Removed some debug printouts
2004-08-18 11:55:37 +02:00
unknown
bc5c7427c7 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl2025


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
2004-08-18 11:18:56 +02:00
unknown
fc669d12e0 18 bits didn't fit into Uint16 2004-08-18 09:44:25 +02:00
unknown
f03022b22a Fix bugs + include check of batch_byte_size and
use of first_batch_size


ndb/include/kernel/ndb_limits.h:
  New maximum size
ndb/include/kernel/signaldata/ScanFrag.hpp:
  New error code
ndb/include/kernel/signaldata/ScanTab.hpp:
  Need to go to Uint16 when batch size > 255
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Uint8 => Uint16 when batch_size > 255
  New and changed methods for acc ptr's and
  checking end of scan batch (incl. check of batch_byte_size
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Uint8 => Uint16 when batch_size > 255
  New and changed methods for acc ptr's and
  checking end of scan batch (incl. check of batch_byte_size
2004-08-17 17:55:47 +02:00
unknown
02e04a7aa9 Solaris fixes
ndb/include/ndb_global.h:
  Include my_alarm (to get signal.h)
ndb/src/cw/cpcd/Process.cpp:
  Include my_alarm (to get signal.h)
ndb/src/cw/cpcd/main.cpp:
  Include my_alarm (to get signal.h)
ndb/src/kernel/main.cpp:
  Include my_alarm (to get signal.h)
ndb/src/kernel/vm/Emulator.cpp:
  Include my_alarm (to get signal.h)
ndb/src/mgmclient/main.cpp:
  Include my_alarm (to get signal.h)
ndb/src/mgmsrv/Services.cpp:
  Include ndb_global instead of string.h
ndb/src/ndbapi/NdbOperationInt.cpp:
  Keep consistent order of 64 bits in interpreter
ndb/src/ndbapi/TransporterFacade.cpp:
  Include my_alarm (to get signal.h)
2004-08-17 11:55:51 +02:00
unknown
5a9d28e33f Merge mronstrom@bk-internal.mysql.com:/users/mronstrom/wl2025
into mysql.com:/Users/mikron/wl2025


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2004-08-11 17:40:57 +02:00
unknown
4294f84728 Finalised first step of scan optimisations
Everything is working but a few things is still remaining


ndb/include/kernel/ndb_limits.h:
  New maximum batch size and total batch size over cluster
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Only two options
  1) One fragment per node
  2) One fragment in total
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  First step preparing for a dynamic array for scan_acc_op_ptr.
  Prepared by hiding all accesses by subroutines.
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  First step preparing for a dynamic array for scan_acc_op_ptr.
  Prepared by hiding all accesses by subroutines.
  Removed some dead code
2004-08-11 17:36:31 +02:00
unknown
732ccc5ccc Fix for bug#4730 2004-08-11 15:06:17 +02:00
unknown
f72b82bd2d Merge build.mysql.com:/home/bk/mysql-4.1-ndb
into build.mysql.com:/users/mronstrom/wl2025


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2004-08-11 12:18:12 +02:00
unknown
b689f4873e Fix of a nasty bug, small but hard to find
Some small printout fixes


ndb/include/kernel/signaldata/ScanFrag.hpp:
  Mixed up Hexadecimal and decimal notation, cost me 5 hours of
  debugging to find, grrr..
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Fixed some declaration so that new bigger info fits in variables
ndb/test/ndbapi/testScanPerf.cpp:
  Fix for printing int's instead of Uint64 which for some reason
  caused problems on my Mac.
  Also print performance in each loop.
2004-08-11 12:08:30 +02:00
unknown
a550a61f8c Fix uninit variable bug "surfaced" by removing mem init in SimulatedBlock
ndb/include/kernel/signaldata/StartInfo.hpp:
  Fix signal len
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Put init in constructor
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Send corrent start_inforef
  Init NodeRecord::allowNodeStart
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Remove all mem-inits so that debug/release don't differ
2004-08-11 07:15:37 +02:00
unknown
04cc2cc4d1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb


mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-08-10 11:48:43 +02:00
unknown
9b3d5b9cdb Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/Users/mikron/mysql-4.1-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
2004-08-09 17:59:37 +02:00
unknown
65f6fcaff2 Correction + move of code to NDB_DEBUG_FULL from VM_TRACE
ndb/include/transporter/TransporterDefinitions.hpp:
  Correction for bad math
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Moved heavy check code to NDB_DEBUG_FULL
2004-08-09 17:51:37 +02:00
unknown
fd566261a4 First step for WL 2025
Not yet fully working
Scan reads work fine, not scan updates


ndb/include/kernel/ndb_limits.h:
  Introducing a new parameter plus increasing the max no of parallel
  operations per scan in LQH, first step in WL 2025
ndb/include/kernel/signaldata/ScanFrag.hpp:
  Only need one clientOpPtr
  Concurrency is batch_size to use in this scan
  batch_byte_size is max no of bytes sent in a batch
  first_batch_size is the batch size in the first batch
ndb/include/kernel/signaldata/ScanTab.hpp:
  apiOperationPtr is sent as long signal data
  batch_byte_size and first_batch_size is needed for further transport
  to LQH
  batch size can now be bigger than before
ndb/include/kernel/signaldata/TcKeyReq.hpp:
  More concurrency means more size for scanInfo also in TCKEYREQ
ndb/include/ndbapi/NdbReceiver.hpp:
  New subroutine to caclculate batch size and similar parameters
ndb/include/ndbapi/NdbScanOperation.hpp:
  batch size calculated before sending, not necessary to store anymore
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Updated signal printer for SCAN_TABREQ
ndb/src/kernel/blocks/backup/Backup.cpp:
  Fixes to make it compile, not fixed for BACKUP being useful yet
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Removed parameters no longer needed and added some new ones.
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix for cmaxAccOps that was using the wrong constant
  Removed old code
  New SCAN_FRAGREQ signal
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  New variables
  Removed dead code
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  New SCAN_TABREQ, SCAN_FRAGREQ, SCAN_FRAGCONF and SCAN_TABCONF
  Fixed some error handling to be more efficient
ndb/src/kernel/blocks/suma/Suma.cpp:
  Fixes to make it compile, not yet usable for SUMA features
ndb/src/kernel/vm/Configuration.cpp:
  Fix for wrong constant
ndb/src/ndbapi/NdbApiSignal.cpp:
  Fix for not using constants
ndb/src/ndbapi/NdbApiSignal.hpp:
  Added possibility to get signal sending node from signal
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Moved declaration
ndb/src/ndbapi/NdbReceiver.cpp:
  New routine to calculate batch_size etc.
ndb/src/ndbapi/NdbScanOperation.cpp:
  Various fixes for sending SCAN_TABREQ and other stuff
2004-08-09 17:43:15 +02:00
unknown
1905e1c5ac bug#4529
ndb/include/mgmcommon/ConfigRetriever.hpp:
  Separate connect and all/fetch
ndb/include/mgmcommon/LocalConfig.hpp:
  Use BaseString
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Separate connect and all/fetch
ndb/src/common/mgmcommon/LocalConfig.cpp:
  Removed useless onlyNodeId
ndb/src/kernel/main.cpp:
  Separeted Configuration fetch/setup
ndb/src/kernel/vm/Configuration.cpp:
  Separeted Configuration fetch/setup
ndb/src/kernel/vm/Configuration.hpp:
  Separeted Configuration fetch/setup
ndb/src/mgmapi/mgmapi.cpp:
  Fixed some return codes
ndb/src/mgmclient/main.cpp:
  LocalConfig update
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Put mutex around reserving node'ids
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Put mutex around reserving node'ids
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Changes ConfigRetreiver interface
ndb/src/mgmsrv/Services.cpp:
  Allow reserve same id twice
ndb/src/mgmsrv/main.cpp:
  Ignore SIGPIPE
ndb/src/ndbapi/TransporterFacade.cpp:
  ConfigRetriever interface
2004-08-09 13:25:07 +02:00
unknown
89b446969a testTransaction -n FRead*
testTransaction -n *Scan*
testTimeout -n *


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Added DUMP for tc appl timeout
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Send tckey conf if m_exec_flags is set
  Added dump for appl timeout
ndb/test/include/HugoOperations.hpp:
  Add scanRead
ndb/test/ndbapi/testTimeout.cpp:
  Reenable
ndb/test/ndbapi/testTransactions.cpp:
  Fix scan test cases
ndb/test/run-test/daily-basic-tests.txt:
  reenable timeout-tests
  added testTransaction -n Scan* testcases
ndb/test/src/HugoOperations.cpp:
  Fix scan
ndb/test/src/NDBT_Test.cpp:
  Drop table before test...(if createTable==true)
2004-08-09 09:44:05 +02:00
unknown
fbceeb05fe Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/ll


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-08-08 20:58:57 +02:00