unknown 95a3509a66 Merge mysql.com:/opt/local/work/mysql-4.1-root ... into mysql.com:/opt/local/work/mysql-5.0-root BitKeeper/deleted/.del-rpl_ignore_table.result: Delete: mysql-test/r/rpl_ignore_table.result BitKeeper/deleted/.del-rpl_multi_update4.result: Delete: mysql-test/r/rpl_multi_update4.result BitKeeper/deleted/.del-rpl_ignore_table-slave.opt: Delete: mysql-test/t/rpl_ignore_table-slave.opt BitKeeper/deleted/.del-rpl_ignore_table.test: Delete: mysql-test/t/rpl_ignore_table.test BitKeeper/deleted/.del-rpl_multi_update4-slave.opt: Delete: mysql-test/t/rpl_multi_update4-slave.opt BitKeeper/deleted/.del-disabled.def: Auto merged BitKeeper/deleted/.del-rpl_multi_update4.test: Delete: mysql-test/t/rpl_multi_update4.test heap/hp_create.c: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/update.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/heap.test: Auto merged mysql-test/t/kill.test: Auto merged mysql-test/t/update.test: Auto merged ndb/include/mgmapi/mgmapi_config_parameters.h: Auto merged ndb/test/ndbapi/testBlobs.cpp: Auto merged sql/sql_base.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged configure.in: Manual merge. libmysql/libmysql.c: Manual merge. mysql-test/r/heap.result: Manual merge. mysql-test/r/heap_hash.result: Manual merge. mysql-test/r/kill.result: Manual merge. sql/ha_heap.cc: Manual merge. sql/ha_heap.h: Manual merge. sql/item_timefunc.cc: Manual merge. sql/sql_class.cc: Manual merge. sql/sql_parse.cc: Manual merge. sql/sql_update.cc: Manual merge. tests/mysql_client_test.c: Manual merge.		2006-02-02 18:17:18 +03:00
..
.cvsignore
base64.h	WL#2835: Base64 mysys functions	2005-10-14 01:14:23 +02:00
config-netware.h	Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1	2006-01-12 20:28:23 +02:00
config-os2.h
config-win.h	simple Windows compile fixes.	2006-01-11 16:18:11 -06:00
decimal.h
errmsg.h
ft_global.h
hash.h	A fix for Bug#7209 "Client error with "Access Denied" on updates	2006-01-04 17:35:30 +03:00
heap.h	Bug #12796: Record lost in HEAP table	2005-11-08 00:26:37 -05:00
help_end.h	Several fixes for Netware.	2005-08-24 22:03:34 +03:00
help_start.h	Several fixes for Netware.	2005-08-24 22:03:34 +03:00
keycache.h	Bug#12920 - key_read_requests counter appears to re-set	2005-09-14 13:18:16 +02:00
m_ctype.h	type_binary.result, type_binary.test:	2005-10-13 19:16:19 +05:00
m_string.h	Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp	2005-10-13 18:23:53 +03:00
Makefile.am	Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause	2006-01-11 02:07:40 +03:00
md5.h
my_aes.h
my_alarm.h
my_alloc.h	Fix incorrect spellings of "dropped" in source and tests. (Bug #12828)	2005-08-30 12:24:37 -07:00
my_base.h	many warnings (practically safe but annoying) corrected	2006-01-03 17:54:54 +01:00
my_bitmap.h	Bug#10932 - Building server with key limit of 128, makes test cases fail	2005-07-19 14:13:56 +02:00
my_dbug.h
my_dir.h
my_getopt.h
my_global.h	EADDRINUSE is not defined on Windows.	2006-01-04 16:38:54 +01:00
my_handler.h	Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1	2005-10-27 23:43:20 +03:00
my_list.h	Rename rest() macro in my_list.h to list_rest(). (Bug #12327)	2005-08-09 18:02:36 -07:00
my_net.h
my_no_pthread.h
my_nosys.h
my_pthread.h	my_pthread.h:	2005-12-13 00:45:32 +01:00
my_semaphore.h
my_sys.h	Fixes bug #13377. my_open() & my_create() functions changed to use	2005-11-14 16:01:10 +03:00
my_time.h	Fixes during review of new pushed code	2005-07-31 12:49:55 +03:00
my_tree.h
my_user.h	Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause	2006-01-11 02:07:40 +03:00
my_xml.h
myisam.h	Bug#10932 - Building server with key limit of 128, makes test cases fail	2005-12-02 16:27:18 +01:00
myisammrg.h
myisampack.h
mysql.h	compatibility define for Bug#15293	2005-12-05 20:47:15 +01:00
mysql_com.h	Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause	2006-01-11 02:07:40 +03:00
mysql_embed.h
mysql_time.h
mysql_version.h.in
mysys_err.h
queues.h
raid.h
rijndael.h
sha1.h	A fix for Bug#13944 "libmysqlclient exporting sha1_result function":	2006-01-11 17:31:52 +03:00
sql_common.h
sslopt-case.h
sslopt-longopts.h
sslopt-vars.h
t_ctype.h
thr_alarm.h
thr_lock.h	Merge mysql.com:/home/my/mysql-4.1	2005-07-28 17:09:54 +03:00
typelib.h
violite.h	Merge mysql.com:/home/jimw/my/mysql-4.1-clean	2005-09-12 17:00:50 -07:00