unknown 4f1cbb6031 4.1 -> 5.0 merge ... BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Auto merged client/mysqladmin.cc: Auto merged client/mysqldump.c: Auto merged configure.in: Auto merged extra/perror.c: Auto merged innobase/buf/buf0rea.c: Auto merged innobase/fil/fil0fil.c: Auto merged innobase/include/rem0rec.ic: Auto merged innobase/include/univ.i: Auto merged innobase/os/os0file.c: Auto merged innobase/ut/ut0ut.c: Auto merged mysql-test/r/derived.result: Auto merged mysql-test/r/func_str.result: Simple merge mysql-test/r/subselect.result: Automatic merge mysql-test/t/derived.test: Automatic merge mysql-test/t/func_str.test: Simple merge mysql-test/t/subselect.test: Automatic merge mysys/my_handler.c: Automatic merge ndb/src/kernel/blocks/backup/Backup.cpp: Automatic merge scripts/make_binary_distribution.sh: Automatic merge scripts/mysql_install_db.sh: Automatic merge sql/examples/ha_archive.cc: Simple merge sql/ha_innodb.cc: Automatic merge sql/item.cc: Merge sql/item_cmpfunc.h: Automatic merge sql/item_func.cc: Simple merge sql/item_func.h: Automatic merge sql/item_strfunc.cc: Automatic merge sql/item_strfunc.h: Automatic merge sql/item_subselect.cc: Automatic merge sql/mysqld.cc: Automatic merge sql/set_var.cc: Automatic merge sql/sql_base.cc: Automatic merge sql/sql_class.cc: Automatic merge sql/sql_class.h: Automatic merge sql/sql_lex.cc: Automatic merge sql/sql_lex.h: Automatic merge sql/sql_parse.cc: Automatic merge sql/sql_select.cc: Automatic merge sql/sql_table.cc: Automatic merge sql/sql_update.cc: Simple merge strings/ctype-big5.c: Automatic merge strings/ctype-bin.c: Automatic merge strings/ctype-gbk.c: Automatic merge strings/ctype-latin1.c: Automatic merge strings/ctype-mb.c: Automatic merge strings/ctype-simple.c: Automatic merge strings/ctype-sjis.c: Automatic merge strings/ctype-tis620.c: Automatic merge strings/ctype-ucs2.c: Automatic merge strings/ctype-utf8.c: Automatic merge vio/viosocket.c: Automatic merge vio/viossl.c: Automatic merge		2005-02-03 13:18:30 +02:00
..
bin	.del-mysqlclusterd~7ebaf8faea0a1100:	2004-06-16 16:59:33 +00:00
config	added ndb_init.h to distribution	2004-12-21 10:37:12 +01:00
demos	Removed unnecessary README files	2004-04-14 15:42:56 +02:00
docs	small Makefile.am cleanup	2005-01-28 17:14:03 +01:00
examples	Bug#7626	2005-01-13 23:26:59 +01:00
home	removed a bunch of "dead" files from the ndb src tree	2004-11-05 23:59:06 +00:00
include	ndb_opt_defaults.h:	2005-01-28 19:28:14 +01:00
lib	Initial revision of NDB Cluster files	2004-04-14 10:53:21 +02:00
src	4.1 -> 5.0 merge	2005-02-03 13:18:30 +02:00
test	Merge	2005-01-27 18:41:23 +01:00
tools	Merge	2005-01-28 00:47:41 +01:00
Makefile.am	wl1744 - more script fixes	2004-11-12 09:18:26 +01:00