unknown ae3e853870 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 ... into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new storage/ndb/include/kernel/signaldata/TupFrag.hpp: Auto merged storage/ndb/include/util/NdbSqlUtil.hpp: Auto merged storage/ndb/src/common/util/NdbSqlUtil.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp: Auto merged mysql-test/r/ndb_bitfield.result: Merge, will generate new result file manually storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Merge		2006-04-20 12:10:09 +02:00
..
debugger	ndb-wl2325.patch	2005-09-15 11:33:50 +02:00
editline	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
kernel	Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0	2006-04-20 12:10:09 +02:00
logger	Merge mysql.com:/home/kostja/mysql/tmp_merge	2006-02-02 23:27:06 +03:00
mgmapi	Merge perch.ndb.mysql.com:/home/jonas/src/50-work	2006-04-06 13:18:13 +02:00
mgmcommon	Merge mysql.com:/home/kostja/mysql/tmp_merge	2006-02-02 23:27:06 +03:00
ndbapi	Fixed compiler and valgrind warnings	2006-03-29 14:27:36 +03:00
newtonapi	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
portlib	Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-08-25 13:11:38 -04:00
transporter	Remove compiler warnings	2006-03-29 17:04:00 +03:00
util	Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0	2006-04-20 12:10:09 +02:00
Makefile.am	Merge	2005-10-07 01:12:46 +02:00
ndb_constants.h	Import ndb varsize	2005-11-07 12:19:28 +01:00
ndb_global.h.in	configure.in:	2005-11-08 07:41:46 +01:00
ndb_init.h	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
ndb_net.h	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
ndb_types.h.in	Make storage engines "pluggable", handlerton work	2005-11-07 16:25:06 +01:00
ndb_version.h.in	WL #2747: Fix such that backup and restore works for user defined	2006-01-17 09:25:12 +01:00