Alexander Nozdrin 5676713687 Manual merge from mysql-trunk. ... Conflicts: - client/mysqltest.cc - mysql-test/collections/default.experimental - mysql-test/suite/rpl/t/disabled.def - sql/mysqld.cc - sql/opt_range.cc - sql/sp.cc - sql/sql_acl.cc - sql/sql_partition.cc - sql/sql_table.cc		2009-12-11 12:39:38 +03:00
..
examples	Windows improvements : manual backport of	2009-09-30 03:22:57 +02:00
CMakeLists.txt	manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	2009-10-22 23:30:28 +01:00
copyright
emb_qcache.cc	WL#2110 (SIGNAL)	2009-09-10 03:18:29 -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	Merge from mysql-next-mr.	2009-10-23 15:22:21 +04:00
libmysqld.c	Merge from mysql-next-mr.	2009-10-23 15:22:21 +04:00
libmysqld.def	Manual merge from mysql-trunk.	2009-12-11 12:39:38 +03:00
libmysqld.rc	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00
Makefile.am	manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	2009-10-22 23:30:28 +01:00
resource.h	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00