Luis Soares 58e2fde011 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
..
rpl_ndb_2innodb.result	Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output	2008-11-04 08:43:21 +01:00
rpl_ndb_2myisam.result	Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output	2008-11-04 08:43:21 +01:00
rpl_ndb_2ndb.result
rpl_ndb_2other.result	BUG#38350: Many tests don't clean up after themselves on exit.	2008-11-13 20:19:00 +01:00
rpl_ndb_apply_status.result
rpl_ndb_auto_inc.result
rpl_ndb_bank.result
rpl_ndb_basic.result	backporting bug@27808 fixes	2009-10-01 19:44:53 +03:00
rpl_ndb_blob.result
rpl_ndb_blob2.result
rpl_ndb_circular.result	backporting bug@27808 fixes	2009-10-01 19:44:53 +03:00
rpl_ndb_circular_2ch.result	Bug #41732 rpl_ndb_circular_2ch needs an updated configuration file	2009-02-02 22:31:01 +02:00
rpl_ndb_circular_simplex.result	manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	2009-10-22 23:30:28 +01:00
rpl_ndb_commit_afterflush.result
rpl_ndb_ctype_ucs2_def.result	BUG#38350: Many tests don't clean up after themselves on exit.	2008-11-13 20:19:00 +01:00
rpl_ndb_dd_basic.result
rpl_ndb_dd_partitions.result	Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output	2008-11-04 08:43:21 +01:00
rpl_ndb_ddl.result
rpl_ndb_delete_nowhere.result
rpl_ndb_do_db.result
rpl_ndb_do_table.result
rpl_ndb_extraCol.result	merge from 5.1-rpl+2 repo to a local branch with HB and bug@27808 fixes	2009-10-01 20:22:44 +03:00
rpl_ndb_func003.result
rpl_ndb_idempotent.result	backporting bug@27808 fixes	2009-10-01 19:44:53 +03:00
rpl_ndb_innodb2ndb.result	Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output	2008-11-04 08:43:21 +01:00
rpl_ndb_innodb_trans.result
rpl_ndb_insert_ignore.result
rpl_ndb_load.result
rpl_ndb_log.result	fixing tests results: rpl_ndb_log, rpl_ndb_multi, sp_trans_log; adding replicate-ignore_server_ids specific tests	2009-10-02 16:15:54 +03:00
rpl_ndb_mixed_engines_transactions.result	BUG#37373: rpl_ndb_transaction fails sporadically in pb on sol10-amd64-a and sol10-sparc-a	2008-07-06 12:53:25 +02:00
rpl_ndb_mixed_tables.result	Disabling tests that are not relevant after BUG#40116, these will be enabled	2009-09-28 13:44:45 +02:00
rpl_ndb_multi.result	fixing tests results: rpl_ndb_log, rpl_ndb_multi, sp_trans_log; adding replicate-ignore_server_ids specific tests	2009-10-02 16:15:54 +03:00
rpl_ndb_multi_update2.result
rpl_ndb_multi_update3.result
rpl_ndb_myisam2ndb.result	Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output	2008-11-04 08:43:21 +01:00
rpl_ndb_relayrotate.result
rpl_ndb_rep_ignore.result
rpl_ndb_row_001.result
rpl_ndb_sp003.result
rpl_ndb_sp006.result	Post fix result file	2009-10-03 09:40:32 +08:00
rpl_ndb_stm_innodb.result	Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam	2009-05-31 13:44:41 +08:00
rpl_ndb_sync.result	backporting bug@27808 fixes	2009-10-01 19:44:53 +03:00
rpl_ndb_trig004.result
rpl_ndb_UUID.result
rpl_ndbapi_multi.result
rpl_row_basic_7ndb.result	merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.	2008-11-12 19:51:47 +02:00
rpl_truncate_7ndb.result	WL#342 heartbeat	2009-09-29 14:16:23 +03:00
rpl_truncate_7ndb_2.result	Bug#39803 Test rpl.rpl_truncate_7ndb_2 failing	2008-09-15 15:13:43 -04:00