Commit graph

379 commits

Author SHA1 Message Date
unknown
2bb314c2c5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2004-08-06 11:31:53 +02:00
unknown
01e1451ad8 Bug#4586 + TC fix
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Operations with marker always leads to abort even
  if IgnoreError was supplied (limitation)
  
  Check marker before marking operation as aborted (which removes marker)
ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Init cnoOfAllocatedPages after returnCommonArea
2004-08-06 11:29:56 +02:00
unknown
0bf9c56bf0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Auto merged
2004-08-06 10:06:58 +02:00
unknown
e4837b10d9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/ll


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Auto merged
2004-08-06 10:04:58 +02:00
unknown
bcdc77b3d1 Fixed ndb backup bug
ndb/src/kernel/blocks/backup/Backup.hpp:
  SCAN_FRAGCONF contains length of key(s) aswell
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Send correct signal length
2004-08-06 09:43:06 +02:00
unknown
8e55628d38 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-06 06:13:45 +02:00
unknown
689f4f2735 removed unused and illegal print method 2004-08-05 23:39:12 +02:00
unknown
acd3775521 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-08-05 23:02:31 +02:00
unknown
432e469746 Merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  SCCS merged
2004-08-05 22:32:25 +02:00
unknown
e223c07eb1 Merge joreland@bk-internal.mysql.com:irix
into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/test/ndbapi/testBasic.cpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-08-05 22:19:52 +02:00
unknown
6c8df36263 Small fix for updated config params 2004-08-05 18:51:27 +02:00
unknown
83c9f45fc2 Remove unused config parameters
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-05 18:23:01 +02:00
unknown
bf605f8e99 bug#4586 testSystemRestart -n SR_FULLDB
keep acc from shrinking/expanding when less than one page per fragment
is left.

This makes ACC not shrink so that one get out of pages during 
log execution in SR (which crashes badly)


ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  bug#4586
  keep acc from shrinking/expanding when less than one page per fragment
  is left
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  bug#4586
  keep acc from shrinking/expanding when less than one page per fragment
  is left
2004-08-05 17:53:31 +02:00
unknown
1fb7783d18 Fix bug for TCKEYREF's when using IgnoreError
ndb/src/ndbapi/NdbConnection.cpp:
  When using IgnoreError always wait for TCKEYCONF
2004-08-05 17:38:06 +02:00
unknown
73770db3f5 Initial support for updating configuration "on the fly"
Only updates values mgmsrv's on main memory
to be used in test prg's


ndb/include/mgmapi/mgmapi_debug.h:
  Update on config
ndb/include/util/ConfigValues.hpp:
  Update on config
ndb/src/mgmapi/mgmapi.cpp:
  Update on config
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Update on config
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Update on config
ndb/src/mgmsrv/Services.cpp:
  Update on config
ndb/src/mgmsrv/Services.hpp:
  Update on config
2004-08-05 16:21:33 +02:00
unknown
1479ed3f5a bug#4909 + testSystemRestart -n SR_FULLDB
1) Fix so that scan takeover is possible after SR
2) Reserve two pages for SR "zero pages"


ndb/include/ndbapi/NdbOperation.hpp:
  remove unused method
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix bug#4909
  don't reset tableFragptr during SR
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Also send reason for disallowing rollback
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add bitmask of free pages to use for page 0 during SR
ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  More prinout in unit test of PageMan
ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Reserve 2 pages to use for SR
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
  Don't alloc using "normal" allocConsPages when allocating for
  0-pages during SR, instead use 2 reserved pages
2004-08-05 15:38:08 +02:00
unknown
22306d0590 wl1292
testInterpreter is no longer built
2004-08-05 13:00:32 +02:00
unknown
39496af4a5 Remove timeout test, as default timeout now is a year 2004-08-05 08:15:58 +02:00
unknown
8b45aa646e wl1292 - workaround for mgmsrv node id problems
ndb/src/cw/cpcd/Makefile.am:
  Put cpcd in libexec
ndb/src/cw/cpcd/Process.cpp:
  Fixed reverse check with ulimit
ndb/test/run-test/main.cpp:
  Restart mgm server aswell on test failure.
  Removes problems with nodeid
2004-08-04 20:48:48 +02:00
unknown
607f0de736 Fix for allowing large transactions with less memory impact.
Currently one needs 636*1.6*2*noOfReplicas + 184 bytes per record
which amounts to about 4200 bytes per record. The 2 is a bug which
is fixed here as well, noOfReplicas is removed, it was there for
concurrent transactions but it is better to focus on supporting one
large transaction in the cluster. Also decreasing the safety factor
from 1.6 to 1.1.

Also removing unused parameters.
2004-08-04 15:47:50 +02:00
unknown
96a57976b3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-08-03 22:09:17 +02:00
unknown
f4e8fb5577 Ndb mgmsrv Memleak(s)
ndb/src/mgmapi/Makefile.am:
  remove ndb_test_mgmapi from Makefile
  as it's has "incorrect" dependencies
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Stop/wait for m_signalRecvThread aswell
2004-08-03 22:08:17 +02:00
unknown
11212f80b2 testOIBasic.cpp:
make it fail in more useful ways


ndb/test/ndbapi/testOIBasic.cpp:
  try to get correct result even on deadlock
2004-08-03 18:09:28 +02:00
unknown
ebe79c0b9b Compile fixes for irix 2004-08-03 17:16:57 +02:00
unknown
ec9cd4ecc9 more 4.1 to irix merge 2004-08-03 14:58:44 +02:00
unknown
ac8b4881c1 Merge 4.1 with jonas irix clone
BitKeeper/etc/logging_ok:
  auto-union
ndb/include/kernel/NodeState.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/include/util/Bitmask.hpp:
  Auto merged
ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/common/util/SocketServer.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmclient/CpcClient.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/include/NDBT_Table.hpp:
  Auto merged
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoOperations.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
ndb/test/src/NDBT_Tables.cpp:
  Auto merged
ndb/test/src/NDBT_Test.cpp:
  Auto merged
ndb/test/src/NdbRestarter.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-08-03 14:16:16 +02:00
unknown
061e815520 testOIBasic
ndb/test/ndbapi/testOIBasic.cpp:
  Start transaction does not take argument
2004-08-02 13:56:14 +02:00
unknown
2524f9cf73 Fix testOIBasic
1) Close transaction whenever Con goes out of scope so that it don't leave open
   transactions in TC
2) Close transaction when starting a transaction wo/ closing first
3) Allow 499 as deadlock
4) Don't use buddy as: 1) no need 2) harder to read signal log
2004-08-02 10:57:09 +02:00
unknown
01f1d5e283 Bug fix for testBasic -n MassiveRollback, a bug in LCP in LQH
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  max 4 replicas -> 3 next nodes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  1) If abort while in fragwaitqueue - just abort
  2) Fix for ACC_LCPSTARTED arrives after one ACC_LCPCONF has arrived
ndb/src/ndbapi/Ndbif.cpp:
  Be more "forgiving" in debug mode
ndb/test/ndbapi/testBasic.cpp:
  Accept timeouts in MassiveTimeout
ndb/test/src/HugoTransactions.cpp:
  Print batch size
2004-08-02 09:00:24 +02:00
unknown
cbc7e8c7d7 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
2004-08-01 17:03:58 +02:00
unknown
05a3558bb2 DbtuxScan.cpp:
dont crash before wl_1942 done


ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  dont crash before wl_1942 done
2004-08-01 16:03:04 +02:00
unknown
42210808fd Compile fixes for ccc (& cxx) on linux/alpha
Mainly explicit template instantiations


ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Explicit template instantiations
ndb/src/common/util/SocketServer.cpp:
  Explicit template instantiations
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Explicit template instantiations
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Explicit template instantiations
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Explicit template instantiations
ndb/src/kernel/vm/ArrayPool.hpp:
  Only define print if #VM_TRACE
ndb/src/mgmclient/CpcClient.cpp:
  Explicit template instantiations
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Explicit template instantiations
ndb/test/include/NDBT_Table.hpp:
  Fully qualified type name
ndb/test/include/NDBT_Test.hpp:
  Add destructors (so that v-table isn't empty)
ndb/test/run-test/main.cpp:
  Explicit template instantiations
ndb/test/src/HugoOperations.cpp:
  Explicit template instantiations
ndb/test/src/HugoTransactions.cpp:
  Explicit template instantiations
ndb/test/src/NDBT_Test.cpp:
  Explicit template instantiations
ndb/test/src/NdbRestarter.cpp:
  Explicit template instantiations
ndb/test/tools/cpcc.cpp:
  Explicit template instantiations
2004-08-01 15:53:31 +02:00
unknown
679e388f22 Fix uninit var.
Fix error printout


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Fix init scan frag record
ndb/src/mgmsrv/main.cpp:
  Fix error printout
2004-08-01 13:41:13 +02:00
unknown
76c6b740b9 New file missing in source distr. 2004-08-01 09:07:08 +02:00
unknown
8e006bd83b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-tux
2004-07-31 16:16:11 +02:00
unknown
a3630acb41 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/orca/space/pekka/ndb/version/my41-34x
2004-07-31 15:54:37 +02:00
unknown
7bee058b24 Bitmask.hpp:
compile fix for gcc-3.4.x


ndb/include/util/Bitmask.hpp:
  compile fix for gcc-3.4.x
2004-07-31 15:53:27 +02:00
unknown
0ba0f4a9aa Bug fix for alter table and auto_increment 2004-07-31 12:00:12 +02:00
unknown
65460480a6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/mikron/mysql-4.1


ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
ndb/test/include/HugoTransactions.hpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
2004-07-30 12:48:34 +02:00
unknown
d392ff2130 Removed an error check from debug mode that gets executed
n**2 times in closeTransaction where n is number of signals
sent in transaction. n can easily become 250.000 in a large
transaction.
2004-07-30 12:46:27 +02:00
unknown
ed85156cd8 DbtuxScan.cpp:
fix erronous assert at scan close, lock abort


ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Scan is closing.  Lock conf is in job buffer.
  We have sent lock abort to flush it out.
  At execute conf need to RNIL current lock op
  to avoid assert fail when abort comes.
  Bug seen couple of times, hard to test..
2004-07-28 19:54:38 +02:00
unknown
b620ae298a MgmtSrvr.hpp:
make subclass friend for gcc-2.95 et al [dup push]


ndb/src/mgmsrv/MgmtSrvr.hpp:
  make subclass friend for gcc-2.95 et al
2004-07-28 18:55:17 +02:00
unknown
4456a78995 MgmtSrvr.hpp:
make subclass friend for gcc-2.95 et al


ndb/src/mgmsrv/MgmtSrvr.hpp:
  make subclass friend for gcc-2.95 et al
2004-07-28 15:35:02 +02:00
unknown
ce0abdede7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-tux


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-07-28 12:53:23 +02:00
unknown
99dfeddbef Fix 64-bit issue in ConfigValues 2004-07-28 11:05:00 +02:00
unknown
2f4d0e1e1d wl-1884 storing NULL in ordered index 2004-07-27 13:20:37 +02:00
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