unknown 7f5bf3dcdb Manual merge (again) ... configure.in: Auto merged include/mysql.h: Auto merged innobase/row/row0mysql.c: Auto merged BitKeeper/deleted/.del-ctype-cp932.c: Auto merged BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9: Auto merged BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150: Auto merged libmysql/libmysql.c: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/ps_grant.test: Auto merged sql/ha_blackhole.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-ucs2.c: Auto merged		2005-05-14 12:38:12 +04:00
..
examples	- manual merge	2005-04-21 08:30:59 +02:00
copyright	Added all changes from old 4.0 version:	2001-04-11 13:04:03 +02:00
emb_qcache.cc	Fix crash in embedded server due to incorrect storage of results	2005-03-31 19:17:45 -08:00
emb_qcache.h	Fix crash in embedded server due to incorrect storage of results	2005-03-31 19:17:45 -08: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	BUG#9391 mysqlshow prints incorrect "rows" information	2005-04-13 12:22:20 +02:00
libmysqld.c	Fix for bug #9632 (strict.test fails in -embedded-server mode)	2005-05-09 16:26:06 +05:00
libmysqld.def	Fix test_libmysqld link problem on Windows.	2005-03-21 21:51:31 +01:00
libmysqld.rc	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00
Makefile.am	Manual merge (again)	2005-05-14 12:38:12 +04:00
resource.h	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00