mariadb/storage/ndb/include/mgmapi
unknown 02818a0020 Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
BitKeeper/deleted/.del-OSE_Receiver.cpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
2006-12-01 11:35:05 +08:00
..
mgmapi.h Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2006-12-01 11:35:05 +08:00
mgmapi_config_parameters.h remove OSE 2006-11-03 02:18:45 +11: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 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 2006-10-05 23:13:29 +10: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 ndb - 2006-10-20 14:36:39 +02:00