Alexander Nozdrin bc2d4e620a Manual merge from mysql-trunk-merge. ... Conflicts: - extra/comp_err.c - mysql-test/collections/default.experimental - mysql-test/r/archive.result - mysql-test/r/select.result - mysql-test/suite/binlog/r/binlog_unsafe.result - mysql-test/suite/binlog/t/binlog_unsafe.test - mysql-test/suite/rpl/t/disabled.def - mysql-test/t/archive.test - mysql-test/t/select.test - sql/item.cc - sql/item.h - sql/item_timefunc.cc - sql/sql_base.cc - sql/sql_delete.cc - sql/sql_load.cc - sql/sql_partition.cc - sql/sql_table.cc - storage/innobase/handler/ha_innodb.cc - vio/vio.c		2009-12-12 23:38:59 +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	Added all changes from old 4.0 version:	2001-04-11 13:04:03 +02:00
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 with next-mr	2009-11-20 17:18:37 +03: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