mariadb/storage/ndb/include/mgmapi
unknown 0b44f4b171 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
2006-07-05 20:23:23 +02:00
..
mgmapi.h Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue 2006-06-16 20:52:21 +10:00
mgmapi_config_parameters.h Merge perch.ndb.mysql.com:/home/jonas/src/50-work 2006-04-26 16:07:02 +02:00
mgmapi_config_parameters_debug.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
mgmapi_debug.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndb_logevent.h Merge perch.ndb.mysql.com:/home/jonas/src/50-work 2006-04-06 13:18:13 +02:00
ndb_logevent.txt merge 2005-09-15 13:07:22 +02:00
ndbd_exit_codes.h Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 2006-07-05 20:23:23 +02:00