Commit graph

549 commits

Author SHA1 Message Date
unknown
fec1c6ac67 Merge
BitKeeper/etc/logging_ok:
  auto-union
myisam/mi_check.c:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/sql_mode.result:
  SCCS merged
mysql-test/t/sql_mode.test:
  SCCS merged
sql/sql_acl.cc:
  SCCS merged
sql/sql_handler.cc:
  SCCS merged
sql/sql_table.cc:
  SCCS merged
2005-06-09 17:15:06 +01:00
unknown
af0287be3c ndb - autotest
small script fixes
  - Don't use hostname -s as it's linux specific
  - Don't remove result unless scp worked


ndb/test/run-test/ndb-autotest.sh:
  Don't use hostname -s as it's linux specific
  Don't remove result unless scp worked
2005-06-09 08:07:48 +02:00
unknown
dbfce2a555 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
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/tools/restore/Restore.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
2005-06-08 16:55:06 +02:00
unknown
62321bd298 bug#11133 - ndb
incorrect handling of writeTuple with multi op transaction


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  1) Pass operation instead of insertIsDone to LQH
  2) transform operation correctly when in parallell que
     (multi op within same trans)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Let ACC decide what operation was performed when WRITE
ndb/test/ndbapi/testNdbApi.cpp:
  Add testcase for bug 11133
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase for bug 11133
2005-06-07 15:10:57 +02:00
unknown
b11d2b6b73 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2005-06-01 07:59:48 +02:00
unknown
76e92a1bdb bug#10953 - ndb - scan read wo/ getvalue cause NF (during NR)
ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  Don't send 0 length transid_ai
ndb/test/run-test/ndb-autotest.sh:
  fix vars
2005-05-30 11:55:47 +02:00
unknown
d646c27036 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-05-26 22:49:49 +02:00
unknown
78d484871a ndb - add test case for bug ReadWithoutGetValue
ndb/test/run-test/daily-basic-tests.txt:
  add test case for bug fix
2005-05-26 22:48:28 +02:00
unknown
a81aa47d42 merge 2005-05-26 22:42:13 +02:00
unknown
cf4cbe079e merge
ndb/src/common/transporter/SCI_Transporter.cpp:
  Auto merged
ndb/src/common/transporter/SCI_Transporter.hpp:
  Auto merged
ndb/src/common/transporter/SHM_Transporter.cpp:
  Auto merged
ndb/src/common/transporter/SHM_Transporter.hpp:
  Auto merged
ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
2005-05-26 22:10:43 +02:00
unknown
0ea67b0dd4 bug#10669 - ndb read wo/ get value
add dummy getvalue


ndb/src/ndbapi/NdbOperationExec.cpp:
  Add dummy get value of NDB$FRAGMENT if
    dirty read wo/ get values
ndb/test/ndbapi/testNdbApi.cpp:
  Test scans as well
2005-05-26 22:04:50 +02:00
unknown
65a6513a1f ndb - Testcase for bug#10669
--database option to hugo tools


ndb/test/ndbapi/testNdbApi.cpp:
  Testcase for bug#10669
ndb/test/tools/hugoLoad.cpp:
  Add --database=<name> to hugo tools
ndb/test/tools/hugoPkUpdate.cpp:
  Add --database=<name> to hugo tools
ndb/test/tools/hugoScanRead.cpp:
  Add --database=<name> to hugo tools
ndb/test/tools/hugoScanUpdate.cpp:
  Add --database=<name> to hugo tools
2005-05-26 07:21:05 +02:00
unknown
cdb2730790 ndb autotest - merge jonathans script changes
ndb/test/run-test/ndb-autotest.sh:
  ndb autotest
    1) merge jonathan changes
    2) add --no-report (if dont't want to produce/scp a report)
    3) add --no-config (if don't want to create a configuration, i.e there is already one present)
    4) add --no-test (for not actually starting test)
    5) add checking of conf file
2005-05-25 11:53:58 +02:00
unknown
e14d6f80f2 ndb autotest
adopt to changes in auto*tools


ndb/test/run-test/ndb-autotest.sh:
  adopt to changes in auto*tools
2005-05-25 09:22:07 +02:00
unknown
194745cd63 ndb - testScan -n ScanRead488O fix
ndb/test/ndbapi/testScan.cpp:
  remove added test feature
2005-05-15 17:56:39 +02:00
unknown
130f14dbed Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-08 20:25:11 +02:00
unknown
1e2ec70f68 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-08 20:23:56 +02:00
unknown
0bc5583993 ndb - autotest
fix name of result tar ball


ndb/test/run-test/ndb-autotest.sh:
  append run to result tar ball
2005-05-08 20:23:05 +02:00
unknown
d8ba9295ea Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:39:10 +02:00
unknown
203b8d6aa2 merge 2005-05-07 18:37:59 +02:00
unknown
92a76bec62 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:22:51 +02:00
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
c294f2a08a Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 13:27:06 +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
e0e12a679b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 12:00:13 +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
daf98f12d2 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/test/run-test/main.cpp:
  Auto merged
2005-05-06 19:23:11 +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
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
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
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
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