Commit graph

2113 commits

Author SHA1 Message Date
unknown
db2616673f ndb - wl-2451 update schemafile format change to 5.0.6
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  version update
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  version update
ndb/src/kernel/blocks/dbdict/SchemaFile.hpp:
  version update
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  version update
2005-05-15 18:10:30 +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
aa80c3a4be 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
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-05-09 21:13:27 +02:00
unknown
6748f7f42f merge
include/my_global.h:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
2005-05-09 20:28:55 +02:00
unknown
608ec25174 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
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
2005-05-09 15:15:25 +02:00
unknown
818e3ef30a bug#10471 - ndb - potential inconsistent backup
whith some multi update scenarios

  Make sure to init GCI on correct operation before firering operation


ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Init gci, to make sure that fire_trig_ord gets correct GCI
2005-05-09 14:59:49 +02:00
unknown
90024205a8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
2005-05-09 11:04:34 +02:00
unknown
645a71319d bug#10142 - ndb unique index resource shortage
honor abort_option as TC now abort on 288


ndb/src/ndbapi/NdbIndexOperation.cpp:
  honor settings as TC now abort on 288
2005-05-09 11:03:07 +02:00
unknown
b40842f262 Merge
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
  Auto merged
configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
sql/share/Makefile.am:
  Auto merged
2005-05-08 22:52:55 +02:00
unknown
8b31c677a2 Fixes to compile with icc 2005-05-08 22:16:24 +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
c6ac6aa559 Merge
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged
2005-05-07 22:49:04 +02:00
unknown
7aa73081df bug#9813: Post review fixes 2005-05-07 22:04:52 +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
f70de2faa7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:28:18 +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
1d828bb815 ndb autotest - add show version to cpcd
ndb/src/cw/cpcd/APIService.cpp:
  Add show version to cpcd (prints date)
ndb/src/cw/cpcd/APIService.hpp:
  Add show version to cpcd (prints date)
2005-05-07 16:06:41 +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
aa0c40a33b ndb - bug#8928
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  same number of lh3distrbits for all frags
2005-05-07 10:56:03 +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
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