Commit graph

153 commits

Author SHA1 Message Date
unknown
c903266a1b Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-07 18:21:36 +02:00
unknown
101762128f ndb - autotest
fix configs and scripts


ndb/test/run-test/conf-daily-basic-dl145a.txt:
  fix ports
ndb/test/run-test/conf-daily-basic-ndbmaster.txt:
  fix ports
ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
  fix ports
ndb/test/run-test/conf-daily-sql-ndbmaster.txt:
  fix ports
ndb/test/run-test/ndb-autotest.sh:
  minor bugs
2005-05-07 18:20:29 +02:00
unknown
7d0041e84b Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-07 13:25:52 +02:00
unknown
1f75afedeb ndb - autotest
fixes


ndb/test/run-test/conf-daily-basic-dl145a.txt:
  dl145 uses /home for running
ndb/test/run-test/make-config.sh:
  output d.txt aswell
ndb/test/run-test/ndb-autotest.sh:
  more scripts updates
2005-05-07 13:23:38 +02:00
unknown
1b001d8c52 merge 2005-05-07 11:56:10 +02:00
unknown
27139d3ae1 ndb - autotest
upgrades to shell script


ndb/test/run-test/Makefile.am:
  add config files
ndb/test/run-test/ndb-autotest.sh:
  bump version
  use rsync to sync participating hosts
2005-05-07 11:53:06 +02:00
unknown
f8aca31803 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 19:22:02 +02:00
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
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
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
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
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
1f8b95514e merge
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/testBackup.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
2005-04-22 09:30:23 +02:00
unknown
d9faad9c1a bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
bug#9960 - ndb backup
      increase wait completed timeout to 48 hours


ndb/include/kernel/signaldata/BackupImpl.hpp:
  Add nodeid to reply to be able to fake reply during NF
ndb/include/kernel/signaldata/BackupSignalData.hpp:
  new error codes
ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  fix printout
ndb/src/kernel/blocks/backup/Backup.cpp:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/Backup.hpp:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/Backup.txt:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Init own version
ndb/src/mgmapi/mgmapi.cpp:
  bug#9960 - ndb backup
    increase wait completed timeout to 48 hours
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Handle node failures activly
    (mainly for backup...)
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Handle node failures activly
    (mainly for backup...)
ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
  Handle node failures activly
    (mainly for backup...)
ndb/src/ndbapi/ndberror.c:
  new error codes
ndb/test/ndbapi/testBackup.cpp:
  fix return codes
ndb/test/run-test/daily-basic-tests.txt:
  Add failure test cases to autotest
ndb/test/src/NdbBackup.cpp:
  fix error codes
  introduce checking of backup resources after each test
2005-04-22 09:07:25 +02:00
unknown
dcd8383b86 added test compare function for testing event
fixed one bug in event, pk comes first in events...
2005-03-07 18:47:47 +01:00
unknown
60e5117a79 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
2005-03-01 13:41:22 +01:00
unknown
df518e5546 merge
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
2005-03-01 13:39:22 +01:00
unknown
705fbb7633 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1


ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
2005-03-01 13:35:57 +01:00
unknown
eab1e62c2c bug#8853 - ndb - commit after nodefailure on not TC node
set exec_flag in execTC_COMMITREQ so that api will get rollbackrep


ndb/include/ndbapi/NdbConnection.hpp:
  Make getConnectedNode public
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Fix TC_COMMITREQ in abort cases
ndb/test/ndbapi/testNodeRestart.cpp:
  Testcase for bug#8853
ndb/test/run-test/daily-devel-tests.txt:
  Testcase for bug#8853
2005-03-01 13:32:11 +01:00
unknown
61964b70a9 ndb - move benchmark to basic suite
ndb/test/run-test/daily-basic-tests.txt:
  move bench to basic suite
ndb/test/run-test/daily-devel-tests.txt:
  move bench to basic suite
2005-02-22 13:58:25 +01:00
unknown
43a51297ca Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-22 12:18:39 +01:00
unknown
bad40874a0 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-22 12:17:27 +01:00
unknown
000cef80f5 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-22 12:15:56 +01:00
unknown
bf88db5c20 wl1292 - ndb autotest - fix html reporting bug
ndb/test/run-test/ndb-autotest.sh:
  use correct path when packing result tar ball
2005-02-22 12:15:27 +01:00
unknown
a277a9eca6 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-22 10:25:30 +01:00
unknown
8094ac95d5 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-22 10:23:24 +01:00
unknown
e84aaa8b0d Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1


BitKeeper/deleted/.del-example.conf:
  Delete: ndb/test/run-test/example.conf
BitKeeper/deleted/.del-ndb-autotest.sh:
  Delete: ndb/test/run-test/ndb-autotest.sh
2005-02-22 10:20:35 +01:00
unknown
029f10dd85 wl1292 - ndb autotest scripts
split into script/conf for easier deployment
2005-02-22 10:18:38 +01:00
unknown
becacafcd6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-16 11:51:09 +01:00
unknown
25b2c42026 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-16 11:48:18 +01:00
unknown
460003fc99 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/Makefile.am:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-16 11:17:14 +01:00
unknown
e2edf02421 Merge with 4.1
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
vio/viosocket.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  simple merge
sql/field.cc:
  simple merge
sql/item.h:
  simple merge
sql/sql_lex.h:
  simple merge
sql/sql_yacc.yy:
  Merge
  (join_table_list was not comptely merged. Need to run test to know how things works...)
sql/table.cc:
  Keep code from 5.0, except delted one not needed line
strings/ctype-ucs2.c:
  Auto merge
2005-02-15 17:12:13 +02:00
unknown
e537c5e147 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb


BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/Makefile.am:
  Auto merged
2005-02-15 11:38:00 +01:00
unknown
1a7d87e33d Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-14 08:30:52 +01:00
unknown
3794371069 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-14 08:29:43 +01:00
unknown
9f2240b479 wl1292 - ndb autotest
fix log reports


ndb/test/run-test/make-html-reports.sh:
  fix log reports
2005-02-14 08:28:47 +01:00
unknown
f315e00e56 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-12 15:20:55 +01:00
unknown
66d5e4e888 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-12 15:06:39 +01:00
unknown
3ca04269c9 wl1292 - ndb autotest
link to log if it exists, regardless of test result


ndb/test/run-test/make-html-reports.sh:
  link to log if it exists, regardless of test result
2005-02-12 15:05:33 +01:00
unknown
dd5767356b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-11 06:46:05 +01:00
unknown
0a0b9309eb Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
2005-02-11 06:42:57 +01:00