ndb/src/mgmsrv/main.cpp · 04844921b9bb50c48964c8066b2282c18f97931d · nexedi / MariaDB

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 1c24e579

unknown authored Sep 16, 2004

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

1c24e579

main.cpp 9.07 KB

Replace main.cpp