mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 18:20:07 +01:00
5dcb0e447f
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 |
||
|---|---|---|
| .. | ||
| check_type.inc | ||
| create_recursive_construct.inc | ||
| rpl_auto_increment.test | ||
| rpl_auto_increment_insert_view.test | ||
| rpl_auto_increment_invoke_trigger.test | ||
| rpl_autoinc_func_invokes_trigger.test | ||
| rpl_binlog_max_cache_size.test | ||
| rpl_blackhole.test | ||
| rpl_charset.test | ||
| rpl_commit_after_flush.test | ||
| rpl_conflicts.test | ||
| rpl_ddl.test | ||
| rpl_deadlock.test | ||
| rpl_delete_no_where.test | ||
| rpl_EE_err.test | ||
| rpl_extraMaster_Col.test | ||
| rpl_extraSlave_Col.test | ||
| rpl_failed_optimize.test | ||
| rpl_flsh_tbls.test | ||
| rpl_foreign_key.test | ||
| rpl_get_master_version_and_clock.test | ||
| rpl_implicit_commit_binlog.test | ||
| rpl_innodb.test | ||
| rpl_insert_delayed.test | ||
| rpl_insert_id.test | ||
| rpl_insert_id_pk.test | ||
| rpl_insert_ignore.test | ||
| rpl_loaddata.test | ||
| rpl_loadfile.test | ||
| rpl_log.test | ||
| rpl_max_relay_size.test | ||
| rpl_mixing_engines.inc | ||
| rpl_mixing_engines.test | ||
| rpl_multi_query.test | ||
| rpl_multi_update.test | ||
| rpl_multi_update2.test | ||
| rpl_multi_update3.test | ||
| rpl_ndb_2multi_basic.test | ||
| rpl_ndb_2multi_eng.test | ||
| rpl_ndb_apply_status.test | ||
| rpl_not_null.test | ||
| rpl_partition.test | ||
| rpl_relayrotate.test | ||
| rpl_reset_slave.test | ||
| rpl_row_001.test | ||
| rpl_row_basic.test | ||
| rpl_row_blob.test | ||
| rpl_row_delayed_ins.test | ||
| rpl_row_func003.test | ||
| rpl_row_sp002.test | ||
| rpl_row_sp003.test | ||
| rpl_row_sp006.test | ||
| rpl_row_sp007.test | ||
| rpl_row_tabledefs.test | ||
| rpl_row_UUID.test | ||
| rpl_show_relaylog_events.inc | ||
| rpl_start_stop_slave.test | ||
| rpl_stm_000001.test | ||
| rpl_stm_EE_err2.test | ||
| rpl_stop_middle_group.test | ||
| rpl_sv_relay_space.test | ||
| rpl_trig004.test | ||
| rpl_truncate.test | ||
| rpl_truncate_helper.test | ||
| type_conversions.test | ||