mariadb/ndb
unknown 9a8f8497f0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0


mysys/my_thr_init.c:
  Auto merged
ndb/include/util/OutputStream.hpp:
  Auto merged
ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-02-22 20:32:19 +02:00
..
bin
config my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
demos
docs my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
home
include Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-02-22 20:32:19 +02:00
lib
ndbapi-examples Many files: 2006-12-23 20:17:15 +01:00
src Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-02-22 20:32:19 +02:00
test Merge perch.ndb.mysql.com:/home/jonas/src/50-work 2007-02-20 01:05:11 +01:00
tools Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
Makefile.am my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00