unknown 49e1bba346 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 ... into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1 extra/perror.c: Auto merged include/my_global.h: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged BitKeeper/deleted/.del-var~62c955ccf2da1a21: Auto merged mysql-test/t/disabled.def: Auto merged sql/field.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.hpp: Auto merged storage/ndb/src/mgmsrv/main.cpp: Auto merged		2005-07-20 07:53:10 +02:00
..
bin	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
config	All changes for change to all storage engines being under storage directory.	2005-04-26 19:04:36 -07:00
demos	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
docs	All changes for change to all storage engines being under storage directory.	2005-04-26 19:04:36 -07:00
home	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
include	Patch for push of wl1354 Partitioning	2005-07-18 13:31:02 +02:00
lib	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
ndbapi-examples	fixed makefiles in examples to adopt to change in file structure	2005-07-19 01:22:49 +02:00
src	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-07-20 07:53:10 +02:00
test	Patch for push of wl1354 Partitioning	2005-07-18 13:31:02 +02:00
tools	Patch for push of wl1354 Partitioning	2005-07-18 13:31:02 +02:00
Makefile.am	All changes for change to all storage engines being under storage directory.	2005-04-26 19:04:36 -07:00