unknown 8d836281ed Merge trift2.:/MySQL/M41/tmp-4.1 ... into trift2.:/MySQL/M50/merge-5.0 configure.in: Auto merged libmysqld/lib_sql.cc: Auto merged netware/comp_err.def: Auto merged netware/isamchk.def: Auto merged netware/isamlog.def: Auto merged netware/libmysql.def: Auto merged netware/myisam_ftdump.def: Auto merged netware/myisamchk.def: Auto merged netware/myisamlog.def: Auto merged netware/myisampack.def: Auto merged netware/mysql.def: Auto merged netware/mysql_install_db.def: Auto merged netware/mysql_test_run.def: Auto merged netware/mysql_waitpid.def: Auto merged netware/mysqladmin.def: Auto merged netware/mysqlbinlog.def: Auto merged netware/mysqlcheck.def: Auto merged netware/mysqld.def: Auto merged netware/mysqld_safe.def: Auto merged netware/mysqldump.def: Auto merged netware/mysqlimport.def: Auto merged netware/mysqlshow.def: Auto merged netware/mysqltest.def: Auto merged netware/pack_isam.def: Auto merged netware/perror.def: Auto merged netware/replace.def: Auto merged netware/resolve_stack_dump.def: Auto merged netware/resolveip.def: Auto merged sql/item_func.cc: Auto merged netware/my_print_defaults.def: 5.0 already has 128 kB stack size. sql/Makefile.am: Manual merge.		2007-06-13 13:55:42 +02:00
..
examples	Fix SCI Transporter	2007-05-07 15:25:24 +02:00
copyright	Added all changes from old 4.0 version:	2001-04-11 13:04:03 +02:00
emb_qcache.cc	Many files:	2006-12-23 20:17:15 +01:00
emb_qcache.h	my_strtoll10-x86.s:	2006-12-31 01:02:27 +01:00
embedded_priv.h	my_strtoll10-x86.s:	2006-12-31 01:02:27 +01:00
lib_sql.cc	Merge trift2.:/MySQL/M41/tmp-4.1	2007-06-13 13:55:42 +02:00
libmysqld.c	Many files:	2006-12-23 20:17:15 +01:00
libmysqld.def	bug #16513 (no mysql_set_server_option in libmysqld.dll export)	2006-08-19 15:15:36 +05:00
libmysqld.rc	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00
Makefile.am	Fix SCI Transporter	2007-05-07 15:25:24 +02:00
resource.h	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00