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	After merge fixes	2004-05-24 14:42:34 +03:00
libmysqld.dsp	Merging conflicts resolved	2005-01-11 21:00:53 +04:00