unknown 61430c77a4 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 ... into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51 BUILD/check-cpu: Auto merged configure.in: Auto merged include/my_global.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/type_enum.result: Auto merged mysql-test/r/udf.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/mysqladmin.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/type_enum.test: Auto merged mysql-test/t/view.test: Auto merged mysys/my_read.c: Auto merged scripts/make_binary_distribution.sh: Auto merged server-tools/instance-manager/Makefile.am: Auto merged sql/event_queue.cc: Auto merged sql/field.h: Auto merged sql/item_sum.h: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/table.cc: Auto merged storage/federated/ha_federated.cc: Auto merged server-tools/instance-manager/instance.cc: Use remote (global 5.1 version) sql/unireg.cc: Use remote (5.1 global version) mysql-test/t/trigger.test: Manual merge server-tools/instance-manager/guardian.cc: Manual merge		2007-01-18 08:30:35 -07:00
..
collapsed	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721	2007-01-17 13:25:05 -05:00
config	Speed up "bk citool" for msvensson:	2006-09-08 11:25:08 +02:00
gone	bdb_notembedded.test gone	2006-12-28 10:03:25 +04:00
logging_ok	Merge flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.0	2005-06-23 10:58:37 +02:00
notify	notify BitKeeper file /home/bk/mysql/BitKeeper/etc/notify	2000-08-02 01:45:37 +02:00
RESYNC_TREE	Merge mysql.com:/home/alexi/dev/mysql-4.1-0	2005-09-06 23:49:54 +04:00
skipkeys	BK automatic LOD removal.	2002-11-07 11:20:17 +04:00