unknown 4f113ac4f3 Merging conflicts resolved ... VC++Files/libmysqld/libmysqld.dsp: Auto merged client/mysql.cc: Auto merged include/my_sys.h: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/r/ctype_utf8.result: Auto merged ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged sql/item_strfunc.cc: Auto merged sql/strfunc.cc: Auto merged VC++Files/sql/mysqld.dsp: Libraries changed mysys/default.c: get_defaults_files implementation added sql/sql_base.cc: merging sql/sql_show.cc: merging		2005-01-11 21:00:53 +04:00
..
examples	Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug;	2004-12-14 01:54:16 +02:00
copyright
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	Export the stmt functions on Embedded Server	2004-07-21 19:29:08 -04:00
libmysqld.rc	Adding binary version information for debug/release version of libmysqld.dll	2004-08-25 02:04:45 -03:00
Makefile.am	Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug;	2004-12-14 01:54:16 +02:00
resource.h	Adding binary version information for debug/release version of libmysqld.dll	2004-08-25 02:04:45 -03:00