unknown c312cf2762 Merge ... BitKeeper/etc/ignore: auto-union include/my_global.h: Auto merged libmysql/libmysql.c: Auto merged libmysqld/examples/Makefile.am: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/mysqld.cc: Auto merged tests/mysql_client_test.c: Auto merged		2005-01-24 13:48:48 -08:00
..
examples	Merge	2005-01-24 13:48:48 -08:00
copyright	Added all changes from old 4.0 version:	2001-04-11 13:04:03 +02:00
emb_qcache.cc	Removing VC++ compiler warnings	2004-05-10 22:25:51 -03:00
emb_qcache.h	SCRUM	2003-12-01 17:19:10 +04:00
embedded_priv.h	Proposed fix for #3744 (embedded server, wrong error message if database is	2004-05-17 12:05:57 +05:00
lib_sql.cc	Merging conflicts resolved	2005-01-11 21:00:53 +04:00
libmysqld.c	fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)	2005-01-03 19:21:54 +04:00
libmysqld.def	libmysqld.def, libmysql.def:	2005-01-12 21:04:31 -06:00
libmysqld.rc	Adding binary version information for debug/release version of libmysqld.dll	2004-08-25 02:04:45 -03:00
Makefile.am	Add ha_federated.cc to libmysqld/Makefile.am so that configuring with both	2005-01-18 16:50:09 -08:00
resource.h	Adding binary version information for debug/release version of libmysqld.dll	2004-08-25 02:04:45 -03:00