Alfranio Correia 5dcb0e447f merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge ... Conflicts: Text conflict in .bzr-mysql/default.conf Text conflict in mysql-test/extra/rpl_tests/rpl_loaddata.test Text conflict in mysql-test/r/mysqlbinlog2.result Text conflict in mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result Text conflict in mysql-test/suite/binlog/r/binlog_unsafe.result Text conflict in mysql-test/suite/rpl/r/rpl_insert_id.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result Text conflict in mysql-test/suite/rpl/r/rpl_udf.result Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test Text conflict in sql/field.h Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/log_event_old.cc Text conflict in sql/mysql_priv.h Text conflict in sql/share/errmsg.txt Text conflict in sql/sp.cc Text conflict in sql/sql_acl.cc Text conflict in sql/sql_base.cc Text conflict in sql/sql_class.h Text conflict in sql/sql_db.cc Text conflict in sql/sql_delete.cc Text conflict in sql/sql_insert.cc Text conflict in sql/sql_lex.cc Text conflict in sql/sql_lex.h Text conflict in sql/sql_load.cc Text conflict in sql/sql_table.cc Text conflict in sql/sql_update.cc Text conflict in sql/sql_view.cc Conflict adding files to storage/innobase. Created directory. Conflict because storage/innobase is not versioned, but has versioned children. Versioned directory. Conflict adding file storage/innobase. Moved existing file to storage/innobase.moved. Conflict adding files to storage/innobase/handler. Created directory. Conflict because storage/innobase/handler is not versioned, but has versioned children. Versioned directory. Contents conflict in storage/innobase/handler/ha_innodb.cc		2010-01-07 15:39:11 +00:00
..
binlog.test	merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640	2009-11-06 18:35:04 +02:00
binlog_insert_delayed.test	BUG#38068: binlog_stm_binlog fails sporadically in pushbuild	2008-07-23 18:56:39 +02:00
binlog_truncate.test	Bug #36763	2009-02-06 17:06:41 +01:00
blackhole.test	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	2010-01-07 15:39:11 +00:00
ctype_cp932.test	Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl	2008-02-20 19:49:26 +01:00
ctype_cp932_binlog.test	Merge pilot.(none):/data/msvensson/mysql/bug28369/my50-bug28369	2007-06-07 19:19:29 +02:00
ctype_ucs_binlog.test	WL#4189	2007-12-12 18:19:24 +01:00
database.test	Bug#41888: Test binlog.binlog_database causing binlog_innodb to fail on Pushbuild.	2009-01-12 18:45:35 -05:00
drop_temp_table.test	Manual Merge	2009-11-03 18:20:08 +08:00
implicit.test	Bug #37221: SET AUTOCOMMIT=1 does not commit binary log	2009-09-23 13:20:48 +02:00
innodb_stat.test	Bug#37312 Make tests binlog_row_innodb_stat and binlog_stm_innodb_stat more robust	2008-09-22 15:15:52 -04:00
insert_select-binlog.test	Merge bk-internal:/home/bk/mysql-5.1-new-maint	2007-06-07 15:21:52 -07:00
mix_innodb_myisam_binlog.test	WL#2687 WL#5072 BUG#40278 BUG#47175	2009-11-03 19:02:56 +00:00
mix_innodb_myisam_side_effects.test	Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl	2008-02-28 12:21:44 +01:00