mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 14:02:32 +01:00
f1bb8c3c55
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. |
||
|---|---|---|
| .. | ||
| binlog_auto_increment_bug33029-master.opt | ||
| binlog_auto_increment_bug33029.test | ||
| binlog_base64_flag.test | ||
| binlog_database.test | ||
| binlog_grant.test | ||
| binlog_implicit_commit.test | ||
| binlog_incident-master.opt | ||
| binlog_incident.test | ||
| binlog_index.test | ||
| binlog_innodb.test | ||
| binlog_innodb_row.test | ||
| binlog_killed.test | ||
| binlog_killed_simulate-master.opt | ||
| binlog_killed_simulate.test | ||
| binlog_mix_innodb_stat.test | ||
| binlog_mixed_failure_mixing_engines.test | ||
| binlog_multi_engine.test | ||
| binlog_old_versions.test | ||
| binlog_row_binlog-master.opt | ||
| binlog_row_binlog.test | ||
| binlog_row_ctype_cp932.test | ||
| binlog_row_ctype_ucs.test | ||
| binlog_row_drop_tmp_tbl.test | ||
| binlog_row_failure_mixing_engines.test | ||
| binlog_row_innodb_stat-master.opt | ||
| binlog_row_innodb_stat.test | ||
| binlog_row_insert_select.test | ||
| binlog_row_mix_innodb_myisam-master.opt | ||
| binlog_row_mix_innodb_myisam.test | ||
| binlog_row_mysqlbinlog_db_filter.test | ||
| binlog_row_mysqlbinlog_verbose.test | ||
| binlog_sql_mode.test | ||
| binlog_start_comment.test | ||
| binlog_statement_insert_delayed.test | ||
| binlog_stm_binlog-master.opt | ||
| binlog_stm_binlog.test | ||
| binlog_stm_blackhole.test | ||
| binlog_stm_ctype_cp932.test | ||
| binlog_stm_ctype_ucs.test | ||
| binlog_stm_drop_tmp_tbl.test | ||
| binlog_stm_innodb_stat-master.opt | ||
| binlog_stm_innodb_stat.test | ||
| binlog_stm_insert_select.test | ||
| binlog_stm_mix_innodb_myisam-master.opt | ||
| binlog_stm_mix_innodb_myisam.test | ||
| binlog_stm_ps.test | ||
| binlog_stm_row.test | ||
| binlog_stm_unsafe_warning-master.opt | ||
| binlog_stm_unsafe_warning.test | ||
| binlog_tbl_metadata.test | ||
| binlog_tmp_table.test | ||
| binlog_truncate_innodb-master.opt | ||
| binlog_truncate_innodb.test | ||
| binlog_truncate_myisam.test | ||
| binlog_unsafe.test | ||
| disabled.def | ||