unknown bb00abb03a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 ... into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 configure.in: Auto merged libmysqld/Makefile.am: Auto merged scripts/Makefile.am: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.h: Auto merged storage/ndb/include/transporter/TransporterRegistry.hpp: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Buffer.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/SendBuffer.cpp: Auto merged storage/ndb/src/common/transporter/SendBuffer.hpp: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/Transporter.hpp: Auto merged storage/ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationExec.cpp: Auto merged storage/ndb/test/ndbapi/testNdbApi.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged storage/ndb/test/run-test/ndb-autotest.sh: Auto merged storage/ndb/test/tools/hugoLoad.cpp: Auto merged storage/ndb/test/tools/hugoPkUpdate.cpp: Auto merged storage/ndb/test/tools/hugoScanRead.cpp: Auto merged storage/ndb/test/tools/hugoScanUpdate.cpp: Auto merged storage/ndb/tools/Makefile.am: Auto merged storage/ndb/tools/restore/Restore.cpp: Auto merged support-files/mysql.spec.sh: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged		2005-06-07 12:50:45 +02:00
..
TransporterCallback.hpp	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
TransporterDefinitions.hpp	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-05-20 06:25:02 +02:00
TransporterRegistry.hpp	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-06-07 12:50:45 +02:00