Commit graph

1004 commits

Author SHA1 Message Date
unknown
1634ecf295 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
2004-11-24 16:47:08 +01:00
unknown
98de7e010f bug#6775 - ndb
Queue scan on real fragment.
  Index fragment for range scans
  Table fragment for table scans


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Document meaning of fragPtrI and how it differs
    from scanTcRec->fragmentptr
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Queue scan on real fragment.
    Index fragment for range scans
    Table fragment for table scans
ndb/src/ndbapi/NdbConnection.cpp:
  Check tOp before assigning
2004-11-24 16:36:18 +01:00
unknown
8998e128b6 Merge mysql.com:/home/jonas/src/wl2077
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
2004-11-24 11:59:06 +01:00
unknown
3d52cdeff7 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077
2004-11-24 11:05:05 +01:00
unknown
1b9ea9b3c8 ndb - 4.1.8 is not online software upgradable with 4.1.7 (due to close scan optimizations)
ndb/src/common/util/version.c:
  4.1.8 is not online software upgradable with 4.1.7 (due to close scan optimizations)
2004-11-24 11:03:54 +01:00
unknown
e0ec1f1609 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2004-11-24 10:52:21 +01:00
unknown
e26a5dbc6a ndb - Add testcase to autotest
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  print on state on rare crash
ndb/test/run-test/daily-basic-tests.txt:
  more test cases
2004-11-24 09:39:05 +01:00
unknown
343b645ba2 ndb - debug printout
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  print state on rare crash
2004-11-24 09:36:49 +01:00
unknown
0b6f218e71 small bug fix for ndb restarter 2004-11-23 09:12:56 +00:00
unknown
f74af1b7cb ndb: fix blob performance in long transactions
ndb/include/ndbapi/NdbConnection.hpp:
  fix blob performance in long transactions
ndb/src/ndbapi/NdbConnection.cpp:
  fix blob performance in long transactions
ndb/test/ndbapi/testBlobs.cpp:
  fix blob performance in long transactions
2004-11-22 18:54:06 +01:00
unknown
1f63a25d97 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
  Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
2004-11-22 15:28:13 +01:00
unknown
223c5d04a0 wl2077 - bug fix for SCAN_TABREF
ndb/src/ndbapi/NdbScanOperation.cpp:
  1 more fix of premature scan closure
2004-11-22 15:27:28 +01:00
unknown
2b4d787727 Merge
ndb/src/ndbapi/NdbScanOperation.cpp:
  SCCS merged
2004-11-22 13:48:19 +00:00
unknown
cfca008544 added force send interface to scan
prepared for using query cache in ndb


ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  added force send interface to scan
ndb/include/ndbapi/NdbResultSet.hpp:
  added force send interface to scan
ndb/include/ndbapi/NdbScanOperation.hpp:
  added force send interface to scan
ndb/src/ndbapi/NdbResultSet.cpp:
  added force send interface to scan
ndb/src/ndbapi/NdbScanOperation.cpp:
  added force send interface to scan
2004-11-22 13:41:46 +00:00
unknown
5b2d1a65b2 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin


ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmclient/main.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged
ndb/tools/select_all.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged
2004-11-22 11:07:52 +00:00
unknown
404b152485 removed unused variables
assigned "localhost" as default connectstring
    added a disconnect() first in connect()
    removed double implementation of connect code, use connect() in NdbRestarter
    removed extra "host=" in connectstring


ndb/include/mgmapi/mgmapi.h:
  removed wrong comment
ndb/test/include/NdbRestarter.hpp:
  removed unused variables
ndb/test/src/NdbBackup.cpp:
  removed double implementation of connect code, use connect() in NdbRestarter
  removed extra "host=" in connectstring
ndb/test/src/NdbRestarter.cpp:
  removed unused variables
  assigned "localhost" as default connectstring
  added a disconnect() first in connect()
2004-11-22 10:47:59 +00:00
unknown
3e779698ab aligned connect string option on all cluster executables, --ndb-connectstring is now supported by all
enabled new section in my.cnf [mysql_cluster], which is read by all executables, where connect string can be put for all cluster executables
2004-11-22 08:06:39 +00:00
unknown
366ef4faeb Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl2077


client/Makefile.am:
  Auto merged
client/mysqladmin.cc:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
2004-11-22 08:20:34 +01:00
unknown
3d69849543 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-fix


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
  Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
2004-11-22 07:52:42 +01:00
unknown
5a022e7ba9 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077
2004-11-22 07:23:58 +01:00
unknown
9db732ebe6 wl2077 - ndb, fix testDict 2004-11-22 07:22:08 +01:00
unknown
48e8febccd Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-11-21 22:18:09 +01:00
unknown
9e26c327a0 wl2077 - ndb close scan - fix introduced bugs wrt premature close of scan
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Fix printout
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle already closed fragments
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Better handling of SCAN_TABREF
ndb/src/ndbapi/NdbScanOperation.cpp:
  Removed some special cases by setting up them instead
ndb/test/src/NDBT_Test.cpp:
  Fix createTable(false)
ndb/tools/select_all.cpp:
  Use full scan as default
2004-11-21 22:15:44 +01:00
unknown
2d0011fce8 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/orca/space/pekka/ndb/version/my41
2004-11-21 11:08:59 +01:00
unknown
d831ff2648 corrected some erroneous size calculations in tup
fixed erroneous error message - set auto increment was done even if create table failed so real error message got lost behind "table not found"
    and simplified code a bit


ndb/src/kernel/vm/Configuration.cpp:
  corrected some erroneous size calculations
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fixed erroneous error message - set auto increment was done even if create table failed so real error message got lost behind "table not found"
  and simplified code a bit
2004-11-19 16:58:02 +00:00
unknown
13f07cf2cd Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-19 16:54:41 +01:00
unknown
79d806693f ndb: do not crash on config mismatch if release compiled
ndb/src/kernel/blocks/ERROR_codes.txt:
  do not crash on config mismatch if release compiled
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  do not crash on config mismatch if release compiled
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  do not crash on config mismatch if release compiled
ndb/test/ndbapi/testDict.cpp:
  do not crash on config mismatch if release compiled
2004-11-19 16:49:17 +01:00
unknown
7785740f1d Merge tulin@bk-internal.mysql.com:/tmp/my4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
2004-11-19 14:25:59 +00:00
unknown
d375a4c35a Merge
ndb/src/kernel/vm/Configuration.cpp:
  SCCS merged
2004-11-19 14:18:24 +00:00
unknown
dd5322a16a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-19 13:55:55 +00:00
unknown
f85b20aa78 set sizes array sizes correctly in ndb blocks configuration 2004-11-19 13:52:21 +00:00
unknown
bbe0d7ddeb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
2004-11-19 13:25:31 +00:00
unknown
41a681b916 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2004-11-19 13:52:26 +01:00
unknown
eed2b972de wl2077: ndb, disable scanning of backup fragments
(temporary)
2004-11-19 13:52:01 +01:00
unknown
f598a8bf69 Merge joreland@bk-internal.mysql.com:/tmp/my4.1-ndb
into mysql.com:/home/jonas/src/wl2077
2004-11-19 13:35:14 +01:00
unknown
74301a38bc Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
  Auto merged
2004-11-19 13:31:50 +01:00
unknown
b699f969a5 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-19 13:26:47 +01:00
unknown
a16102a8cc Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-19 12:20:57 +01:00
unknown
83f39beea2 fixed error messages for some error codes 2004-11-19 11:19:27 +00:00
unknown
018cac9588 wl2077 - scan optimizations
(recommit in clean clone)


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  removed unused variable
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Always give all nodes in DIGETPRIMREQ
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Allow readcommited-scans to scan backup fragments
ndb/test/ndbapi/testReadPerf.cpp:
  better printous
2004-11-19 11:37:16 +01:00
unknown
c3211458ac wl2077 - ndb scan optimizations
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  remove unused variable
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Always supply all nodes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Enable scanning of backup fragments when read committed
ndb/test/ndbapi/testReadPerf.cpp:
  Better printout
2004-11-19 11:31:20 +01:00
unknown
f3374eec82 merge error 2004-11-18 22:44:34 +00:00
unknown
be7d46a962 Merge
client/Makefile.am:
  Auto merged
client/mysqladmin.cc:
  Auto merged
configure.in:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmclient/ndb_mgmclient.hpp:
  Auto merged
ndb/src/mgmclient/ndb_mgmclient.h:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  SCCS merged
2004-11-18 22:06:51 +00:00
unknown
d1f07a9632 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077


ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
2004-11-18 22:42:43 +01:00
unknown
13710e869f change file name to avoid conflict
corrected mistake in previous patch


ndb/tools/Makefile.am:
  change file name to avoid conflict
ndb/tools/restore/restore_main.cpp:
  corrected mistake in previous patch
2004-11-18 21:42:25 +00:00
unknown
f080e78f62 wl2077 - ndb scan optimizations
ndb/test/ndbapi/testScanPerf.cpp:
  Add reset_bounds option
  Impl. eq bound queries
2004-11-18 22:41:31 +01:00
unknown
ebe7fe1481 bug#6677 bug#6684 2004-11-18 21:15:18 +00:00
unknown
18f12ee494 adopted testprograms to changes in mgmapi 2004-11-18 20:35:19 +00:00
unknown
5bf0d35c4f Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-11-18 21:28:38 +01:00
unknown
75431a2e16 fix for mysqladmin link problem
.c -> .cc
    fix source dist problem for ndb
    fix type check problem for mysqladmin



client/Makefile.am:
  fix for mysqladmin link problem
   .c -> .cc
client/mysqladmin.cc:
  fix for mysqladmin link problem
   .c -> .cc
configure.in:
  fix for mysqladmin link problem
   .c -> .cc
ndb/include/Makefile.am:
  fix source dist problem for ndb
ndb/src/mgmclient/CommandInterpreter.cpp:
  fix type check problem
ndb/src/mgmclient/ndb_mgmclient.hpp:
  fix type check problem
ndb/src/mgmclient/ndb_mgmclient.h:
  fix type check problem
2004-11-18 20:28:36 +00:00