unknown 24250e33be resolved merge conflict ... BitKeeper/etc/logging_ok: auto-union sql/sql_yacc.yy: Auto merged ndb/include/ndbapi/NdbDictionary.hpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged		2005-02-04 14:27:09 +01:00
..
debugger	change to using public enum for log events	2005-01-11 23:25:45 +01:00
editline	Initial revision of NDB Cluster files	2004-04-14 10:53:21 +02:00
kernel	Merge	2005-01-27 18:41:23 +01:00
logger	fixed so that last repeats are printed first with correct time if another message comes	2004-12-22 22:47:56 +01:00
mgmapi	Merge	2005-01-28 00:47:41 +01:00
mgmcommon	Merge 5.0-ndb into local, resolve conflicts	2004-12-20 11:32:08 +11:00
ndbapi	resolved merge conflict	2005-02-04 14:27:09 +01:00
newtonapi	portability/autoconf fixes and removed warnings	2004-05-12 06:24:12 +02:00
portlib	cleanup and streamlining of thread create/exit in ndb	2005-02-01 19:01:37 +01:00
transporter	Merge	2005-01-28 00:47:41 +01:00
util	Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-01-28 10:52:54 +01:00
Makefile.am	Merge	2005-01-28 00:47:41 +01:00
ndb_constants.h	ndb - post-merge fix	2005-01-27 21:23:21 +01:00
ndb_global.h.in	Merge mysql.com:/home/jonas/src/mysql-4.1	2005-01-19 10:07:14 +01:00
ndb_init.h	added ndb_init.h to distribution	2004-12-21 10:37:12 +01:00
ndb_net.h	lots of HAVE_ and some ndb_global fixes for ndb subtree	2004-05-11 14:39:17 +02:00
ndb_types.h.in	changes ndb types include	2005-01-04 13:12:22 +01:00
ndb_version.h.in	wl1744 - ndb windows port	2004-11-10 21:43:12 +01:00