unknown 596bf8ec02 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 ... into willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987 Merge 5.0-ndb into 5.1-ndb storage/ndb/include/mgmapi/mgmapi.h: Auto merged storage/ndb/src/kernel/vm/Configuration.cpp: Auto merged storage/ndb/include/mgmapi/mgmapi_debug.h: Auto merged storage/ndb/include/util/Parser.hpp: Auto merged storage/ndb/include/util/socket_io.h: Auto merged storage/ndb/src/common/util/InputStream.cpp: Auto merged storage/ndb/src/common/util/Parser.cpp: Auto merged storage/ndb/src/common/util/socket_io.cpp: Auto merged storage/ndb/src/cw/cpcd/main.cpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmclient/main.cpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/mgmsrv/Services.hpp: Auto merged storage/ndb/src/mgmsrv/main.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/test/ndbapi/testMgm.cpp: Auto merged storage/ndb/tools/delete_all.cpp: Auto merged storage/ndb/tools/drop_index.cpp: Auto merged storage/ndb/tools/drop_tab.cpp: Auto merged storage/ndb/tools/listTables.cpp: Auto merged storage/ndb/tools/select_count.cpp: Auto merged storage/ndb/tools/waiter.cpp: Auto merged mysql-test/r/ndb_config.result: manual merge mysql-test/t/ndb_config.test: manual merge storage/ndb/include/util/InputStream.hpp: manual merge storage/ndb/tools/desc.cpp: manual merge storage/ndb/tools/ndb_condig.cpp: manual merge storage/ndb/tools/restore/restore_main.cpp: manual merge storage/ndb/tools/select_all.cpp: manual merge		2006-10-05 23:13:29 +10:00
..
BaseString.hpp	Import ndb varsize	2005-11-07 12:19:28 +01:00
basestring_vsnprintf.h	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
Bitmask.hpp	Merge perch.ndb.mysql.com:/home/jonas/src/50-work	2006-01-13 09:22:02 +01:00
ConfigValues.hpp	Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge	2006-06-20 17:33:14 +10:00
File.hpp	Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345	2006-09-01 10:36:32 +08:00
InputStream.hpp	Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154	2006-10-05 23:13:29 +10:00
md5_hash.hpp	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
ndb_opts.h	BUG@21585 The --help option shows a screen of command options for the ndbd, ndb_mgmd, ndb_mgm	2006-09-22 20:22:50 +08:00
NdbAutoPtr.hpp	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
NdbOut.hpp	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
NdbSqlUtil.hpp	Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0	2006-05-09 20:50:29 +03:00
OutputStream.hpp	ndb -	2006-03-24 10:19:10 +01:00
Parser.hpp	Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154	2006-10-05 23:13:29 +10:00
Properties.hpp	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
random.h	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
SimpleProperties.hpp	Remove compiler warnings	2006-03-29 17:04:00 +03:00
socket_io.h	Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154	2006-10-05 23:13:29 +10:00
SocketAuthenticator.hpp	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
SocketClient.hpp	Merge perch.ndb.mysql.com:/home/jonas/src/50-work	2006-09-15 11:43:49 +02:00
SocketServer.hpp	Merge perch.ndb.mysql.com:/home/jonas/src/50-work	2006-05-19 10:36:19 +02:00
UtilBuffer.hpp	Import ndb varsize	2005-11-07 12:19:28 +01:00
uucode.h	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
Vector.hpp	wl2723 - ndb opt. nr	2006-01-11 11:35:25 +01:00
version.h	Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0	2005-07-15 15:08:38 +02:00