unknown 77f2400af9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb ... into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb sql/ha_ndbcluster.cc: 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/ndbapi/NdbBlob.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/test/ndbapi/testIndex.cpp: Auto merged storage/ndb/src/kernel/blocks/ERROR_codes.txt: manual merge storage/ndb/src/ndbapi/ndberror.c: manual merge storage/ndb/test/run-test/daily-basic-tests.txt: manual merge		2007-08-30 10:46:32 +02:00
..
include
ndbapi	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb	2007-08-30 10:46:32 +02:00
ndbnet
newtonapi
odbc	Merge sin.intern.azundris.com:/home/tnurnberg/10776/50-10776	2007-08-01 05:07:58 +02:00
run-test	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb	2007-08-30 10:46:32 +02:00
sql
src	Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2	2007-08-01 09:24:01 +02:00
tools
Makefile.am