unknown 14a3a61ad9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user ... into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged mysql-test/r/ndb_single_user.result: manual merge mysql-test/t/disabled.def: manual merge storage/ndb/include/kernel/signaldata/DictTabInfo.hpp: manual merge storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: manual merge		2007-03-23 17:17:44 +01:00
..
bin	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
config	Merge mysql.com:/home/kent/bk/main/mysql-5.0	2006-12-31 01:32:21 +01:00
demos	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
docs	Merge mysql.com:/home/kent/bk/main/mysql-5.0	2006-12-31 01:32:21 +01:00
include	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user	2007-03-23 17:17:44 +01:00
lib	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
ndbapi-examples	A few minor cleanups for recent AbortOption behaviour change.	2007-02-20 09:52:18 +01:00
src	BUG#27254: Single User Mode.Mysql hangs if it tries delete a ndb table	2007-03-23 17:12:06 +01:00
test	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user	2007-03-23 14:17:08 +01:00
tools	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb	2007-03-21 16:34:23 +01:00
Makefile.am	Merge mysql.com:/home/kent/bk/main/mysql-5.0	2006-12-31 01:32:21 +01:00
plug.in	Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed.	2006-08-18 21:19:19 -07:00