Commit graph

6 commits

Author SHA1 Message Date
unknown
7b5ef7cc0d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-11 08:10:46 +01:00
unknown
4f53f70f72 ndb - fix compiler warning (error using gcc-3.4.3)
ndb/test/ndbapi/bench/mainPopulate.cpp:
  compiler warning (error using gcc-3.4.3)
2005-02-11 08:09:47 +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
unknown
38e71e3ab8 ndb - old bench rescue
ndb/test/ndbapi/bench/mainPopulate.cpp:
  return correct
ndb/test/ndbapi/bench/userInterface.cpp:
  remove NA setting
ndb/test/run-test/daily-devel-tests.txt:
  set correct args
2005-02-11 06:39:00 +01:00
unknown
86b0dc16d9 ndb - adapt old testprg to changes in ndbapi
ndb/test/ndbapi/bench/userInterface.h:
  adapt to changes in ndbapi
2005-02-10 17:07:14 +01:00
unknown
cf5816096d ndb - Reenable old benchmark
ndb/test/ndbapi/Makefile.am:
  Reenable old benchmark
2005-02-10 11:40:32 +01:00