Luis Soares f1bb8c3c55 manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge ... Conflicts ========= Text conflict in .bzr-mysql/default.conf Text conflict in libmysqld/CMakeLists.txt Text conflict in libmysqld/Makefile.am Text conflict in mysql-test/collections/default.experimental Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result Text conflict in mysql-test/t/mysqlbinlog.test Text conflict in sql/CMakeLists.txt Text conflict in sql/Makefile.am Text conflict in sql/log_event_old.cc Text conflict in sql/rpl_rli.cc Text conflict in sql/slave.cc Text conflict in sql/sql_binlog.cc Text conflict in sql/sql_lex.h 21 conflicts encountered. NOTE ==== mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr: - "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr" This is the first cset (merge/...) committed after pulling from mysql-next-mr.		2009-10-22 23:30:28 +01: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	Merging mysql-next-mr-merge to mysql-next-mr.	2009-10-21 15:48:22 +05:00
libmysqld.c	Manual merge from mysql-trunk-merge.	2009-10-14 12:25:39 +04:00
libmysqld.def	Bug#38522: 5 seconds delay when closing application using embedded server	2008-12-04 19:41:53 +01: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