unknown 2dbeedd504 Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0 ... into mysql.com:/usr/home/pem/mysql-5.1-new BitKeeper/triggers/post-commit: Merge. configure.in: Manual merge. mysql-test/r/sp.result: Merge. mysql-test/r/view.result: Merge. sql/share/errmsg.txt: Manual merge. sql/sp_head.cc: Merge. sql/sql_parse.cc: Merge. sql/sql_table.cc: Merge. sql/sql_yacc.yy: Merge.		2005-12-07 15:17:18 +01:00
..
.cvsignore
base64.h	WL#2835: Base64 mysys functions	2005-10-14 01:14:23 +02:00
config-netware.h	4.1->5.0 merge	2005-10-29 02:36:57 +04:00
config-os2.h
config-win.h	Merge mysqldev@production:my/mysql-4.1.16-fixes	2005-11-28 16:29:07 +01:00
decimal.h
errmsg.h
ft_global.h	WL#2575 - Fulltext: Parser plugin for FTS	2005-11-06 13:13:06 +01:00
hash.h
heap.h	WL #528: Faster free_tmp_table	2005-11-06 08:29:03 +01:00
help_end.h
help_start.h
keycache.h
m_ctype.h	Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree)	2005-11-05 13:20:35 +02: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	Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0	2005-11-23 14:57:00 +02:00
md5.h
my_aes.h
my_alarm.h
my_alloc.h
my_base.h	Many files:	2005-12-01 13:34:48 +01:00
my_bitmap.h	Added bitmap_buffer_size()	2005-11-24 06:15:35 +02:00
my_dbug.h
my_dir.h
my_getopt.h
my_global.h	Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0	2005-12-05 10:24:54 +02: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
my_net.h
my_no_pthread.h
my_nosys.h
my_pthread.h	Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash	2005-11-15 21:57:02 +01:00
my_semaphore.h
my_sys.h	Many files:	2005-12-01 13:34:48 +01:00
my_time.h
my_tree.h
my_trie.h
my_xml.h
myisam.h	Merge mysql.com:/home/mydev/mysql-5.0-bug10932	2005-12-06 08:31:38 +01:00
myisammrg.h
myisampack.h
mysql.h	compatibility define for Bug#15293	2005-12-05 20:47:15 +01:00
mysql_com.h	Merge mysql.com:/home/my/mysql-5.0	2005-11-05 01:32:55 +02:00
mysql_embed.h
mysql_time.h
mysql_version.h.in
mysys_err.h
plugin.h	Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree)	2005-11-05 13:20:35 +02:00
queues.h
raid.h
rijndael.h
sha1.h
sql_common.h
sslopt-case.h
sslopt-longopts.h
sslopt-vars.h
t_ctype.h
thr_alarm.h
thr_lock.h
typelib.h
violite.h