unknown 7aa1d93fd4 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 ... into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/strict.test: Auto merged sql/ha_innodb.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_update.cc: Auto merged sql/examples/ha_archive.cc: Auto merged sql/sql_yacc.yy: Auto merged		2005-02-17 14:00:44 +01:00
..
examples	small Makefile.am cleanup	2005-01-28 17:14:03 +01:00
copyright	Added all changes from old 4.0 version:	2001-04-11 13:04:03 +02:00
emb_qcache.cc	Fix for bug #8477 (Embedded query_cache test crashes)	2005-02-12 20:09:40 +04: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	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00
Makefile.am	Precision Math implementation	2005-02-09 02:50:45 +04:00
resource.h	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00