1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge joreland@bk-internal.mysql.com:irix

into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/test/ndbapi/testBasic.cpp:
  Auto merged
ndb/test/run-test/main.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
This commit is contained in:
unknown
2004-08-05 22:19:52 +02:00
93 changed files with 661 additions and 551 deletions

View File

@ -984,3 +984,5 @@ setup_hosts(atrt_config& config){
}
return true;
}
template class Vector<const ParserRow<SimpleCpcClient::ParserDummy>*>;