Commit graph

2182 commits

Author SHA1 Message Date
unknown
57ec978bad ndb - autotest
fix count of nodes needed in test


ndb/test/run-test/conf-daily-basic-dl145a.txt:
  Fix typo
ndb/test/run-test/conf-daily-basic-ndbmaster.txt:
  Fix typo
ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
  Fix typo
ndb/test/run-test/conf-daily-sql-ndbmaster.txt:
  Fix typo
ndb/test/run-test/ndb-autotest.sh:
  Fix count of needed computers for test
2005-05-06 19:20:32 +02:00
unknown
447b519072 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 18:59:37 +02:00
unknown
a2fe4d1bb2 ndb - autotest
fix to ndb-autotest.sh


ndb/test/run-test/ndb-autotest.sh:
  Add bin/ to get access to ndb_cpcc
2005-05-06 18:58:46 +02:00
unknown
793ab2b759 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 17:27:15 +02:00
unknown
e9df53909e ndb - autotest
Add shutdown options (so far only SIGKILL), so that there won't be any strace mysqld threads


ndb/src/cw/cpcd/APIService.cpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/src/cw/cpcd/CPCD.hpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/src/cw/cpcd/Process.cpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/test/include/CpcClient.hpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/test/run-test/main.cpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/test/src/CpcClient.cpp:
  Add shutdown options
   (so far only SIGKILL)
2005-05-06 17:26:22 +02:00
unknown
1c5364be91 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-06 16:44:07 +02:00
unknown
aa9391a0a9 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 16:42:49 +02:00
unknown
5cf0deb2b8 ndb - autotest
put config files in bk
  


ndb/test/run-test/make-config.sh:
  Corrent directory
ndb/test/run-test/ndb-autotest.sh:
  Check for 5.1 disrectory structure
  Add config files to distribution
  Remove unpacking for ndb-autotest.sh
2005-05-06 16:41:46 +02:00
unknown
f84717670d Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-06 16:16:25 +02:00
unknown
8ebcfd51fa Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 16:15:57 +02:00
unknown
2e73854c58 ndb - autotest
use newly created script for faster handling of several configurations


ndb/test/run-test/make-config.sh:
  put cluster config in same config as distribution config
ndb/test/run-test/ndb-autotest.sh:
  1) install mysql_db 
  2) use make-config script
2005-05-06 16:14:30 +02:00
unknown
60a0cbd818 ndb - autotest
update make-config script


ndb/test/run-test/make-config.sh:
  update make-config script
2005-05-06 15:37:51 +02:00
unknown
4576776010 Merge bk-internal.mysql.com:/users/rburnett/bug9721
into bk-internal.mysql.com:/users/rburnett/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
include/violite.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged
2005-05-06 15:15:48 +02:00
unknown
e651102dfc Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 14:46:19 +02:00
unknown
b955261130 ndb - add support for mysql servers in autotest 2005-05-06 14:44:43 +02:00
unknown
4f102422f4 ndb - add support for mysql servers in autotest
ndb/test/run-test/main.cpp:
  add support for mysql servers and clients to ndb test framework
ndb/test/run-test/run-test.hpp:
  add support for mysql servers and clients to ndb test framework
2005-05-06 12:46:52 +02:00
unknown
8b49ccace4 Bug#10193
Invalid DataDir in config causes ndbd segfault


ndb/src/kernel/error/ErrorReporter.cpp:
  print error and return error if unable to open the file for error reporting.
2005-05-06 10:43:29 +02:00
unknown
7f33809731 Manual merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
2005-05-05 13:47:09 +04:00
unknown
206bf5b619 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
2005-05-05 11:11:03 +02:00
unknown
d589225307 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
2005-05-05 11:09:50 +02:00
unknown
bdb85181e5 ndb - testNodeRestart -n LateCommit
increase no of rows so that the node failure will "guaranteed" produce an aborted transaction


ndb/test/ndbapi/testNodeRestart.cpp:
  increase no of rows so that the node failure will "guaranteed" produce an aborted transaction
2005-05-05 11:09:00 +02:00
unknown
31905fadd4 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2005-05-05 10:41:04 +02:00
unknown
0096b82d5e merge 2005-05-05 10:39:20 +02:00
unknown
7013cd9879 bug#10142 - ndb unique index
post review fixes


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  remove printout
  abort transaction instead of operation.
    concider m_exec_flag
2005-05-05 10:34:39 +02:00
unknown
3039a9957a Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-04 18:58:41 +02:00
unknown
ad7e80e7b1 merge
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
2005-05-04 18:48:33 +02:00
unknown
7ed9f61de9 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/item.cc:
  Auto merged
2005-05-04 18:43:40 +02:00
unknown
80abad58fc bug#10358 - ndb
Cluster failure with non started nodes can result in timedout transactions


ndb/src/mgmapi/mgmapi.cpp:
  Increase timeout for restarts
ndb/src/ndbapi/ClusterMgr.cpp:
  Report NFCOMPLETEREP if no alive node exists 
    (instead of no connected node exists)
ndb/src/ndbapi/ClusterMgr.hpp:
  Report NFCOMPLETEREP if no alive node exists 
    (instead of no connected node exists)
2005-05-04 18:40:54 +02:00
unknown
ec1a4d55f8 merge
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
2005-05-04 17:29:41 +02:00
unknown
de92664ddc Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-05-04 14:32:09 +02:00
unknown
55c9c4d7e0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-04 14:29:33 +02:00
unknown
78fb71b0a5 bug#10330 - linking with ndb fails
changes to handling of new/delete cxa_pure_virtual has changed in mysys
  remove "ndb"'s own impl. as they are no longer needed as we link mysys at all places


ndb/src/common/portlib/gcc.cpp:
  remove ndb __cxa_pure_virtual
ndb/src/common/util/new.cpp:
  remove "ndb" new/delete
2005-05-04 13:29:15 +02:00
unknown
8736d8ac06 logging_ok:
Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
  BUG#10287


mysql-test/r/ndb_restore.result:
  BUG#10287
mysql-test/t/ndb_restore.test:
  BUG#10287
ndb/test/src/NDBT_ResultRow.cpp:
  BUG#10287
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-04 10:16:03 +02:00
unknown
e46360bad6 bug#10142 - ndb unhandle resource shortage in unique index code
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  remove unneccessary TcSeizedIndexOperation object
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  remove unneccessary TcSeizedIndexOperation object
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) Set transid on starting TCINDXREQ
  2) New error code for out of index operation records
  3) Check accumulating index op for RNIL before dereferencing it
ndb/src/kernel/error/ErrorReporter.cpp:
  Include NDB version in ndb_X_error.log
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Let failed tcindxreq abort
ndb/src/ndbapi/ndberror.c:
  New error code for out of index operation records
2005-05-03 12:16:31 +02:00
unknown
27ba35b30e Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-05-02 15:16:40 +02:00
unknown
a5f4b569ab Merge
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
2005-04-28 10:28:56 +02:00
unknown
365bbd5576 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-28 06:57:59 +02:00
unknown
27a6a81464 Fix for avoiding gettin Invalid schema object version when doing local changes 2005-04-27 18:17:41 +02:00
unknown
21d5136def Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/ndbapi/ndberror.c:
  Auto merged
2005-04-27 07:56:37 +02:00
unknown
f56c95e598 ndb - wl#2455 fix
ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  fix fragId
2005-04-25 12:55:24 +02:00
unknown
efd0b84e31 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
2005-04-25 12:01:03 +02:00
unknown
6815149b96 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
2005-04-25 11:59:50 +02:00
unknown
2c066230be bug#9749 - ndb lock upgrade
post review fix.
  don't init hash value on restart operations
  make sure that lock mode is correct in entire que.


ndb/test/ndbapi/testOperations.cpp:
  Test case also for abort case.
    (abort if not lock owner still fails!)
2005-04-25 11:59:00 +02:00
unknown
5c33aad468 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-25 08:45:12 +02:00
unknown
d50f031ceb Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2005-04-25 08:44:05 +02:00
unknown
7f005d177b ndb - autotest
add more tests to verify correctness of backups


ndb/test/run-test/daily-basic-tests.txt:
  ndb - test
    add more tests to verify correctness of backups
2005-04-25 08:43:16 +02:00
unknown
e0e6d85597 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-25 08:39:36 +02:00
unknown
599d666794 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
2005-04-25 08:38:28 +02:00
unknown
b2245d58a2 bug#9924 - ndb backup
remove incorrect assertion
2005-04-25 08:35:18 +02:00
unknown
330795c33b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-04-24 20:39:42 +02:00