unknown 6fe40f76e2 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 ... into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new mysql-test/r/view.result: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_parse.cc: Auto merged storage/ndb/include/mgmapi/mgmapi.h: Auto merged storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged storage/ndb/src/kernel/vm/Configuration.cpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged storage/ndb/src/mgmsrv/Services.hpp: Auto merged configure.in: manual merge sql/ha_ndbcluster.cc: manual merge sql/share/errmsg.txt: manual merge storage/ndb/src/mgmsrv/Services.cpp: manual merge		2006-04-26 17:01:00 +02:00
..
archive	Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03	2006-04-08 04:29:17 +02:00
bdb	Some changes to make it possible to build for Windows with CMake from	2006-03-24 22:50:56 +01:00
csv	Remove the my_seek calls as we have just opened the file for append with O_APPEND and the file pointer should be at end of the file already.	2006-04-11 12:38:21 +02:00
example	Fix compilation failure when compiling with BUILD/compile-pentium-debug-max	2006-04-19 10:39:57 +03:00
heap	Some changes to make it possible to build for Windows with CMake from	2006-03-24 22:50:56 +01:00
innobase	Applied innodb-5.1-ss492 snapshot.	2006-04-26 08:30:37 +04:00
myisam	Merge mysql.com:/home/elkin/MySQL/BARE/5.0	2006-04-25 20:05:15 +03:00
myisammrg	Some changes to make it possible to build for Windows with CMake from	2006-03-24 22:50:56 +01:00
ndb	Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0	2006-04-26 17:01:00 +02:00
Makefile.am	fixes for 'make dist' and 'make distcheck'	2006-04-12 14:08:24 +02:00