Commit graph

319 commits

Author SHA1 Message Date
unknown
cc8920c8ff Merge
ndb/test/ndbapi/Makefile.am:
  SCCS merged
2004-07-27 13:02:50 +02:00
unknown
1325c4678e Merge problem
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Remove comma
2004-07-27 12:07:47 +02:00
unknown
41f3a2dcf2 Merge
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  SCCS merged
2004-07-27 11:57:04 +02:00
unknown
2bd64bde34 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/orca/space/pekka/ndb/version/my41-blobs
2004-07-27 10:32:08 +02:00
unknown
cd10133261 NdbSqlUtil.cpp, NdbSqlUtil.hpp:
add NdbSqlUtil::cmp for missing datatypes


ndb/include/util/NdbSqlUtil.hpp:
  add NdbSqlUtil::cmp for missing datatypes
ndb/src/common/util/NdbSqlUtil.cpp:
  add NdbSqlUtil::cmp for missing datatypes
2004-07-27 10:31:10 +02:00
unknown
5fbf11ba9b Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb


ndb/test/ndbapi/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
2004-07-27 09:59:26 +02:00
unknown
e4668ff1d2 testOIBasic
Make sure not to fiddle with state, if not waiting for scan


ndb/src/ndbapi/Ndbif.cpp:
  Make sure not to fiddle with state, if not waiting for scan
2004-07-27 01:01:16 +02:00
unknown
d5ff3eca53 Merge
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  merge
2004-07-23 13:27:26 +02:00
unknown
fea015fff0 Add include of signal.h to Emulator.cpp
ndb/src/kernel/vm/Emulator.cpp:
  Added signal.h to include header for signal
2004-07-23 10:32:23 +02:00
unknown
9864327a61 ha_ndb blobs 2004-07-22 12:33:14 +02:00
unknown
0ac2de0163 Adding *.hpp files for testScan and testScanInterpreter to sources
Removing old directories for test/ using bk rmdir


BitKeeper/deleted/.del-Makefile~14c4cd8063f58fea:
  Delete: ndb/test/ndbapi/bank/old_dirs/bankTimer/Makefile
BitKeeper/deleted/.del-Makefile~82b2fd7fe466962:
  Delete: ndb/test/ndbapi/bank/old_dirs/bankMakeGL/Makefile
BitKeeper/deleted/.del-Makefile~95fdc210ddf553f6:
  Delete: ndb/test/ndbapi/bank/old_dirs/bankSumAccounts/Makefile
BitKeeper/deleted/.del-Makefile~96d101a498089452:
  Delete: ndb/test/ndbapi/bank/old_dirs/bankCreator/Makefile
BitKeeper/deleted/.del-Makefile~e4bdeda89cd7e97a:
  Delete: ndb/test/ndbapi/bank/old_dirs/bankTransactionMaker/Makefile
BitKeeper/deleted/.del-Makefile~1e0c3a31ef7c20c:
  Delete: ndb/test/ndbapi/bank/old_dirs/src/Makefile
BitKeeper/deleted/.del-Makefile~3766e52c58c4799a:
  Delete: ndb/test/ndbapi/bank/old_dirs/testBank/Makefile
BitKeeper/deleted/.del-Makefile~eb4584f8f3d806a8:
  Delete: ndb/test/ndbapi/bank/old_dirs/bankValidateAllGLs/Makefile
ndb/test/ndbapi/Makefile.am:
  Adding *.hpp files for testScan and testScanInterpreter to sources
2004-07-22 09:37:55 +02:00
unknown
a8776ca520 Additional fix for bug#4650 2004-07-20 21:24:03 +02:00
unknown
8e8a93df81 Fix for bug#4650 Scan does not report timeout of owning transaction 2004-07-20 16:31:18 +02:00
unknown
4baaca9560 BUG#4511 Made Discless deprecated
mysql-test/mysql-test-run.sh:
  Change to diskless
mysql-test/ndb/ndb_config_2_node.ini:
  Change to diskless
mysql-test/ndb/ndbcluster.sh:
  Change to diskless
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Making Discless deprecated, so it still can be used but a warning will be printed if used.
  Adde possibilty to transform a value of type ConfigInfo::BOOL, neede for depicated Discless
2004-07-19 10:50:50 +02:00
unknown
417c3a07c7 BUG#4511
ndb/src/common/debugger/EventLogger.cpp:
  Changed to STATISTICS
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Changed to Diskless
2004-07-16 10:42:45 +02:00
unknown
8e74ef8aca Moved testScanPerf to ndb/test/ndbapi/ and added it to Makefile
BitKeeper/deleted/.del-Makefile~bf89f137b06b6e68:
  Delete: ndb/test/ndbapi/testScanPerf/Makefile
BitKeeper/deleted/.del-testScanPerf.cpp~b619ce6099f279a1:
  Delete: ndb/test/ndbapi/testScanPerf/testScanPerf.cpp
ndb/test/ndbapi/Makefile.am:
  Add testScanPerf to Makefile.am
2004-07-15 09:28:18 +02:00
unknown
8a23601e06 Remove the remains of SCAN_TABINFO signal
ndb/include/kernel/GlobalSignalNumbers.h:
  Remove unused signal number for GSN_SCAN_TABINFO
ndb/include/kernel/signaldata/ScanTab.hpp:
  Remove definition of old signal ScanTabInfo
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Removed old print function for SCAN_TABINFO
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Removed name for GSN_SCAN_TABINFO
ndb/src/ndbapi/NdbApiSignal.cpp:
  Removed SCAN_TABINFO and old comment
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Removed duplicate definition of WAIFOR_SCAN_TIMEOUT, real one is in NdbScanOperation.cpp
ndb/src/ndbapi/NdbScanOperation.cpp:
  Removed duplicate debug printout
ndb/src/ndbapi/Ndbif.cpp:
  Removed SCAN_TABINFO
2004-07-15 09:25:23 +02:00
unknown
9e38156bed wl1292
Try to remove rare timeouts by
Increased timeout in CpcClient and mgmapi


ndb/src/common/util/socket_io.cpp:
  Increased timeout in CpcClient and mgmapi
ndb/src/mgmclient/CpcClient.cpp:
  Increased timeout in CpcClient and mgmapi
2004-07-11 08:55:32 +02:00
unknown
98083dd6eb testSystemRestart -n SR1
Handle arbit during system shutdown


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Handle arbit during system shutdown
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Handle arbit during system shutdown
ndb/test/run-test/daily-basic-tests.txt:
  Moved testOIBasix + testSystemRestart -n SR1/SR2
  to basic tests
ndb/test/run-test/daily-devel-tests.txt:
  Moved testOIBasix + testSystemRestart -n SR1/SR2
  to basic tests
2004-07-11 08:49:01 +02:00
unknown
544f52f11c Bug fix for testOIBasic
ndb/src/ndbapi/Ndbif.cpp:
  Allow SCANTAB_CONF wo/ waiting for them,
  but only reset thewaitstate when actually waiting
2004-07-09 00:46:49 +02:00
unknown
08169b0483 Fixes for min, max and default values of config params
Removed all DEPRICATED params
Introduced MAX_INT_RNIL as new maximum of Uint32 = RNIL - 1
2004-07-08 14:41:01 +02:00
unknown
715158b790 BUG#3963
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  let sendTCKEY_FAILCONF reset marker
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) let sendTCKEY_FAILCONF reset marker
  2) Restart marker scan on NF
  3) Don't send TCKEY_FAILCONF to 0
ndb/src/mgmapi/mgmapi.cpp:
  More info from mgmapi
ndb/test/run-test/daily-basic-tests.txt:
  drop tables to fix -n MassiveRollback
ndb/test/run-test/main.cpp:
  More error messages (and retries) on error
2004-07-08 08:12:28 +02:00
unknown
abf8c93d80 testIndex -n NFNR1
Bugs in scan(tc)
        nf-handling(api)
        exec-handling(tc)


ndb/include/ndbapi/NdbConnection.hpp:
  Allow dropped signal during NF handling
ndb/include/ndbapi/NdbOperation.hpp:
  Add option to allow dropped signals
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) Printer for state
  2) New option to sendtckeyconf (index)
     - clear exec flag
  3) Moved init of *global* apiConnectptr to
     prevent errornous scan_tabconf
     ARGH!!!
ndb/src/ndbapi/NdbConnection.cpp:
  Move abort from checkState_trans
  since it can be ok with "illegal" signals during NF handling
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Move abort from checkState_trans
  since it can be ok with "illegal" signals during NF handling
ndb/src/ndbapi/Ndbif.cpp:
  1) Indentation
  2) Better handling of TCKEY_FAILCONF
  - always ack commit ack marker
    even if transaction has already been removed
  3) abort on 4012 (VM_TRACE)
ndb/src/ndbapi/TransporterFacade.cpp:
  Don't trace APIREG_REQ/CONF by default
ndb/test/include/NDBT_Test.hpp:
  Atomic decProperty (used for semaphore impl.)
ndb/test/ndbapi/testIndex.cpp:
  Impl. option to sync restarts
ndb/test/src/NDBT_Test.cpp:
  Atomic decProperty
2004-07-07 13:40:53 +02:00
unknown
7992ae4239 wl1292 - minor fixes
ndb/test/run-test/main.cpp:
  Remove LD_LIBRARY_PATH setting as it's compiled into binary
  Removed node id from NDB_CONNECTSTRING
2004-07-07 06:42:32 +02:00
unknown
eebf8ff512 testScan -n ScanReadError5023
Don't wait for more SCANTAB_CONF when received SCAN_TABREF


ndb/src/ndbapi/NdbScanOperation.cpp:
  Don't wait for more SCANTAB_CONF when received SCAN_TABREF
  More debug
2004-07-06 21:48:04 +02:00
unknown
cb76ceb14f fix for testTransactions -n InsertInsert
- Add sequence to the initial trans id so that create/drop ndb object
  don't generate same transid


ndb/src/ndbapi/NdbConnection.cpp:
  Add sequence to the initial trans id so that create/drop ndb object
  don't generate same transid
ndb/src/ndbapi/Ndbif.cpp:
  Add sequence to the initial trans id so that create/drop ndb object
  don't generate same transid
ndb/src/ndbapi/TransporterFacade.cpp:
  Add sequence to the initial trans id so that create/drop ndb object
  don't generate same transid
ndb/src/ndbapi/TransporterFacade.hpp:
  Add sequence to the initial trans id so that create/drop ndb object
  don't generate same transid
2004-07-06 20:57:59 +02:00
unknown
f1ef636a3d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
2004-07-06 17:47:56 +02:00
unknown
f5652ffa15 Fixed typo 2004-07-06 17:45:37 +02:00
unknown
e1fdd5f639 wl1873 Add ScanRestart to daily-basic-tests
ndb/test/run-test/daily-basic-tests.txt:
  Add ScanRestart to daily-basic-tests
2004-07-06 11:43:48 +02:00
unknown
1a74bb1dc2 wl1873 2004-07-06 11:38:11 +02:00
unknown
ca6e7a0ca9 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/wl1873


ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbResultSet.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testScan.cpp:
  Auto merged
2004-07-06 11:34:26 +02:00
unknown
d0a9676b4a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


mysql-test/ndb/ndbcluster.sh:
  Auto merged
2004-07-06 10:20:52 +02:00
unknown
1d57e419e9 Fix uninit variable 2004-07-06 10:19:05 +02:00
unknown
913424a8ec merge
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
2004-07-06 08:56:05 +02:00
unknown
1773595494 Fixed memory handling
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  longable when routed
ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  longable when routed
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Init blob count correctly
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Receiver::init
ndb/src/ndbapi/NdbOperation.cpp:
  Receiver::init
  release memory
2004-07-06 08:36:52 +02:00
unknown
3f3ea3037a Fixed bugs in ordered scan discovered by mysql-test-run
Enabled ordered scan in handler



ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Moved saveBound to NdbIndexScanOperation
ndb/include/ndbapi/NdbScanOperation.hpp:
  Moved saveBound to NdbIndexScanOperation
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Introduced map for
  index attributes (keys) -> real attr id (and back)
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Introduced map for
  index attributes (keys) -> real attr id (and back)
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Moved saveBound to NdbIndexScanOperation
ndb/src/ndbapi/NdbOperationInt.cpp:
  Moved saveBound to NdbIndexScanOperation
ndb/src/ndbapi/NdbScanOperation.cpp:
  Moved saveBound to NdbIndexScanOperation
  Fixed bugs in handling of setBounds w.r.t getValues and index keys
    (use new reverse map)
  Fixed bugs in next_result_ordered
sql/ha_ndbcluster.cc:
  Use sorted scan when requested
2004-07-05 20:41:06 +02:00
unknown
38486b33c6 Merge joreland@bk-internal:/home/bk/mysql-4.1
into melody.local:/home/mysqldev/jonas/mysql-4.1
2004-07-05 07:59:34 +02:00
unknown
1042c0e86b BUG#4384
ndb/src/common/util/ConfigValues.cpp:
  BUG#4384
  Compute pointers manually instead of using ptr[-x]
  Changed return type from "*&" to "**"
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-05 07:52:20 +02:00
unknown
a7909ab90a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/gcc34
2004-07-04 21:20:39 +02:00
unknown
1ed75f5679 Added flexibility for connecting and retrieving config from mgmtsrvr 2004-06-30 14:56:16 +00:00
unknown
426b2ac2b4 fix not to have to set TCP DEFAULT 2004-06-30 13:26:31 +00:00
unknown
12e9f0103a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-06-30 13:12:24 +00:00
unknown
e28b793213 see respective file
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  fix SHM config + cosmetics
ndb/src/common/mgmcommon/LocalConfig.cpp:
  use autoptr
ndb/src/common/transporter/SHM_Transporter.cpp:
  fixed SHM transporter setup
ndb/src/common/transporter/SHM_Transporter.hpp:
  fixed SHM transporter setup
ndb/src/common/transporter/SHM_Transporter.unix.cpp:
  fixed SHM transporter setup
ndb/src/kernel/vm/Configuration.cpp:
  removed check of connectstring
2004-06-30 12:29:53 +00:00
unknown
64c81b9dfd fixed compile of shm transporter
ndb/src/mgmsrv/Services.cpp:
  changed getsockname to getpeername
2004-06-29 14:56:02 +00:00
unknown
a1ef616c32 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41
2004-06-29 14:57:31 +02:00
unknown
ac5a2ead92 wl1822: verify locks are flushed 2004-06-29 14:53:15 +02:00
unknown
c43445e197 adopting mysql-test-run to new ndb config
+ added option to ndb_waiter to wait for NO CONTACT


mysql-test/mysql-test-run.sh:
  adopting mysql-test-run to new ndb config
mysql-test/ndb/ndbcluster.sh:
  adopting mysql-test-run to new ndb config
ndb/tools/waiter.cpp:
  added option to wait for NO CONTACT
2004-06-28 19:53:55 +00:00
unknown
700e94e19b Merge
mysql-test/ndb/ndb_config_2_node.ini:
  SCCS merged
mysql-test/ndb/ndbcluster.sh:
  SCCS merged
2004-06-28 18:27:31 +00:00
unknown
e2d3f7b079 several config fixes for ndb, see respective file
ndb/include/debugger/EventLogger.hpp:
  removed unused method
ndb/include/mgmcommon/ConfigRetriever.hpp:
  put NdbMgmHandle in ConfigRetriever to enable holding connection open until setup complete
ndb/include/mgmcommon/NdbConfig.h:
  moved naming of all "ndb" file into NdbConfig.c
ndb/include/ndb_global.h:
  introduced define NDB_BASE_PORT to control default port for ndb
ndb/src/common/debugger/EventLogger.cpp:
  removed unused method
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  introduced define NDB_BASE_PORT to control default port for ndb
  + added setting default Id's on nodes
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  put NdbMgmHandle in ConfigRetriever to enable holding connection open until setup complete
ndb/src/common/mgmcommon/IPCConfig.cpp:
  changed error message
ndb/src/common/mgmcommon/LocalConfig.cpp:
  introduced define NDB_BASE_PORT to control default port for ndb
ndb/src/common/mgmcommon/NdbConfig.c:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/common/transporter/TransporterRegistry.cpp:
  spelling errors
ndb/src/kernel/error/ErrorReporter.cpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/kernel/error/ErrorReporter.hpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/kernel/main.cpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/kernel/vm/Configuration.cpp:
  moved allocation of ConfigRetriever object to Configuration to enable holing "config" open until setup finished
ndb/src/kernel/vm/Configuration.hpp:
  moved allocation of ConfigRetriever object to Configuration to enable holing "config" open until setup finished
ndb/src/mgmclient/main.cpp:
  fix default port number
ndb/src/mgmsrv/MgmtSrvr.cpp:
  fix default port
ndb/src/mgmsrv/Services.cpp:
  added spec of transporter in get_nodeid
ndb/src/mgmsrv/main.cpp:
  moved naming of all "ndb" file into NdbConfig.c
ndb/src/ndbapi/TransporterFacade.cpp:
  moved allocation of ConfigRetriever object to TransporterFacade to enable holing "config" open until setup finished
ndb/src/ndbapi/TransporterFacade.hpp:
  moved allocation of ConfigRetriever object to TransporterFacade to enable holing "config" open until setup finished
2004-06-28 17:29:58 +00:00
unknown
3d5c2d1d31 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb


ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-06-27 16:00:48 +02:00