unknown 4506b26d8c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 ... into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint BitKeeper/etc/ignore: auto-union mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/func_gconcat.result: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/group_by.result: Auto merged mysql-test/r/partition.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/func_gconcat.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/view.test: Auto merged sql/field.h: Auto merged sql/filesort.cc: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_sum.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/innobase/handler/ha_innodb.h: Auto merged storage/myisam/mi_check.c: Auto merged sql/share/errmsg.txt: Manul merge(conflict with new german text) sql/unireg.cc: Manual merge(as it is in 5.1)		2006-10-03 09:28:44 +02:00
..
atomic
mysql	Removed Field (this came in as an idea from a previous patch by Serg)	2006-09-26 21:26:04 -07:00
.cvsignore
base64.h
config-netware.h
config-win.h	Windows 64bit fixes	2006-09-21 15:19:20 +02:00
decimal.h
errmsg.h
ft_global.h
hash.h
heap.h	This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).	2006-09-30 12:49:46 -07:00
help_end.h
help_start.h
keycache.h
m_ctype.h	Merge rama.(none):/home/jimw/my/mysql-5.0-clean	2006-09-28 20:20:33 -07:00
m_string.h	Merge rama.(none):/home/jimw/my/mysql-5.0-clean	2006-09-28 20:20:33 -07:00
Makefile.am
md5.h
my_aes.h
my_alarm.h
my_alloc.h
my_atomic.h
my_base.h
my_bitmap.h
my_dbug.h
my_dir.h
my_getopt.h
my_global.h	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint	2006-10-02 23:08:30 +02:00
my_handler.h
my_libwrap.h
my_list.h
my_net.h
my_no_pthread.h
my_nosys.h
my_pthread.h
my_semaphore.h
my_sys.h	Merge rama.(none):/home/jimw/my/mysql-5.0-clean	2006-09-28 20:20:33 -07:00
my_time.h	Windows 64bit fixes	2006-09-21 15:19:20 +02:00
my_tree.h
my_trie.h
my_uctype.h
my_user.h
my_vle.h
my_xml.h
myisam.h
myisammrg.h
myisampack.h
mysql.h
mysql_com.h	Merge siva.hindu.god:/usr/home/tim/m/bk/g51	2006-09-29 17:01:16 -06:00
mysql_embed.h
mysql_time.h
mysql_version.h.in
mysys_err.h
queues.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