Alfranio Correia 013cc668df merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091208092611-pbno5awyb0v38hs7 ... Fixed conflicts in: - binlog.binlog_unsafe - rpl.rpl_slow_query_log		2009-12-17 00:09:52 +00:00
..
examples	Bug #43715 Link errors when trying to link mysql_embedded.exe	2009-03-17 23:28:24 +01:00
CMakeLists.txt	merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640	2009-11-06 18:35:04 +02:00
copyright	Added all changes from old 4.0 version:	2001-04-11 13:04:03 +02:00
emb_qcache.cc	Fixed build warning on Windows (emb_qcache.cc)	2008-07-10 14:41:56 -06:00
emb_qcache.h	Bug#44521 Prepared Statement: CALL p() - crashes: `! thd->main_da.is_sent' failed et.al.	2009-07-30 00:44:04 +02:00
embedded_priv.h	my_strtoll10-x86.s:	2006-12-31 01:02:27 +01:00
lib_sql.cc	merging	2009-09-29 17:49:36 +05:00
libmysqld.c	merge	2009-09-25 14:39:05 +03:00
libmysqld.def	Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 and up.	2009-11-24 19:25:23 -02:00
libmysqld.rc	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00
Makefile.am	Merging with mysql-5.1-rep+2	2009-12-15 21:21:00 +01:00
resource.h	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00