storage/ndb/test/ndbapi/testTimeout.cpp · a9ba149a4ffbcdd925ccf83de8910e103fb828b2 · nexedi / MariaDB

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · a9ba149a

unknown authored Jun 14, 2005

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


BitKeeper/etc/logging_ok:
  auto-union
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
  Auto merged

a9ba149a

testTimeout.cpp 11.6 KB

Replace testTimeout.cpp