Jon Olav Hauglid 1af11051bf manual merge from mysql-trunk-bugfixing ... Conflicts: Text conflict in mysql-test/r/archive.result Contents conflict in mysql-test/r/innodb_bug38231.result Text conflict in mysql-test/r/mdl_sync.result Text conflict in mysql-test/suite/binlog/t/disabled.def Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result Text conflict in mysql-test/t/archive.test Contents conflict in mysql-test/t/innodb_bug38231.test Text conflict in mysql-test/t/mdl_sync.test Text conflict in sql/sp_head.cc Text conflict in sql/sql_show.cc Text conflict in sql/table.cc Text conflict in sql/table.h		2010-06-06 13:19:29 +02:00
..
examples	Another incarnation of the patch for Bug#30708	2010-05-19 17:00:23 +04:00
CMakeLists.txt	Bug#42643: InnoDB does not support replication of TRUNCATE TABLE	2010-05-25 17:01:38 -03:00
copyright	Added all changes from old 4.0 version:	2001-04-11 13:04:03 +02:00
emb_qcache.cc	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02:00
emb_qcache.h	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02:00
embedded_priv.h	my_strtoll10-x86.s:	2006-12-31 01:02:27 +01:00
lib_sql.cc	Bug#52520 Difference in tinytext utf column metadata	2010-06-02 16:23:50 +04:00
libmysqld.c	WL#5030: Split and remove mysql_priv.h	2010-03-31 16:05:33 +02:00
libmysqld.def	Fix build error with CMake 2.8 (mysql_stmt_next_result not exported	2009-12-22 21:49:37 +01:00
libmysqld.rc	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00
Makefile.am	manual merge from mysql-trunk-bugfixing	2010-06-06 13:19:29 +02:00
resource.h	query_id and my_xid -> ulonglong	2005-01-27 22:38:56 +01:00