Merge lp:~gl-az/percona-server/5.1-lru_dump_load_work into lp:percona-server/5.5
Status: | Rejected | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Rejected by: | Alexey Kopytov | ||||||||||||
Proposed branch: | lp:~gl-az/percona-server/5.1-lru_dump_load_work | ||||||||||||
Merge into: | lp:percona-server/5.5 | ||||||||||||
Diff against target: |
4362715 lines (has conflicts)
Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. Conflict adding file COPYING.show_temp_51. Moved existing file to COPYING.show_temp_51.moved. Conflict adding file HandlerSocket-Plugin-for-MySQL. Moved existing file to HandlerSocket-Plugin-for-MySQL.moved. Conflict adding file Makefile. Moved existing file to Makefile.moved. Path conflict: Percona-Server / Percona-Server Text conflict in Percona-Server/.bzr-mysql/default.conf Text conflict in Percona-Server/.bzrignore Text conflict in Percona-Server/BUILD/FINISH.sh Text conflict in Percona-Server/BUILD/SETUP.sh Text conflict in Percona-Server/BUILD/autorun.sh Text conflict in Percona-Server/BUILD/build_mccge.sh Text conflict in Percona-Server/BUILD/check-cpu Text conflict in Percona-Server/BUILD/compile-amd64-valgrind-max Text conflict in Percona-Server/BUILD/compile-dist Text conflict in Percona-Server/BUILD/compile-ia64-debug-max Text conflict in Percona-Server/BUILD/compile-ndb-autotest Text conflict in Percona-Server/BUILD/compile-pentium-debug Text conflict in Percona-Server/BUILD/compile-pentium-debug-max Text conflict in Percona-Server/BUILD/compile-pentium-debug-max-no-ndb Text conflict in Percona-Server/BUILD/compile-pentium-debug-openssl Text conflict in Percona-Server/BUILD/compile-pentium-debug-yassl Text conflict in Percona-Server/BUILD/compile-pentium-valgrind-max Text conflict in Percona-Server/BUILD/compile-pentium-valgrind-max-no-ndb Text conflict in Percona-Server/BUILD/compile-pentium64-debug Text conflict in Percona-Server/BUILD/compile-pentium64-debug-max Text conflict in Percona-Server/BUILD/compile-pentium64-valgrind-max Text conflict in Percona-Server/CMakeLists.txt Text conflict in Percona-Server/INSTALL-SOURCE Text conflict in Percona-Server/INSTALL-WIN-SOURCE Text conflict in Percona-Server/README Text conflict in Percona-Server/client/CMakeLists.txt Text conflict in Percona-Server/client/client_priv.h Text conflict in Percona-Server/client/completion_hash.cc Text conflict in Percona-Server/client/my_readline.h Text conflict in Percona-Server/client/mysql.cc Text conflict in Percona-Server/client/mysql_upgrade.c Text conflict in Percona-Server/client/mysqladmin.cc Text conflict in Percona-Server/client/mysqlbinlog.cc Text conflict in Percona-Server/client/mysqlcheck.c Text conflict in Percona-Server/client/mysqldump.c Text conflict in Percona-Server/client/mysqlimport.c Text conflict in Percona-Server/client/mysqlshow.c Text conflict in Percona-Server/client/mysqlslap.c Text conflict in Percona-Server/client/mysqltest.cc Text conflict in Percona-Server/client/readline.cc Text conflict in Percona-Server/client/sql_string.cc Text conflict in Percona-Server/client/sql_string.h Text conflict in Percona-Server/config/ac-macros/ha_ndbcluster.m4 Text conflict in Percona-Server/dbug/CMakeLists.txt Text conflict in Percona-Server/dbug/dbug.c Text conflict in Percona-Server/dbug/dbug_add_tags.pl Text conflict in Percona-Server/dbug/dbug_analyze.c Text conflict in Percona-Server/dbug/my_main.c Text conflict in Percona-Server/dbug/user.r Text conflict in Percona-Server/extra/CMakeLists.txt Text conflict in Percona-Server/extra/comp_err.c Text conflict in Percona-Server/extra/my_print_defaults.c Text conflict in Percona-Server/extra/mysql_waitpid.c Text conflict in Percona-Server/extra/perror.c Text conflict in Percona-Server/extra/replace.c Text conflict in Percona-Server/extra/resolve_stack_dump.c Text conflict in Percona-Server/extra/resolveip.c Text conflict in Percona-Server/extra/yassl/CMakeLists.txt Text conflict in Percona-Server/extra/yassl/taocrypt/CMakeLists.txt Conflict adding file Percona-Server/include/atomic. Moved existing file to Percona-Server/include/atomic.moved. Text conflict in Percona-Server/include/decimal.h Text conflict in Percona-Server/include/errmsg.h Conflict adding file Percona-Server/include/flashcache_ioctl.h. Moved existing file to Percona-Server/include/flashcache_ioctl.h.moved. Text conflict in Percona-Server/include/ft_global.h Text conflict in Percona-Server/include/hash.h Text conflict in Percona-Server/include/heap.h Text conflict in Percona-Server/include/keycache.h Text conflict in Percona-Server/include/m_ctype.h Text conflict in Percona-Server/include/m_string.h Text conflict in Percona-Server/include/my_aes.h Text conflict in Percona-Server/include/my_alarm.h Text conflict in Percona-Server/include/my_alloc.h Conflict adding file Percona-Server/include/my_atomic.h. Moved existing file to Percona-Server/include/my_atomic.h.moved. Text conflict in Percona-Server/include/my_attribute.h Text conflict in Percona-Server/include/my_base.h Text conflict in Percona-Server/include/my_bit.h Text conflict in Percona-Server/include/my_bitmap.h Conflict adding file Percona-Server/include/my_compare.h. Moved existing file to Percona-Server/include/my_compare.h.moved. Text conflict in Percona-Server/include/my_compiler.h Text conflict in Percona-Server/include/my_dbug.h Text conflict in Percona-Server/include/my_dir.h Text conflict in Percona-Server/include/my_getopt.h Text conflict in Percona-Server/include/my_global.h Text conflict in Percona-Server/include/my_libwrap.h Text conflict in Percona-Server/include/my_list.h Text conflict in Percona-Server/include/my_md5.h Text conflict in Percona-Server/include/my_net.h Text conflict in Percona-Server/include/my_nosys.h Text conflict in Percona-Server/include/my_pthread.h Text conflict in Percona-Server/include/my_stacktrace.h Text conflict in Percona-Server/include/my_sys.h Text conflict in Percona-Server/include/my_time.h Text conflict in Percona-Server/include/my_tree.h Text conflict in Percona-Server/include/my_uctype.h Text conflict in Percona-Server/include/myisam.h Text conflict in Percona-Server/include/myisammrg.h Text conflict in Percona-Server/include/myisampack.h Text conflict in Percona-Server/include/mysql.h Text conflict in Percona-Server/include/mysql.h.pp Text conflict in Percona-Server/include/mysql/plugin.h Text conflict in Percona-Server/include/mysql_com.h Text conflict in Percona-Server/include/mysql_embed.h Text conflict in Percona-Server/include/mysys_err.h Text conflict in Percona-Server/include/queues.h Text conflict in Percona-Server/include/rijndael.h Text conflict in Percona-Server/include/sha1.h Text conflict in Percona-Server/include/sql_common.h Text conflict in Percona-Server/include/sslopt-case.h Text conflict in Percona-Server/include/sslopt-longopts.h Text conflict in Percona-Server/include/sslopt-vars.h Text conflict in Percona-Server/include/thr_alarm.h Text conflict in Percona-Server/include/thr_lock.h Text conflict in Percona-Server/include/typelib.h Text conflict in Percona-Server/include/violite.h Text conflict in Percona-Server/include/welcome_copyright_notice.h Text conflict in Percona-Server/libmysql/CMakeLists.txt Text conflict in Percona-Server/libmysql/client_settings.h Text conflict in Percona-Server/libmysql/errmsg.c Text conflict in Percona-Server/libmysql/get_password.c Text conflict in Percona-Server/libmysql/libmysql.c Text conflict in Percona-Server/libmysql/libmysql.def Text conflict in Percona-Server/libmysqld/CMakeLists.txt Text conflict in Percona-Server/libmysqld/emb_qcache.cc Text conflict in Percona-Server/libmysqld/emb_qcache.h Text conflict in Percona-Server/libmysqld/embedded_priv.h Text conflict in Percona-Server/libmysqld/examples/CMakeLists.txt Text conflict in Percona-Server/libmysqld/lib_sql.cc Text conflict in Percona-Server/libmysqld/libmysqld.c Text conflict in Percona-Server/libmysqld/libmysqld.def Conflict adding file Percona-Server/man/comp_err.1. Moved existing file to Percona-Server/man/comp_err.1.moved. Conflict adding file Percona-Server/man/innochecksum.1. Moved existing file to Percona-Server/man/innochecksum.1.moved. Conflict adding file Percona-Server/man/msql2mysql.1. Moved existing file to Percona-Server/man/msql2mysql.1.moved. Conflict adding file Percona-Server/man/my_print_defaults.1. Moved existing file to Percona-Server/man/my_print_defaults.1.moved. Conflict adding file Percona-Server/man/myisam_ftdump.1. Moved existing file to Percona-Server/man/myisam_ftdump.1.moved. Conflict adding file Percona-Server/man/myisamchk.1. Moved existing file to Percona-Server/man/myisamchk.1.moved. Conflict adding file Percona-Server/man/myisamlog.1. Moved existing file to Percona-Server/man/myisamlog.1.moved. Conflict adding file Percona-Server/man/myisampack.1. Moved existing file to Percona-Server/man/myisampack.1.moved. Conflict adding file Percona-Server/man/mysql-stress-test.pl.1. Moved existing file to Percona-Server/man/mysql-stress-test.pl.1.moved. Conflict adding file Percona-Server/man/mysql-test-run.pl.1. Moved existing file to Percona-Server/man/mysql-test-run.pl.1.moved. Conflict adding file Percona-Server/man/mysql.1. Moved existing file to Percona-Server/man/mysql.1.moved. Conflict adding file Percona-Server/man/mysql.server.1. Moved existing file to Percona-Server/man/mysql.server.1.moved. Conflict adding file Percona-Server/man/mysql_client_test.1. Moved existing file to Percona-Server/man/mysql_client_test.1.moved. Conflict adding file Percona-Server/man/mysql_client_test_embedded.1. Moved existing file to Percona-Server/man/mysql_client_test_embedded.1.moved. Conflict adding file Percona-Server/man/mysql_config.1. Moved existing file to Percona-Server/man/mysql_config.1.moved. Conflict adding file Percona-Server/man/mysql_convert_table_format.1. Moved existing file to Percona-Server/man/mysql_convert_table_format.1.moved. Conflict adding file Percona-Server/man/mysql_find_rows.1. Moved existing file to Percona-Server/man/mysql_find_rows.1.moved. Conflict adding file Percona-Server/man/mysql_fix_extensions.1. Moved existing file to Percona-Server/man/mysql_fix_extensions.1.moved. Conflict adding file Percona-Server/man/mysql_install_db.1. Moved existing file to Percona-Server/man/mysql_install_db.1.moved. Conflict adding file Percona-Server/man/mysql_secure_installation.1. Moved existing file to Percona-Server/man/mysql_secure_installation.1.moved. Conflict adding file Percona-Server/man/mysql_setpermission.1. Moved existing file to Percona-Server/man/mysql_setpermission.1.moved. Conflict adding file Percona-Server/man/mysql_tzinfo_to_sql.1. Moved existing file to Percona-Server/man/mysql_tzinfo_to_sql.1.moved. Conflict adding file Percona-Server/man/mysql_upgrade.1. Moved existing file to Percona-Server/man/mysql_upgrade.1.moved. Conflict adding file Percona-Server/man/mysql_waitpid.1. Moved existing file to Percona-Server/man/mysql_waitpid.1.moved. Conflict adding file Percona-Server/man/mysql_zap.1. Moved existing file to Percona-Server/man/mysql_zap.1.moved. Conflict adding file Percona-Server/man/mysqlaccess.1. Moved existing file to Percona-Server/man/mysqlaccess.1.moved. Conflict adding file Percona-Server/man/mysqladmin.1. Moved existing file to Percona-Server/man/mysqladmin.1.moved. Conflict adding file Percona-Server/man/mysqlbinlog.1. Moved existing file to Percona-Server/man/mysqlbinlog.1.moved. Conflict adding file Percona-Server/man/mysqlbug.1. Moved existing file to Percona-Server/man/mysqlbug.1.moved. Conflict adding file Percona-Server/man/mysqlcheck.1. Moved existing file to Percona-Server/man/mysqlcheck.1.moved. Conflict adding file Percona-Server/man/mysqld.8. Moved existing file to Percona-Server/man/mysqld.8.moved. Conflict adding file Percona-Server/man/mysqld_multi.1. Moved existing file to Percona-Server/man/mysqld_multi.1.moved. Conflict adding file Percona-Server/man/mysqld_safe.1. Moved existing file to Percona-Server/man/mysqld_safe.1.moved. Conflict adding file Percona-Server/man/mysqldump.1. Moved existing file to Percona-Server/man/mysqldump.1.moved. Conflict adding file Percona-Server/man/mysqldumpslow.1. Moved existing file to Percona-Server/man/mysqldumpslow.1.moved. Conflict adding file Percona-Server/man/mysqlhotcopy.1. Moved existing file to Percona-Server/man/mysqlhotcopy.1.moved. Conflict adding file Percona-Server/man/mysqlimport.1. Moved existing file to Percona-Server/man/mysqlimport.1.moved. Conflict adding file Percona-Server/man/mysqlshow.1. Moved existing file to Percona-Server/man/mysqlshow.1.moved. Conflict adding file Percona-Server/man/mysqlslap.1. Moved existing file to Percona-Server/man/mysqlslap.1.moved. Conflict adding file Percona-Server/man/mysqltest.1. Moved existing file to Percona-Server/man/mysqltest.1.moved. Conflict adding file Percona-Server/man/mysqltest_embedded.1. Moved existing file to Percona-Server/man/mysqltest_embedded.1.moved. Conflict adding file Percona-Server/man/ndb_config.1. Moved existing file to Percona-Server/man/ndb_config.1.moved. Conflict adding file Percona-Server/man/ndb_cpcd.1. Moved existing file to Percona-Server/man/ndb_cpcd.1.moved. Conflict adding file Percona-Server/man/ndb_delete_all.1. Moved existing file to Percona-Server/man/ndb_delete_all.1.moved. Conflict adding file Percona-Server/man/ndb_desc.1. Moved existing file to Percona-Server/man/ndb_desc.1.moved. Conflict adding file Percona-Server/man/ndb_drop_index.1. Moved existing file to Percona-Server/man/ndb_drop_index.1.moved. Conflict adding file Percona-Server/man/ndb_drop_table.1. Moved existing file to Percona-Server/man/ndb_drop_table.1.moved. Conflict adding file Percona-Server/man/ndb_error_reporter.1. Moved existing file to Percona-Server/man/ndb_error_reporter.1.moved. Conflict adding file Percona-Server/man/ndb_mgm.1. Moved existing file to Percona-Server/man/ndb_mgm.1.moved. Conflict adding file Percona-Server/man/ndb_mgmd.8. Moved existing file to Percona-Server/man/ndb_mgmd.8.moved. Conflict adding file Percona-Server/man/ndb_print_backup_file.1. Moved existing file to Percona-Server/man/ndb_print_backup_file.1.moved. Conflict adding file Percona-Server/man/ndb_print_schema_file.1. Moved existing file to Percona-Server/man/ndb_print_schema_file.1.moved. Conflict adding file Percona-Server/man/ndb_print_sys_file.1. Moved existing file to Percona-Server/man/ndb_print_sys_file.1.moved. Conflict adding file Percona-Server/man/ndb_restore.1. Moved existing file to Percona-Server/man/ndb_restore.1.moved. Conflict adding file Percona-Server/man/ndb_select_all.1. Moved existing file to Percona-Server/man/ndb_select_all.1.moved. Conflict adding file Percona-Server/man/ndb_select_count.1. Moved existing file to Percona-Server/man/ndb_select_count.1.moved. Conflict adding file Percona-Server/man/ndb_show_tables.1. Moved existing file to Percona-Server/man/ndb_show_tables.1.moved. Conflict adding file Percona-Server/man/ndb_size.pl.1. Moved existing file to Percona-Server/man/ndb_size.pl.1.moved. Conflict adding file Percona-Server/man/ndb_waiter.1. Moved existing file to Percona-Server/man/ndb_waiter.1.moved. Conflict adding file Percona-Server/man/ndbd.8. Moved existing file to Percona-Server/man/ndbd.8.moved. Conflict adding file Percona-Server/man/ndbd_redo_log_reader.1. Moved existing file to Percona-Server/man/ndbd_redo_log_reader.1.moved. Conflict adding file Percona-Server/man/ndbmtd.8. Moved existing file to Percona-Server/man/ndbmtd.8.moved. Conflict adding file Percona-Server/man/perror.1. Moved existing file to Percona-Server/man/perror.1.moved. Conflict adding file Percona-Server/man/replace.1. Moved existing file to Percona-Server/man/replace.1.moved. Conflict adding file Percona-Server/man/resolve_stack_dump.1. Moved existing file to Percona-Server/man/resolve_stack_dump.1.moved. Conflict adding file Percona-Server/man/resolveip.1. Moved existing file to Percona-Server/man/resolveip.1.moved. Text conflict in Percona-Server/mysql-test/collections/README Text conflict in Percona-Server/mysql-test/collections/default.daily Text conflict in Percona-Server/mysql-test/collections/default.experimental Text conflict in Percona-Server/mysql-test/collections/default.push Text conflict in Percona-Server/mysql-test/collections/default.weekly Text conflict in Percona-Server/mysql-test/extra/binlog_tests/binlog.test Path conflict: Percona-Server/mysql-test/extra/binlog_tests/binlog_cache_stat.test / Percona-Server/mysql-test/extra/binlog_tests/innodb_stat.test Text conflict in Percona-Server/mysql-test/extra/binlog_tests/binlog_insert_delayed.test Text conflict in Percona-Server/mysql-test/extra/binlog_tests/binlog_truncate.test Text conflict in Percona-Server/mysql-test/extra/binlog_tests/blackhole.test Text conflict in Percona-Server/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test Text conflict in Percona-Server/mysql-test/extra/binlog_tests/database.test Text conflict in Percona-Server/mysql-test/extra/binlog_tests/drop_temp_table.test Text conflict in Percona-Server/mysql-test/extra/binlog_tests/innodb_stat.test Text conflict in Percona-Server/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test Text conflict in Percona-Server/mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test Path conflict: Percona-Server/mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test / Percona-Server/mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_charset.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_conflicts.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_extra_col_master.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_failed_optimize.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_foreign_key.test Path conflict: Percona-Server/mysql-test/extra/rpl_tests/rpl_innodb.test / Percona-Server/mysql-test/suite/rpl/t/rpl_innodb.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_insert_delayed.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_insert_id.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_insert_ignore.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_loaddata.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_log.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_mixing_engines.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_multi_update.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_multi_update2.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_multi_update3.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_not_null.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_reset_slave.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_row_basic.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_row_blob.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_row_func003.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_row_sp002.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_row_sp003.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test Path conflict: Percona-Server/mysql-test/extra/rpl_tests/rpl_start_stop_slave.test / Percona-Server/mysql-test/suite/rpl/t/rpl_start_stop_slave.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_stop_slave.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_sv_relay_space.test Text conflict in Percona-Server/mysql-test/extra/rpl_tests/rpl_trig004.test Text conflict in Percona-Server/mysql-test/include/begin_include_file.inc Text conflict in Percona-Server/mysql-test/include/check-testcase.test Text conflict in Percona-Server/mysql-test/include/check_no_concurrent_insert.inc Text conflict in Percona-Server/mysql-test/include/check_slave_param.inc Text conflict in Percona-Server/mysql-test/include/commit.inc Path conflict: Percona-Server/mysql-test/include/ctype_innodb_like.inc / Percona-Server/mysql-test/suite/innodb_plugin/include/ctype_innodb_like.inc Text conflict in Percona-Server/mysql-test/include/ddl_i18n.check_sp.inc Text conflict in Percona-Server/mysql-test/include/deadlock.inc Text conflict in Percona-Server/mysql-test/include/default_my.cnf Text conflict in Percona-Server/mysql-test/include/default_mysqld.cnf Text conflict in Percona-Server/mysql-test/include/diff_tables.inc Conflict adding file Percona-Server/mysql-test/include/get_relay_log_pos.inc. Moved existing file to Percona-Server/mysql-test/include/get_relay_log_pos.inc.moved. Text conflict in Percona-Server/mysql-test/include/handler.inc Text conflict in Percona-Server/mysql-test/include/have_32bit.inc Text conflict in Percona-Server/mysql-test/include/have_community_features.inc Text conflict in Percona-Server/mysql-test/include/have_dynamic_loading.inc Text conflict in Percona-Server/mysql-test/include/have_example_plugin.inc Conflict adding file Percona-Server/mysql-test/include/have_federated_plugin.inc. Moved existing file to Percona-Server/mysql-test/include/have_federated_plugin.inc.moved. Conflict adding file Percona-Server/mysql-test/include/have_nodebug.inc. Moved existing file to Percona-Server/mysql-test/include/have_nodebug.inc.moved. Path conflict: Percona-Server/mysql-test/include/have_profiling.inc / Percona-Server/mysql-test/include/have_community_features.inc Conflict adding file Percona-Server/mysql-test/include/have_response_time_distribution.inc. Moved existing file to Percona-Server/mysql-test/include/have_response_time_distribution.inc.moved. Text conflict in Percona-Server/mysql-test/include/have_simple_parser.inc Text conflict in Percona-Server/mysql-test/include/have_udf.inc Text conflict in Percona-Server/mysql-test/include/index_merge1.inc Text conflict in Percona-Server/mysql-test/include/index_merge2.inc Path conflict: Percona-Server/mysql-test/include/innodb-index.inc / Percona-Server/mysql-test/suite/innodb_plugin/include/innodb-index.inc Path conflict: Percona-Server/mysql-test/include/innodb_trx_weight.inc / Percona-Server/mysql-test/suite/innodb_plugin/include/innodb_trx_weight.inc Conflict adding file Percona-Server/mysql-test/include/log_grep.inc. Moved existing file to Percona-Server/mysql-test/include/log_grep.inc.moved. Conflict adding file Percona-Server/mysql-test/include/log_start.inc. Moved existing file to Percona-Server/mysql-test/include/log_start.inc.moved. Conflict adding file Percona-Server/mysql-test/include/log_stop.inc. Moved existing file to Percona-Server/mysql-test/include/log_stop.inc.moved. Text conflict in Percona-Server/mysql-test/include/mix1.inc Text conflict in Percona-Server/mysql-test/include/mix2.inc Text conflict in Percona-Server/mysql-test/include/mtr_check.sql Text conflict in Percona-Server/mysql-test/include/mtr_warnings.sql Text conflict in Percona-Server/mysql-test/include/no_valgrind_without_big.inc Text conflict in Percona-Server/mysql-test/include/not_ndb_default.inc Conflict adding file Percona-Server/mysql-test/include/percona_innodb_kill_idle_trx_show.inc. Moved existing file to Percona-Server/mysql-test/include/percona_innodb_kill_idle_trx_show.inc.moved. Conflict adding file Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc. Moved existing file to Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc.moved. Conflict adding file Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc. Moved existing file to Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc.moved. Conflict adding file Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc. Moved existing file to Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc.moved. Conflict adding file Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc. Moved existing file to Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc.moved. Conflict adding file Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc. Moved existing file to Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc.moved. Conflict adding file Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc. Moved existing file to Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc.moved. Conflict adding file Percona-Server/mysql-test/include/percona_server_variables.inc. Moved existing file to Percona-Server/mysql-test/include/percona_server_variables.inc.moved. Conflict adding file Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc. Moved existing file to Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc.moved. Text conflict in Percona-Server/mysql-test/include/query_cache.inc Text conflict in Percona-Server/mysql-test/include/query_cache_sql_prepare.inc Conflict adding file Percona-Server/mysql-test/include/query_response_time-replication.inc. Moved existing file to Percona-Server/mysql-test/include/query_response_time-replication.inc.moved. Conflict adding file Percona-Server/mysql-test/include/query_response_time-stored.inc. Moved existing file to Percona-Server/mysql-test/include/query_response_time-stored.inc.moved. Conflict adding file Percona-Server/mysql-test/include/query_response_time.inc. Moved existing file to Percona-Server/mysql-test/include/query_response_time.inc.moved. Text conflict in Percona-Server/mysql-test/include/read_many_rows.inc Text conflict in Percona-Server/mysql-test/include/rpl_change_topology.inc Text conflict in Percona-Server/mysql-test/include/rpl_connect.inc Text conflict in Percona-Server/mysql-test/include/rpl_diff.inc Text conflict in Percona-Server/mysql-test/include/rpl_end.inc Text conflict in Percona-Server/mysql-test/include/rpl_init.inc Text conflict in Percona-Server/mysql-test/include/rpl_udf.inc Text conflict in Percona-Server/mysql-test/include/setup_fake_relay_log.inc Text conflict in Percona-Server/mysql-test/include/show_binlog_events.inc Text conflict in Percona-Server/mysql-test/include/show_binlog_events2.inc Text conflict in Percona-Server/mysql-test/include/show_rpl_debug_info.inc Text conflict in Percona-Server/mysql-test/include/show_slave_status.inc Text conflict in Percona-Server/mysql-test/include/sync_slave_io_with_master.inc Text conflict in Percona-Server/mysql-test/include/test_fieldsize.inc Text conflict in Percona-Server/mysql-test/include/truncate_file.inc Text conflict in Percona-Server/mysql-test/include/wait_for_binlog_event.inc Text conflict in Percona-Server/mysql-test/include/wait_for_slave_io_error.inc Text conflict in Percona-Server/mysql-test/include/wait_for_slave_io_to_start.inc Text conflict in Percona-Server/mysql-test/include/wait_for_slave_param.inc Text conflict in Percona-Server/mysql-test/include/wait_for_slave_sql_error.inc Text conflict in Percona-Server/mysql-test/include/wait_for_status_var.inc Text conflict in Percona-Server/mysql-test/include/wait_show_condition.inc Text conflict in Percona-Server/mysql-test/include/write_var_to_file.inc Text conflict in Percona-Server/mysql-test/lib/My/ConfigFactory.pm Text conflict in Percona-Server/mysql-test/lib/My/CoreDump.pm Text conflict in Percona-Server/mysql-test/lib/My/Find.pm Text conflict in Percona-Server/mysql-test/lib/My/Handles.pm Text conflict in Percona-Server/mysql-test/lib/My/Options.pm Text conflict in Percona-Server/mysql-test/lib/My/SafeProcess.pm Text conflict in Percona-Server/mysql-test/lib/My/SafeProcess/CMakeLists.txt Text conflict in Percona-Server/mysql-test/lib/My/SafeProcess/safe_kill_win.cc Text conflict in Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc Text conflict in Percona-Server/mysql-test/lib/My/SafeProcess/safe_process_win.cc Text conflict in Percona-Server/mysql-test/lib/My/Test.pm Conflict adding file Percona-Server/mysql-test/lib/Subunit.pm. Moved existing file to Percona-Server/mysql-test/lib/Subunit.pm.moved. Text conflict in Percona-Server/mysql-test/lib/mtr_cases.pm Text conflict in Percona-Server/mysql-test/lib/mtr_gcov.pl Text conflict in Percona-Server/mysql-test/lib/mtr_misc.pl Text conflict in Percona-Server/mysql-test/lib/mtr_process.pl Text conflict in Percona-Server/mysql-test/lib/mtr_report.pm Text conflict in Percona-Server/mysql-test/lib/t/Options.t Text conflict in Percona-Server/mysql-test/lib/t/testMyConfigFactory.t Text conflict in Percona-Server/mysql-test/lib/v1/mtr_io.pl Text conflict in Percona-Server/mysql-test/lib/v1/mtr_misc.pl Text conflict in Percona-Server/mysql-test/lib/v1/mtr_report.pl Text conflict in Percona-Server/mysql-test/lib/v1/mysql-test-run.pl Text conflict in Percona-Server/mysql-test/mysql-stress-test.pl Text conflict in Percona-Server/mysql-test/mysql-test-run.pl Text conflict in Percona-Server/mysql-test/r/1st.result Text conflict in Percona-Server/mysql-test/r/alias.result Text conflict in Percona-Server/mysql-test/r/alter_table-big.result Text conflict in Percona-Server/mysql-test/r/alter_table.result Text conflict in Percona-Server/mysql-test/r/analyze.result Text conflict in Percona-Server/mysql-test/r/archive.result Text conflict in Percona-Server/mysql-test/r/archive_gis.result Text conflict in Percona-Server/mysql-test/r/auto_increment.result Text conflict in Percona-Server/mysql-test/r/bench_count_distinct.result Text conflict in Percona-Server/mysql-test/r/bigint.result Text conflict in Percona-Server/mysql-test/r/bootstrap.result Text conflict in Percona-Server/mysql-test/r/bug46080.result Text conflict in Percona-Server/mysql-test/r/bug46760.result Text conflict in Percona-Server/mysql-test/r/cache_innodb.result Text conflict in Percona-Server/mysql-test/r/case.result Text conflict in Percona-Server/mysql-test/r/cast.result Text conflict in Percona-Server/mysql-test/r/change_user.result Text conflict in Percona-Server/mysql-test/r/check.result Text conflict in Percona-Server/mysql-test/r/commit_1innodb.result Text conflict in Percona-Server/mysql-test/r/compare.result Text conflict in Percona-Server/mysql-test/r/compress.result Text conflict in Percona-Server/mysql-test/r/connect.result Text conflict in Percona-Server/mysql-test/r/constraints.result Text conflict in Percona-Server/mysql-test/r/count_distinct.result Text conflict in Percona-Server/mysql-test/r/create-big.result Text conflict in Percona-Server/mysql-test/r/create.result Text conflict in Percona-Server/mysql-test/r/csv.result Text conflict in Percona-Server/mysql-test/r/ctype_big5.result Text conflict in Percona-Server/mysql-test/r/ctype_collate.result Text conflict in Percona-Server/mysql-test/r/ctype_cp1250_ch.result Text conflict in Percona-Server/mysql-test/r/ctype_cp1251.result Text conflict in Percona-Server/mysql-test/r/ctype_cp932_binlog_stm.result Text conflict in Percona-Server/mysql-test/r/ctype_eucjpms.result Text conflict in Percona-Server/mysql-test/r/ctype_euckr.result Text conflict in Percona-Server/mysql-test/r/ctype_gb2312.result Text conflict in Percona-Server/mysql-test/r/ctype_gbk.result Text conflict in Percona-Server/mysql-test/r/ctype_latin1.result Text conflict in Percona-Server/mysql-test/r/ctype_ldml.result Text conflict in Percona-Server/mysql-test/r/ctype_many.result Text conflict in Percona-Server/mysql-test/r/ctype_mb.result Text conflict in Percona-Server/mysql-test/r/ctype_recoding.result Text conflict in Percona-Server/mysql-test/r/ctype_sjis.result Text conflict in Percona-Server/mysql-test/r/ctype_uca.result Text conflict in Percona-Server/mysql-test/r/ctype_ucs.result Text conflict in Percona-Server/mysql-test/r/ctype_ucs2_def.result Text conflict in Percona-Server/mysql-test/r/ctype_ujis.result Text conflict in Percona-Server/mysql-test/r/ctype_utf8.result Text conflict in Percona-Server/mysql-test/r/date_formats.result Text conflict in Percona-Server/mysql-test/r/ddl_i18n_koi8r.result Text conflict in Percona-Server/mysql-test/r/ddl_i18n_utf8.result Text conflict in Percona-Server/mysql-test/r/debug_sync.result Text conflict in Percona-Server/mysql-test/r/delayed.result Text conflict in Percona-Server/mysql-test/r/delete.result Text conflict in Percona-Server/mysql-test/r/derived.result Text conflict in Percona-Server/mysql-test/r/dirty_close.result Text conflict in Percona-Server/mysql-test/r/distinct.result Text conflict in Percona-Server/mysql-test/r/drop.result Text conflict in Percona-Server/mysql-test/r/endspace.result Text conflict in Percona-Server/mysql-test/r/errors.result Text conflict in Percona-Server/mysql-test/r/events_1.result Text conflict in Percona-Server/mysql-test/r/events_2.result Text conflict in Percona-Server/mysql-test/r/events_bugs.result Text conflict in Percona-Server/mysql-test/r/events_grant.result Text conflict in Percona-Server/mysql-test/r/events_trans.result Text conflict in Percona-Server/mysql-test/r/execution_constants.result Text conflict in Percona-Server/mysql-test/r/explain.result Text conflict in Percona-Server/mysql-test/r/flush.result Text conflict in Percona-Server/mysql-test/r/flush2.result Text conflict in Percona-Server/mysql-test/r/flush_block_commit.result Text conflict in Percona-Server/mysql-test/r/flush_block_commit_notembedded.result Text conflict in Percona-Server/mysql-test/r/flush_read_lock_kill.result Text conflict in Percona-Server/mysql-test/r/flush_table.result Text conflict in Percona-Server/mysql-test/r/foreign_key.result Text conflict in Percona-Server/mysql-test/r/fulltext.result Path conflict: Percona-Server/mysql-test/r/func_analyse.result / Percona-Server/mysql-test/r/analyse.result Text conflict in Percona-Server/mysql-test/r/func_compress.result Text conflict in Percona-Server/mysql-test/r/func_default.result Text conflict in Percona-Server/mysql-test/r/func_encrypt.result Text conflict in Percona-Server/mysql-test/r/func_encrypt_nossl.result Text conflict in Percona-Server/mysql-test/r/func_encrypt_ucs2.result Text conflict in Percona-Server/mysql-test/r/func_gconcat.result Text conflict in Percona-Server/mysql-test/r/func_group.result Text conflict in Percona-Server/mysql-test/r/func_group_innodb.result Text conflict in Percona-Server/mysql-test/r/func_if.result Text conflict in Percona-Server/mysql-test/r/func_in.result Text conflict in Percona-Server/mysql-test/r/func_isnull.result Text conflict in Percona-Server/mysql-test/r/func_like.result Text conflict in Percona-Server/mysql-test/r/func_math.result Text conflict in Percona-Server/mysql-test/r/func_misc.result Text conflict in Percona-Server/mysql-test/r/func_regexp.result Text conflict in Percona-Server/mysql-test/r/func_sapdb.result Text conflict in Percona-Server/mysql-test/r/func_set.result Text conflict in Percona-Server/mysql-test/r/func_str.result Text conflict in Percona-Server/mysql-test/r/func_test.result Text conflict in Percona-Server/mysql-test/r/func_time.result Text conflict in Percona-Server/mysql-test/r/gis.result Text conflict in Percona-Server/mysql-test/r/grant.result Text conflict in Percona-Server/mysql-test/r/grant2.result Text conflict in Percona-Server/mysql-test/r/grant_cache_no_prot.result Text conflict in Percona-Server/mysql-test/r/grant_cache_ps_prot.result Text conflict in Percona-Server/mysql-test/r/greedy_optimizer.result Text conflict in Percona-Server/mysql-test/r/group_by.result Text conflict in Percona-Server/mysql-test/r/group_min_max.result Text conflict in Percona-Server/mysql-test/r/group_min_max_innodb.result Text conflict in Percona-Server/mysql-test/r/handler_innodb.result Text conflict in Percona-Server/mysql-test/r/handler_myisam.result Text conflict in Percona-Server/mysql-test/r/have_community_features.require Conflict adding file Percona-Server/mysql-test/r/have_nodebug.require. Moved existing file to Percona-Server/mysql-test/r/have_nodebug.require.moved. Path conflict: Percona-Server/mysql-test/r/have_profiling.require / Percona-Server/mysql-test/r/have_community_features.require Conflict adding file Percona-Server/mysql-test/r/have_response_time_distribution.require. Moved existing file to Percona-Server/mysql-test/r/have_response_time_distribution.require.moved. Text conflict in Percona-Server/mysql-test/r/having.result Text conflict in Percona-Server/mysql-test/r/heap.result Text conflict in Percona-Server/mysql-test/r/heap_btree.result Text conflict in Percona-Server/mysql-test/r/heap_hash.result Text conflict in Percona-Server/mysql-test/r/index_merge_innodb.result Text conflict in Percona-Server/mysql-test/r/index_merge_myisam.result Text conflict in Percona-Server/mysql-test/r/information_schema.result Text conflict in Percona-Server/mysql-test/r/information_schema_db.result Text conflict in Percona-Server/mysql-test/r/information_schema_inno.result Text conflict in Percona-Server/mysql-test/r/information_schema_part.result Text conflict in Percona-Server/mysql-test/r/innodb_ignore_builtin.result Text conflict in Percona-Server/mysql-test/r/innodb_mysql_lock2.result Text conflict in Percona-Server/mysql-test/r/insert.result Text conflict in Percona-Server/mysql-test/r/insert_notembedded.result Text conflict in Percona-Server/mysql-test/r/insert_select.result Text conflict in Percona-Server/mysql-test/r/join.result Text conflict in Percona-Server/mysql-test/r/join_outer.result Text conflict in Percona-Server/mysql-test/r/join_outer_innodb.result Text conflict in Percona-Server/mysql-test/r/key.result Text conflict in Percona-Server/mysql-test/r/key_cache.result Text conflict in Percona-Server/mysql-test/r/keywords.result Text conflict in Percona-Server/mysql-test/r/kill.result Text conflict in Percona-Server/mysql-test/r/loaddata.result Text conflict in Percona-Server/mysql-test/r/locale.result Text conflict in Percona-Server/mysql-test/r/lock.result Text conflict in Percona-Server/mysql-test/r/lock_multi.result Text conflict in Percona-Server/mysql-test/r/lock_sync.result Text conflict in Percona-Server/mysql-test/r/log_state.result Text conflict in Percona-Server/mysql-test/r/log_tables.result Text conflict in Percona-Server/mysql-test/r/log_tables_upgrade.result Text conflict in Percona-Server/mysql-test/r/lowercase_fs_off.result Text conflict in Percona-Server/mysql-test/r/lowercase_table2.result Text conflict in Percona-Server/mysql-test/r/lowercase_table4.result Text conflict in Percona-Server/mysql-test/r/merge.result Text conflict in Percona-Server/mysql-test/r/metadata.result Text conflict in Percona-Server/mysql-test/r/mix2_myisam.result Text conflict in Percona-Server/mysql-test/r/multi_update.result Text conflict in Percona-Server/mysql-test/r/myisam-system.result Text conflict in Percona-Server/mysql-test/r/myisam.result Text conflict in Percona-Server/mysql-test/r/myisam_crash_before_flush_keys.result Text conflict in Percona-Server/mysql-test/r/myisampack.result Text conflict in Percona-Server/mysql-test/r/mysql.result Text conflict in Percona-Server/mysql-test/r/mysql_client_test.result Text conflict in Percona-Server/mysql-test/r/mysql_upgrade.result Text conflict in Percona-Server/mysql-test/r/mysqladmin.result Text conflict in Percona-Server/mysql-test/r/mysqlbinlog.result Text conflict in Percona-Server/mysql-test/r/mysqlbinlog2.result Text conflict in Percona-Server/mysql-test/r/mysqlbinlog_row.result Text conflict in Percona-Server/mysql-test/r/mysqlbinlog_row_innodb.result Text conflict in Percona-Server/mysql-test/r/mysqlbinlog_row_myisam.result Text conflict in Percona-Server/mysql-test/r/mysqlbinlog_row_trans.result Text conflict in Percona-Server/mysql-test/r/mysqlcheck.result Text conflict in Percona-Server/mysql-test/r/mysqldump.result Text conflict in Percona-Server/mysql-test/r/mysqlshow.result Text conflict in Percona-Server/mysql-test/r/mysqlslap.result Text conflict in Percona-Server/mysql-test/r/mysqltest.result Text conflict in Percona-Server/mysql-test/r/named_pipe.result Text conflict in Percona-Server/mysql-test/r/not_embedded_server.result Text conflict in Percona-Server/mysql-test/r/not_partition.result Text conflict in Percona-Server/mysql-test/r/null.result Text conflict in Percona-Server/mysql-test/r/null_key.result Text conflict in Percona-Server/mysql-test/r/odbc.result Text conflict in Percona-Server/mysql-test/r/openssl_1.result Text conflict in Percona-Server/mysql-test/r/order_by.result Contents conflict in Percona-Server/mysql-test/r/outfile.result Text conflict in Percona-Server/mysql-test/r/packet.result Text conflict in Percona-Server/mysql-test/r/parser.result Text conflict in Percona-Server/mysql-test/r/parser_not_embedded.result Text conflict in Percona-Server/mysql-test/r/partition.result Text conflict in Percona-Server/mysql-test/r/partition_archive.result Text conflict in Percona-Server/mysql-test/r/partition_binlog_stmt.result Text conflict in Percona-Server/mysql-test/r/partition_datatype.result Text conflict in Percona-Server/mysql-test/r/partition_debug_sync.result Text conflict in Percona-Server/mysql-test/r/partition_disabled.result Text conflict in Percona-Server/mysql-test/r/partition_error.result Text conflict in Percona-Server/mysql-test/r/partition_hash.result Text conflict in Percona-Server/mysql-test/r/partition_innodb.result Text conflict in Percona-Server/mysql-test/r/partition_innodb_plugin.result Text conflict in Percona-Server/mysql-test/r/partition_innodb_semi_consistent.result Text conflict in Percona-Server/mysql-test/r/partition_innodb_stmt.result Text conflict in Percona-Server/mysql-test/r/partition_list.result Text conflict in Percona-Server/mysql-test/r/partition_mgm_err.result Text conflict in Percona-Server/mysql-test/r/partition_myisam.result Text conflict in Percona-Server/mysql-test/r/partition_pruning.result Text conflict in Percona-Server/mysql-test/r/partition_range.result Text conflict in Percona-Server/mysql-test/r/partition_symlink.result Conflict adding file Percona-Server/mysql-test/r/percona_bug45702.result. Moved existing file to Percona-Server/mysql-test/r/percona_bug45702.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_bug643149.result. Moved existing file to Percona-Server/mysql-test/r/percona_bug643149.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_bug933969.result. Moved existing file to Percona-Server/mysql-test/r/percona_bug933969.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result. Moved existing file to Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result. Moved existing file to Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result. Moved existing file to Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result. Moved existing file to Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_innodb_fake_changes.result. Moved existing file to Percona-Server/mysql-test/r/percona_innodb_fake_changes.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_innodb_fake_changes_locks.result. Moved existing file to Percona-Server/mysql-test/r/percona_innodb_fake_changes_locks.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx.result. Moved existing file to Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx_locks.result. Moved existing file to Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx_locks.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result. Moved existing file to Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_innodb_version.result. Moved existing file to Percona-Server/mysql-test/r/percona_innodb_version.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_connection_error.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_connection_error.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_slow_admin_statements.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_slow_admin_statements.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_slow_filter.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_slow_filter.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_slow_slave_statements-innodb.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_slow_slave_statements-innodb.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_slow_slave_statements.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_slow_slave_statements.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_slow_sp_statements.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_slow_sp_statements.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_log_slow_verbosity.result. Moved existing file to Percona-Server/mysql-test/r/percona_log_slow_verbosity.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_long_query_time.result. Moved existing file to Percona-Server/mysql-test/r/percona_long_query_time.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_min_examined_row_limit.result. Moved existing file to Percona-Server/mysql-test/r/percona_min_examined_row_limit.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result. Moved existing file to Percona-Server/mysql-test/r/percona_mysqldump_innodb_optimize_keys.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_query_cache_with_comments.result. Moved existing file to Percona-Server/mysql-test/r/percona_query_cache_with_comments.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result. Moved existing file to Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result. Moved existing file to Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_query_cache_with_comments_prepared_statements.result. Moved existing file to Percona-Server/mysql-test/r/percona_query_cache_with_comments_prepared_statements.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_query_response_time-replication.result. Moved existing file to Percona-Server/mysql-test/r/percona_query_response_time-replication.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_query_response_time-stored.result. Moved existing file to Percona-Server/mysql-test/r/percona_query_response_time-stored.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_query_response_time.result. Moved existing file to Percona-Server/mysql-test/r/percona_query_response_time.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_server_variables_debug.result. Moved existing file to Percona-Server/mysql-test/r/percona_server_variables_debug.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_server_variables_release.result. Moved existing file to Percona-Server/mysql-test/r/percona_server_variables_release.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_show_slave_status_nolock.result. Moved existing file to Percona-Server/mysql-test/r/percona_show_slave_status_nolock.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_show_temp_tables.result. Moved existing file to Percona-Server/mysql-test/r/percona_show_temp_tables.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_sql_no_fcache.result. Moved existing file to Percona-Server/mysql-test/r/percona_sql_no_fcache.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_status_wait_query_cache_mutex.result. Moved existing file to Percona-Server/mysql-test/r/percona_status_wait_query_cache_mutex.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_utf8_general50_ci.result. Moved existing file to Percona-Server/mysql-test/r/percona_utf8_general50_ci.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_xtradb_admin_command.result. Moved existing file to Percona-Server/mysql-test/r/percona_xtradb_admin_command.result.moved. Conflict adding file Percona-Server/mysql-test/r/percona_xtradb_bug317074.result. Moved existing file to Percona-Server/mysql-test/r/percona_xtradb_bug317074.result.moved. Text conflict in Percona-Server/mysql-test/r/perror-win.result Text conflict in Percona-Server/mysql-test/r/perror.result Text conflict in Percona-Server/mysql-test/r/plugin.result Text conflict in Percona-Server/mysql-test/r/profiling.result Text conflict in Percona-Server/mysql-test/r/ps.result Text conflict in Percona-Server/mysql-test/r/ps_1general.result Text conflict in Percona-Server/mysql-test/r/ps_2myisam.result Text conflict in Percona-Server/mysql-test/r/ps_3innodb.result Text conflict in Percona-Server/mysql-test/r/ps_4heap.result Text conflict in Percona-Server/mysql-test/r/ps_5merge.result Text conflict in Percona-Server/mysql-test/r/ps_ddl.result Text conflict in Percona-Server/mysql-test/r/ps_ddl1.result Text conflict in Percona-Server/mysql-test/r/query_cache.result Text conflict in Percona-Server/mysql-test/r/query_cache_28249.result Text conflict in Percona-Server/mysql-test/r/query_cache_debug.result Conflict adding file Percona-Server/mysql-test/r/query_cache_disabled.result. Moved existing file to Percona-Server/mysql-test/r/query_cache_disabled.result.moved. Text conflict in Percona-Server/mysql-test/r/query_cache_notembedded.result Text conflict in Percona-Server/mysql-test/r/query_cache_ps_no_prot.result Text conflict in Percona-Server/mysql-test/r/query_cache_ps_ps_prot.result Text conflict in Percona-Server/mysql-test/r/range.result Text conflict in Percona-Server/mysql-test/r/read_many_rows_innodb.result Text conflict in Percona-Server/mysql-test/r/read_only_innodb.result Text conflict in Percona-Server/mysql-test/r/rename.result Text conflict in Percona-Server/mysql-test/r/repair.result Text conflict in Percona-Server/mysql-test/r/schema.result Text conflict in Percona-Server/mysql-test/r/select.result Text conflict in Percona-Server/mysql-test/r/select_safe.result Text conflict in Percona-Server/mysql-test/r/shm.result Text conflict in Percona-Server/mysql-test/r/show_check.result Text conflict in Percona-Server/mysql-test/r/sp-big.result Text conflict in Percona-Server/mysql-test/r/sp-bugs.result Text conflict in Percona-Server/mysql-test/r/sp-code.result Text conflict in Percona-Server/mysql-test/r/sp-destruct.result Text conflict in Percona-Server/mysql-test/r/sp-dynamic.result Text conflict in Percona-Server/mysql-test/r/sp-error.result Text conflict in Percona-Server/mysql-test/r/sp-security.result Text conflict in Percona-Server/mysql-test/r/sp-threads.result Text conflict in Percona-Server/mysql-test/r/sp-ucs2.result Text conflict in Percona-Server/mysql-test/r/sp-vars.result Text conflict in Percona-Server/mysql-test/r/sp.result Text conflict in Percona-Server/mysql-test/r/sp_notembedded.result Text conflict in Percona-Server/mysql-test/r/sp_sync.result Text conflict in Percona-Server/mysql-test/r/sp_trans.result Text conflict in Percona-Server/mysql-test/r/sp_trans_log.result Text conflict in Percona-Server/mysql-test/r/sql_mode.result Text conflict in Percona-Server/mysql-test/r/ssl.result Text conflict in Percona-Server/mysql-test/r/ssl_compress.result Text conflict in Percona-Server/mysql-test/r/strict.result Text conflict in Percona-Server/mysql-test/r/subselect.result Text conflict in Percona-Server/mysql-test/r/subselect3.result Text conflict in Percona-Server/mysql-test/r/subselect4.result Text conflict in Percona-Server/mysql-test/r/subselect_innodb.result Text conflict in Percona-Server/mysql-test/r/symlink.result Text conflict in Percona-Server/mysql-test/r/system_mysql_db.result Text conflict in Percona-Server/mysql-test/r/temp_table.result Text conflict in Percona-Server/mysql-test/r/trigger-compat.result Text conflict in Percona-Server/mysql-test/r/trigger-trans.result Text conflict in Percona-Server/mysql-test/r/trigger.result Text conflict in Percona-Server/mysql-test/r/trigger_notembedded.result Text conflict in Percona-Server/mysql-test/r/truncate.result Text conflict in Percona-Server/mysql-test/r/type_binary.result Text conflict in Percona-Server/mysql-test/r/type_bit.result Text conflict in Percona-Server/mysql-test/r/type_blob.result Text conflict in Percona-Server/mysql-test/r/type_date.result Text conflict in Percona-Server/mysql-test/r/type_datetime.result Text conflict in Percona-Server/mysql-test/r/type_decimal.result Text conflict in Percona-Server/mysql-test/r/type_float.result Text conflict in Percona-Server/mysql-test/r/type_newdecimal.result Text conflict in Percona-Server/mysql-test/r/type_ranges.result Text conflict in Percona-Server/mysql-test/r/type_time.result Text conflict in Percona-Server/mysql-test/r/type_timestamp.result Text conflict in Percona-Server/mysql-test/r/type_varchar.result Text conflict in Percona-Server/mysql-test/r/udf.result Text conflict in Percona-Server/mysql-test/r/union.result Text conflict in Percona-Server/mysql-test/r/update.result Text conflict in Percona-Server/mysql-test/r/user_limits.result Text conflict in Percona-Server/mysql-test/r/user_var-binlog.result Text conflict in Percona-Server/mysql-test/r/user_var.result Conflict adding file Percona-Server/mysql-test/r/userstat_bug602047.result. Moved existing file to Percona-Server/mysql-test/r/userstat_bug602047.result.moved. Text conflict in Percona-Server/mysql-test/r/variables-big.result Text conflict in Percona-Server/mysql-test/r/variables-notembedded.result Text conflict in Percona-Server/mysql-test/r/variables.result Text conflict in Percona-Server/mysql-test/r/variables_debug.result Text conflict in Percona-Server/mysql-test/r/view.result Text conflict in Percona-Server/mysql-test/r/view_grant.result Text conflict in Percona-Server/mysql-test/r/warnings.result Text conflict in Percona-Server/mysql-test/r/warnings_engine_disabled.result Text conflict in Percona-Server/mysql-test/r/xa.result Text conflict in Percona-Server/mysql-test/r/xml.result Text conflict in Percona-Server/mysql-test/std_data/Index.xml Contents conflict in Percona-Server/mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data Contents conflict in Percona-Server/mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_base64_flag.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_bug36391.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_database.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_drop_if_exists.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_grant.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_innodb.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_innodb_row.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_killed.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_killed_simulate.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result Path conflict: Percona-Server/mysql-test/suite/binlog/r/binlog_mixed_cache_stat.result / Percona-Server/mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_multi_engine.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_row_binlog.result Path conflict: Percona-Server/mysql-test/suite/binlog/r/binlog_row_cache_stat.result / Percona-Server/mysql-test/suite/binlog/r/binlog_row_innodb_stat.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_row_innodb_stat.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_row_insert_select.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_server_id.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_sql_mode.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_stm_binlog.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_stm_blackhole.result Path conflict: Percona-Server/mysql-test/suite/binlog/r/binlog_stm_cache_stat.result / Percona-Server/mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_stm_do_db.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_stm_insert_select.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_stm_ps.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_stm_row.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_truncate_innodb.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_truncate_myisam.result Text conflict in Percona-Server/mysql-test/suite/binlog/r/binlog_unsafe.result Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_base64_flag.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_bug36391.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_grant.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_incident.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_innodb.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_innodb_row.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_killed.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_killed_simulate.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test Path conflict: Percona-Server/mysql-test/suite/binlog/t/binlog_mixed_cache_stat.test / Percona-Server/mysql-test/suite/binlog/t/binlog_mix_innodb_stat.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_multi_engine.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_row_binlog-master.opt Path conflict: Percona-Server/mysql-test/suite/binlog/t/binlog_row_cache_stat.test / Percona-Server/mysql-test/suite/binlog/t/binlog_row_innodb_stat.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_row_innodb_stat.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_sql_mode.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt Path conflict: Percona-Server/mysql-test/suite/binlog/t/binlog_stm_cache_stat.test / Percona-Server/mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_stm_do_db.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_stm_ps.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_stm_row.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_tmp_table.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_truncate_innodb.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_truncate_myisam.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_unsafe.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_write_error.test Text conflict in Percona-Server/mysql-test/suite/binlog/t/disabled.def Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/ai_init_insert.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/comment_column.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/comment_column2.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/comment_table.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/db_alter_character_set.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/db_alter_character_set_collate.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/db_create_character_set.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/db_create_character_set_collate.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/db_create_drop.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/db_create_error.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/db_create_error_reserved.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/db_create_if_not_exists.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/db_drop_error.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/db_use_error.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/in_multicolumn_string_pk_constraint_error.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/in_multicolumn_string_pk_constraint_ignore.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/in_multicolumn_string_unique_constraint_error.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/jp_comment_column.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/jp_comment_table.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_000015.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_REDIRECT.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_change_master.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_create_database.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_empty_master_crash.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_loaddata_m.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_loaddata_s.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_log_pos.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_multi_delete2.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_rbr_to_sbr.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_row_drop.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_row_inexist_tbl.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_row_max_relay_size.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_row_reset_slave.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_row_sp005.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_row_trig003.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_row_until.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_server_id1.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_server_id2.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_slave_status.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_sp.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_stm_max_relay_size.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_stm_reset_slave.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_switch_stm_row_mixed.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_temporary.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_trigger.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/rpl_variables.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/sf_alter.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/sf_cursor.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/sp_alter.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/r/sp_cursor.result Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/comment_column.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/comment_column2.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/comment_table.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/disabled.def Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/in_multicolumn_string_pk_constraint_error.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/in_multicolumn_string_pk_constraint_ignore.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/in_multicolumn_string_unique_constraint_error.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/in_string_pk_constraint_error.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/in_string_unique_constraint_error.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/jp_comment_column.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/jp_comment_table.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl000013.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_REDIRECT.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_empty_master_crash.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_err_ignoredtable.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_get_lock.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_loaddata_s.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_loadfile.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_log_pos.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_misc_functions.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_multi_delete2.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_rbr_to_sbr.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_row_max_relay_size.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_sp-master.opt Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_sp-slave.opt Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_sp.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_sp_effects-master.opt Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_sp_effects-slave.opt Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_temp_table.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_temporary.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_trigger.test Text conflict in Percona-Server/mysql-test/suite/engines/funcs/t/rpl_variables.test Text conflict in Percona-Server/mysql-test/suite/engines/iuds/r/delete_decimal.result Text conflict in Percona-Server/mysql-test/suite/engines/iuds/r/insert_decimal.result Text conflict in Percona-Server/mysql-test/suite/engines/iuds/r/insert_number.result Text conflict in Percona-Server/mysql-test/suite/engines/iuds/r/insert_time.result Text conflict in Percona-Server/mysql-test/suite/engines/iuds/r/type_bit_iuds.result Text conflict in Percona-Server/mysql-test/suite/engines/iuds/r/update_decimal.result Text conflict in Percona-Server/mysql-test/suite/engines/iuds/r/update_delete_calendar.result Text conflict in Percona-Server/mysql-test/suite/engines/iuds/r/update_delete_number.result Text conflict in Percona-Server/mysql-test/suite/engines/iuds/r/update_time.result Text conflict in Percona-Server/mysql-test/suite/engines/iuds/t/disabled.def Text conflict in Percona-Server/mysql-test/suite/engines/iuds/t/insert_number.test Text conflict in Percona-Server/mysql-test/suite/engines/iuds/t/insert_year.test Text conflict in Percona-Server/mysql-test/suite/engines/iuds/t/type_bit_iuds.test Text conflict in Percona-Server/mysql-test/suite/engines/iuds/t/update_delete_calendar.test Text conflict in Percona-Server/mysql-test/suite/federated/federated.test Text conflict in Percona-Server/mysql-test/suite/federated/federated_bug_25714.test Conflict adding file Percona-Server/mysql-test/suite/federated/federated_bug_35333.result. Moved existing file to Percona-Server/mysql-test/suite/federated/federated_bug_35333.result.moved. Conflict adding file Percona-Server/mysql-test/suite/federated/federated_bug_35333.test. Moved existing file to Percona-Server/mysql-test/suite/federated/federated_bug_35333.test.moved. Text conflict in Percona-Server/mysql-test/suite/federated/federated_debug.test Conflict adding file Percona-Server/mysql-test/suite/federated/federated_plugin-master.opt. Moved existing file to Percona-Server/mysql-test/suite/federated/federated_plugin-master.opt.moved. Conflict adding file Percona-Server/mysql-test/suite/federated/federated_plugin.result. Moved existing file to Percona-Server/mysql-test/suite/federated/federated_plugin.result.moved. Conflict adding file Percona-Server/mysql-test/suite/federated/federated_plugin.test. Moved existing file to Percona-Server/mysql-test/suite/federated/federated_plugin.test.moved. Text conflict in Percona-Server/mysql-test/suite/federated/federated_server.result Text conflict in Percona-Server/mysql-test/suite/federated/federated_server.test Text conflict in Percona-Server/mysql-test/suite/federated/my.cnf Text conflict in Percona-Server/mysql-test/suite/funcs_1/datadict/basics_mixed1.inc Text conflict in Percona-Server/mysql-test/suite/funcs_1/datadict/datadict_priv.inc Text conflict in Percona-Server/mysql-test/suite/funcs_1/datadict/is_routines.inc Text conflict in Percona-Server/mysql-test/suite/funcs_1/datadict/is_tables.inc Text conflict in Percona-Server/mysql-test/suite/funcs_1/datadict/processlist_priv.inc Text conflict in Percona-Server/mysql-test/suite/funcs_1/datadict/processlist_val.inc Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/innodb_func_view.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/innodb_storedproc_02.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/innodb_storedproc_07.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/innodb_storedproc_08.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/innodb_storedproc_10.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/innodb_trig_03.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/innodb_trig_03e.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/innodb_trig_08.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/innodb_views.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_basics_mixed.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_cml_innodb.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_cml_memory.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_cml_myisam.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_column_privileges.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_columns.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_columns_innodb.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_columns_is.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_columns_memory.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_columns_myisam.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_columns_mysql.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_engines_innodb.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_engines_myisam.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_events.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_key_column_usage.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_routines.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_schema_privileges.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_schemata.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_statistics.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_statistics_is.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_statistics_mysql.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_table_constraints.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_table_privileges.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_tables.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_tables_innodb.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_tables_is.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_tables_memory.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_tables_myisam.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_tables_mysql.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_triggers.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_user_privileges.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_views.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/memory_func_view.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/memory_storedproc_02.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/memory_storedproc_06.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/memory_storedproc_07.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/memory_storedproc_08.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/memory_storedproc_10.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/memory_trig_03.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/memory_trig_03e.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/memory_trig_08.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/memory_views.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/myisam_func_view.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/myisam_storedproc_02.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/myisam_storedproc_07.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/myisam_storedproc_08.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/myisam_storedproc_10.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/myisam_trig_03.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/myisam_trig_03e.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/myisam_trig_08.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/myisam_views-big.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/processlist_priv_ps.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/processlist_val_ps.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/storedproc.result Text conflict in Percona-Server/mysql-test/suite/funcs_1/storedproc/storedproc_06.inc Text conflict in Percona-Server/mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc Text conflict in Percona-Server/mysql-test/suite/funcs_1/t/disabled.def Text conflict in Percona-Server/mysql-test/suite/funcs_1/t/is_basics_mixed.test Text conflict in Percona-Server/mysql-test/suite/funcs_1/t/is_columns.test Text conflict in Percona-Server/mysql-test/suite/funcs_1/t/is_columns_is.test Text conflict in Percona-Server/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test Text conflict in Percona-Server/mysql-test/suite/funcs_1/t/is_tables_is.test Text conflict in Percona-Server/mysql-test/suite/funcs_1/t/is_user_privileges.test Text conflict in Percona-Server/mysql-test/suite/funcs_1/views/func_view.inc Text conflict in Percona-Server/mysql-test/suite/funcs_1/views/views_master.inc Text conflict in Percona-Server/mysql-test/suite/funcs_2/charset/charset_master.test Text conflict in Percona-Server/mysql-test/suite/funcs_2/r/innodb_charset.result Text conflict in Percona-Server/mysql-test/suite/funcs_2/r/memory_charset.result Text conflict in Percona-Server/mysql-test/suite/funcs_2/r/myisam_charset.result Text conflict in Percona-Server/mysql-test/suite/funcs_2/t/disabled.def Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb-autoinc-44030.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb-autoinc-44030.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb-autoinc.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb-autoinc.result.moved. Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb-index.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb-index.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb-index_ucs2.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb-index_ucs2.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb-lock.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb-lock.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb-replace.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb-replace.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb-semi-consistent.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb-semi-consistent.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb-zip.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb-zip.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb.result Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug11754376.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug11754376.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug12400341.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug12400341.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug13510739.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug13510739.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug21704.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug21704.result.moved. Text conflict in Percona-Server/mysql-test/suite/innodb/r/innodb_bug30423.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb_bug34053.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb_bug34053.result Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug34300.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug34300.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug35220.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug35220.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug38231.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug38231.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug39438.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug39438.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug40565.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug40565.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug42101-nonzero.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug42101-nonzero.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug42101.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug42101.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug44369.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug44369.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug45357.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug45357.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug46000.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug46000.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug47621.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug47621.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug47777.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug47777.result.moved. Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb_bug48024.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb_bug48024.result Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug51920.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug51920.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug52663.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug52663.result.moved. Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb_bug53290.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb_bug53290.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb_bug53591.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb_bug53591.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb_bug53674.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb_bug53674.result Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug53756.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug53756.result.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug54044.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug54044.result.moved. Text conflict in Percona-Server/mysql-test/suite/innodb/r/innodb_bug56143.result Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_bug56680.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_bug56680.result.moved. Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb_bug56716.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb_bug56716.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb_bug59307.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb_bug59307.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb_bug59410.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb_bug59410.result Text conflict in Percona-Server/mysql-test/suite/innodb/r/innodb_gis.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb_information_schema.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb_information_schema.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb_misc1.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb_misc1.result Conflict adding file Percona-Server/mysql-test/suite/innodb/r/innodb_multi_update.result. Moved existing file to Percona-Server/mysql-test/suite/innodb/r/innodb_multi_update.result.moved. Text conflict in Percona-Server/mysql-test/suite/innodb/r/innodb_mysql.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb_replace.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb_replace.result Path conflict: Percona-Server/mysql-test/suite/innodb/r/innodb_trx_weight.result / Percona-Server/mysql-test/suite/innodb_plugin/r/innodb_trx_weight.result Conflict adding file Percona-Server/mysql-test/suite/innodb/t/disabled.def. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/disabled.def.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb-autoinc-44030.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb-autoinc-44030.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb-autoinc.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb-autoinc.test.moved. Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb-index.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-index.test Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb-index_ucs2.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-index_ucs2.test Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb-lock.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-lock.test Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb-master.opt / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-master.opt Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb-replace.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-replace.test Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb-semi-consistent-master.opt / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-semi-consistent-master.opt Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb-semi-consistent.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-semi-consistent.test Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb-zip.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-zip.test Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb.test Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug11754376.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug11754376.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug12400341-master.opt.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug12400341.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug12400341.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug13510739.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug13510739.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug21704.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug21704.test.moved. Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb_bug34053.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug34053.test Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug34300.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug34300.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug35220.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug35220.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug38231.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug38231.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug39438-master.opt. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug39438-master.opt.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug39438.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug39438.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug40565.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug40565.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug42101-nonzero-master.opt. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug42101-nonzero-master.opt.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug42101-nonzero.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug42101.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug42101.test.moved. Text conflict in Percona-Server/mysql-test/suite/innodb/t/innodb_bug42419.test Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug44369.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug44369.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug45357.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug45357.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug46000.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug46000.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug47621.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug47621.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug47777.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug47777.test.moved. Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb_bug48024.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug48024.test Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug51920.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug51920.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug52663.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug52663.test.moved. Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb_bug53290.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug53290.test Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb_bug53591.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug53591.test Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb_bug53674-master.opt / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug53674-master.opt Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb_bug53674.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug53674.test Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug53756-master.opt. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug53756-master.opt.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug53756.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug53756.test.moved. Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug54044.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug54044.test.moved. Text conflict in Percona-Server/mysql-test/suite/innodb/t/innodb_bug56143.test Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug56680.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug56680.test.moved. Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb_bug56716.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug56716.test Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb_bug59307.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug59307.test Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb_bug59410.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug59410.test Text conflict in Percona-Server/mysql-test/suite/innodb/t/innodb_bug59641.test Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb_information_schema.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_information_schema.test Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb_misc1-master.opt / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_misc1-master.opt Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb_misc1.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_misc1.test Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_multi_update.test. Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_multi_update.test.moved. Text conflict in Percona-Server/mysql-test/suite/innodb/t/innodb_mysql-master.opt Text conflict in Percona-Server/mysql-test/suite/innodb/t/innodb_mysql.test Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb_replace.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_replace.test Path conflict: Percona-Server/mysql-test/suite/innodb/t/innodb_trx_weight.test / Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_trx_weight.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/r/innodb-index.result Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/r/innodb-lock.result Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/r/innodb-semi-consistent.result Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/r/innodb-zip.result Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/r/innodb.result Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/r/innodb_information_schema.result Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/r/innodb_misc1.result Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-index.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-index_ucs2.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-lock.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-master.opt Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-replace.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-semi-consistent.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb-zip.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug34053.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug48024.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug53290.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug53591.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug53674.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug56716.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug59307.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug59410.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_information_schema.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_misc1.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_replace.test Text conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_trx_weight.test Text conflict in Percona-Server/mysql-test/suite/jp/r/jp_create_db_sjis.result Text conflict in Percona-Server/mysql-test/suite/jp/r/jp_create_db_ucs2.result Text conflict in Percona-Server/mysql-test/suite/jp/r/jp_create_db_ujis.result Text conflict in Percona-Server/mysql-test/suite/jp/r/jp_create_db_utf8.result Text conflict in Percona-Server/mysql-test/suite/parts/inc/partition_alter2_1.inc Text conflict in Percona-Server/mysql-test/suite/parts/inc/partition_alter2_2.inc Text conflict in Percona-Server/mysql-test/suite/parts/inc/partition_alter_13.inc Text conflict in Percona-Server/mysql-test/suite/parts/inc/partition_check.inc Text conflict in Percona-Server/mysql-test/suite/parts/inc/partition_check_drop.inc Text conflict in Percona-Server/mysql-test/suite/parts/inc/partition_key_32col.inc Text conflict in Percona-Server/mysql-test/suite/parts/inc/partition_layout.inc Text conflict in Percona-Server/mysql-test/suite/parts/inc/partition_layout_check1.inc Text conflict in Percona-Server/mysql-test/suite/parts/inc/partition_layout_check2.inc Text conflict in Percona-Server/mysql-test/suite/parts/inc/partition_mgm.inc Text conflict in Percona-Server/mysql-test/suite/parts/inc/partition_syntax.inc Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_alter1_2_innodb.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_alter1_2_myisam.result Path conflict: Percona-Server/mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result / Percona-Server/mysql-test/suite/parts/r/partition_alter2_1_innodb.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_alter2_1_innodb.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_alter2_1_myisam.result Path conflict: Percona-Server/mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result / Percona-Server/mysql-test/suite/parts/r/partition_alter2_2_innodb.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_alter2_2_innodb.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_alter2_2_myisam.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_auto_increment_innodb.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_debug_sync_innodb.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_float_innodb.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_float_myisam.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_mgm_lc0_archive.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_mgm_lc0_memory.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_mgm_lc1_archive.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_mgm_lc1_memory.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_mgm_lc2_archive.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_mgm_lc2_memory.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_recover_myisam.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_special_innodb.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_special_myisam.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_syntax_innodb.result Text conflict in Percona-Server/mysql-test/suite/parts/r/partition_syntax_myisam.result Text conflict in Percona-Server/mysql-test/suite/parts/r/rpl_partition.result Path conflict: Percona-Server/mysql-test/suite/parts/t/partition_alter2_1_1_innodb.test / Percona-Server/mysql-test/suite/parts/t/partition_alter2_1_innodb.test Text conflict in Percona-Server/mysql-test/suite/parts/t/partition_alter2_1_innodb.test Path conflict: Percona-Server/mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test / Percona-Server/mysql-test/suite/parts/t/partition_alter2_2_innodb.test Text conflict in Percona-Server/mysql-test/suite/parts/t/partition_alter2_2_innodb.test Text conflict in Percona-Server/mysql-test/suite/parts/t/partition_debug_sync_innodb.test Text conflict in Percona-Server/mysql-test/suite/parts/t/partition_mgm_lc0_archive.test Text conflict in Percona-Server/mysql-test/suite/parts/t/partition_mgm_lc1_archive.test Text conflict in Percona-Server/mysql-test/suite/parts/t/partition_mgm_lc2_archive.test Text conflict in Percona-Server/mysql-test/suite/parts/t/partition_recover_myisam.test Text conflict in Percona-Server/mysql-test/suite/parts/t/partition_repair_myisam.test Text conflict in Percona-Server/mysql-test/suite/parts/t/partition_special_innodb-master.opt Text conflict in Percona-Server/mysql-test/suite/parts/t/partition_special_innodb.test Text conflict in Percona-Server/mysql-test/suite/parts/t/partition_special_myisam.test Text conflict in Percona-Server/mysql-test/suite/parts/t/rpl_partition.test Text conflict in Percona-Server/mysql-test/suite/rpl/my.cnf Conflict adding file Percona-Server/mysql-test/suite/rpl/r/percona_bug860910.result. Moved existing file to Percona-Server/mysql-test/suite/rpl/r/percona_bug860910.result.moved. Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_000011.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_EE_err.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_alter.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_auto_increment_11932.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_binlog_grant.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_blackhole.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_bug31076.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_charset.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_colSize.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_concurrency_error.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_conditional_comments.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_create_if_not_exists.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_current_user.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_do_grant.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_drop.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_drop_temp.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_err_ignoredtable.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_events.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_failed_optimize.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_flushlog_loop.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_found_rows.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_get_lock.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_idempotency.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_innodb.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_insert_id.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_insert_id_pk.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_insert_ignore.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_loaddata_concurrent.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_loaddata_m.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_loaddata_map.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_loaddatalocal.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_log_pos.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_misc_functions.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_multi_delete2.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_multi_update.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_multi_update2.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_multi_update3.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_mysql_upgrade.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_optimize.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_packet.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_ps.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_read_only.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_rotate_logs.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result Path conflict: Percona-Server/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result / Percona-Server/mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_colSize.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_conflicts.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_create_table.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_drop.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_log.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_log_innodb.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_reset_slave.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_sp003.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_sp005.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_server_id2.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_show_slave_running.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_slave_grp_exec.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_slave_skip.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_slave_status.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_slow_query_log.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_sp.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_sporadic_master.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_ssl1.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_start_stop_slave.result Conflict adding file Percona-Server/mysql-test/suite/rpl/r/rpl_start_stop_slave.result. Moved existing file to Percona-Server/mysql-test/suite/rpl/r/rpl_start_stop_slave.result.moved. Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_stm_000001.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_stm_conflicts.result Path conflict: Percona-Server/mysql-test/suite/rpl/r/rpl_stm_found_rows.result / Percona-Server/mysql-test/suite/rpl/r/rpl_found_rows.result Path conflict: Percona-Server/mysql-test/suite/rpl/r/rpl_stm_innodb.result / Percona-Server/mysql-test/suite/rpl/r/rpl_innodb.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result Path conflict: Percona-Server/mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result / Percona-Server/mysql-test/suite/rpl/r/rpl_loaddata_concurrent.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_stm_loadfile.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_stm_log.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_stm_multi_query.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result Path conflict: Percona-Server/mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result / Percona-Server/mysql-test/suite/rpl/r/rpl_start_stop_slave.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_stm_until.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_stop_slave.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_temporary.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_temporary_errors.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_trigger.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_typeconv_innodb.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_udf.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_variables.result Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_variables_stm.result Text conflict in Percona-Server/mysql-test/suite/rpl/rpl_1slave_base.cnf Text conflict in Percona-Server/mysql-test/suite/rpl/t/disabled.def Conflict adding file Percona-Server/mysql-test/suite/rpl/t/percona_bug860910.cnf. Moved existing file to Percona-Server/mysql-test/suite/rpl/t/percona_bug860910.cnf.moved. Conflict adding file Percona-Server/mysql-test/suite/rpl/t/percona_bug860910.test. Moved existing file to Percona-Server/mysql-test/suite/rpl/t/percona_bug860910.test.moved. Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_000010.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_000011.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_000013.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_alter.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_auto_increment_11932.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_auto_increment_bug33029.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_binlog_grant.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_binlog_max_cache_size.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_bit.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_bit_npk.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_blackhole.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_bug31076.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_bug33931.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_change_master.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_colSize.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_concurrency_error.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_create_if_not_exists.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_cross_version-master.opt Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_cross_version.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_current_user.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_do_grant.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_drop.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_drop_temp.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_drop_view.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_err_ignoredtable.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_events.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_found_rows.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_get_lock.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_idempotency.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_ignore_table.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_innodb.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_insert.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_insert_ignore.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_invoked_features.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_killed_ddl.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_known_bugs_detection.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_loaddata.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_loaddata_charset.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_loaddata_concurrent.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_loaddata_m.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_loaddata_s.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_loaddatalocal.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_log_pos.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_master_pos_wait.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_misc_functions.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_mixed_bit_pk.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_multi_delete.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_multi_delete2.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_multi_update2.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_multi_update3.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_optimize.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_packet-master.opt Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_packet-slave.opt Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_packet.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_ps.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_read_only.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_replicate_do.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_rotate_logs.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_colSize.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_create_table.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_insert_delayed.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_sp001.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_sp005.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_sp008.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_sp009.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_sp010.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_trig002.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_trig003.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_until.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_server_id2.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_session_var.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_set_charset.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_show_slave_running.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_slave_skip.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_slave_status.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_slow_query_log.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_sp-master.opt Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_sp-slave.opt Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_sp.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_sp004.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_sp_effects-master.opt Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_sporadic_master.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_ssl.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_ssl1.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_start_stop_slave.test Conflict adding file Percona-Server/mysql-test/suite/rpl/t/rpl_start_stop_slave.test. Moved existing file to Percona-Server/mysql-test/suite/rpl/t/rpl_start_stop_slave.test.moved. Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_stm_000001.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test Path conflict: Percona-Server/mysql-test/suite/rpl/t/rpl_stm_found_rows.test / Percona-Server/mysql-test/suite/rpl/t/rpl_found_rows.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test Path conflict: Percona-Server/mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test / Percona-Server/mysql-test/suite/rpl/t/rpl_loaddata_concurrent.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_stm_loadfile.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_stm_until.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_stop_slave.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_temp_table.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_temporary.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_temporary_errors.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_timezone.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_trigger.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_typeconv_innodb.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_udf.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_user_variables.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_variables.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_variables_stm.test Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_view.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/delayed_insert_limit_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/delayed_queue_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/join_buffer_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/key_cache_age_threshold_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/key_cache_block_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/key_cache_division_limit_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/log_warnings_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/max_binlog_cache_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/max_connect_errors_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/max_heap_table_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/max_seeks_for_key_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/max_tmp_tables_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/max_write_lock_count_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/min_examined_row_limit_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/myisam_repair_threads_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/net_retry_count_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/query_cache_limit_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/query_cache_min_res_unit_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/range_alloc_block_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/rpl_recovery_rank_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/server_id_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/sync_binlog_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/timestamp_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/inc/wait_timeout_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/auto_commit_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/auto_increment_increment_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/auto_increment_offset_func.result Path conflict: Percona-Server/mysql-test/suite/sys_vars/r/autocommit_basic.result / Percona-Server/mysql-test/suite/sys_vars/r/auto_commit_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/autocommit_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/big_tables_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/character_set_client_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/character_set_client_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/character_set_connection_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/character_set_database_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/character_set_database_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/character_set_results_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/character_set_server_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/collation_database_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/collation_database_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/completion_type_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/concurrent_insert_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/concurrent_insert_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/connect_timeout_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/default_week_format_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/delay_key_write_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/div_precision_increment_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/div_precision_increment_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/event_scheduler_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/expire_logs_days_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/flush_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/foreign_key_checks_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/ft_boolean_syntax_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/general_log_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/general_log_file_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/general_log_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/group_concat_max_len_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/identity_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/init_connect_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_checksums_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result Path conflict: Percona-Server/mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic.result / Percona-Server/mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_file_io_threads_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_locks_unsafe_for_binlog_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result Path conflict: Percona-Server/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic.result / Percona-Server/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_rollback_on_timeout_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result Path conflict: Percona-Server/mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic.result / Percona-Server/mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/insert_id_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/interactive_timeout_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result Path conflict: Percona-Server/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result / Percona-Server/mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/key_buffer_size_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result Path conflict: Percona-Server/mysql-test/suite/sys_vars/r/key_cache_block_size_basic.result / Percona-Server/mysql-test/suite/sys_vars/r/key_cache_block_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/key_cache_block_size_basic_64.result Path conflict: Percona-Server/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic.result / Percona-Server/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/key_cache_division_limit_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/lc_time_names_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/local_infile_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/log_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/log_output_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/log_output_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/log_warnings_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/long_query_time_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/low_priority_updates_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result Path conflict: Percona-Server/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result / Percona-Server/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_connections_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_error_count_basic.result Path conflict: Percona-Server/mysql-test/suite/sys_vars/r/max_heap_table_size_basic.result / Percona-Server/mysql-test/suite/sys_vars/r/max_heap_table_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_heap_table_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_sort_length_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_user_connections_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/myisam_data_pointer_size_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/myisam_stats_method_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/myisam_stats_method_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/myisam_use_mmap_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/net_buffer_length_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/net_read_timeout_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/net_retry_count_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/net_write_timeout_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/new_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/old_passwords_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/query_cache_limit_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/query_cache_type_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result Path conflict: Percona-Server/mysql-test/suite/sys_vars/r/query_prealloc_size_basic.result / Percona-Server/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/read_buffer_size_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/read_only_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/read_only_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/relay_log_purge_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/secure_auth_basic.result Path conflict: Percona-Server/mysql-test/suite/sys_vars/r/server_id_basic.result / Percona-Server/mysql-test/suite/sys_vars/r/server_id_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/server_id_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/slave_allow_batching_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/slave_compressed_protocol_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/slow_query_log_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_auto_is_null_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_big_selects_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_big_selects_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_big_tables_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_log_off_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_log_off_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_max_join_size_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_mode_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_mode_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_notes_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_select_limit_func.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_slave_skip_counter_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sql_warnings_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/storage_engine_basic.result Path conflict: Percona-Server/mysql-test/suite/sys_vars/r/sync_binlog_basic.result / Percona-Server/mysql-test/suite/sys_vars/r/sync_binlog_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sync_binlog_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/sync_frm_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/table_definition_cache_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/table_open_cache_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/timed_mutexes_basic.result Path conflict: Percona-Server/mysql-test/suite/sys_vars/r/timestamp_basic.result / Percona-Server/mysql-test/suite/sys_vars/r/timestamp_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/timestamp_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/tx_isolation_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/unique_checks_basic.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result Path conflict: Percona-Server/mysql-test/suite/sys_vars/r/wait_timeout_basic.result / Percona-Server/mysql-test/suite/sys_vars/r/wait_timeout_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/wait_timeout_basic_64.result Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/auto_commit_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/auto_increment_increment_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/auto_increment_increment_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/auto_increment_offset_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/auto_increment_offset_func.test Path conflict: Percona-Server/mysql-test/suite/sys_vars/t/autocommit_basic.test / Percona-Server/mysql-test/suite/sys_vars/t/auto_commit_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/autocommit_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/big_tables_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/character_set_client_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/character_set_client_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/character_set_connection_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/character_set_database_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/character_set_database_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/character_set_results_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/character_set_server_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/collation_connection_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/collation_database_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/collation_database_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/collation_server_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/completion_type_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/completion_type_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/concurrent_insert_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/concurrent_insert_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/connect_timeout_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/default_week_format_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/delay_key_write_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/delayed_insert_timeout_basic.test Conflict adding file Percona-Server/mysql-test/suite/sys_vars/t/disabled.def. Moved existing file to Percona-Server/mysql-test/suite/sys_vars/t/disabled.def.moved. Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/div_precision_increment_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/div_precision_increment_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/event_scheduler_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/expire_logs_days_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/flush_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/foreign_key_checks_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/ft_boolean_syntax_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/ft_boolean_syntax_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/general_log_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/general_log_file_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/general_log_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/group_concat_max_len_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/identity_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/identity_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/init_connect_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_checksums_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_commit_concurrency_basic.test Path conflict: Percona-Server/mysql-test/suite/sys_vars/t/innodb_concurrency_tickets_basic.test / Percona-Server/mysql-test/suite/sys_vars/inc/innodb_concurrency_tickets_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_file_io_threads_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_locks_unsafe_for_binlog_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test Path conflict: Percona-Server/mysql-test/suite/sys_vars/t/innodb_max_purge_lag_basic.test / Percona-Server/mysql-test/suite/sys_vars/inc/innodb_max_purge_lag_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_rollback_on_timeout_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test Path conflict: Percona-Server/mysql-test/suite/sys_vars/t/innodb_sync_spin_loops_basic.test / Percona-Server/mysql-test/suite/sys_vars/inc/innodb_sync_spin_loops_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/insert_id_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/interactive_timeout_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test Path conflict: Percona-Server/mysql-test/suite/sys_vars/t/key_buffer_size_basic.test / Percona-Server/mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/key_buffer_size_func.test Path conflict: Percona-Server/mysql-test/suite/sys_vars/t/key_cache_block_size_basic.test / Percona-Server/mysql-test/suite/sys_vars/inc/key_cache_block_size_basic.inc Path conflict: Percona-Server/mysql-test/suite/sys_vars/t/key_cache_division_limit_basic.test / Percona-Server/mysql-test/suite/sys_vars/inc/key_cache_division_limit_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/last_insert_id_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/lc_time_names_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/local_infile_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/log_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/log_output_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/log_output_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/long_query_time_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/low_priority_updates_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test Path conflict: Percona-Server/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.test / Percona-Server/mysql-test/suite/sys_vars/inc/max_binlog_cache_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/max_binlog_size_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/max_connections_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/max_error_count_basic.test Path conflict: Percona-Server/mysql-test/suite/sys_vars/t/max_heap_table_size_basic.test / Percona-Server/mysql-test/suite/sys_vars/inc/max_heap_table_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/max_insert_delayed_threads_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/max_length_for_sort_data_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/max_prepared_stmt_count_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/max_relay_log_size_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/max_sort_length_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/max_sp_recursion_depth_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/max_user_connections_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/myisam_data_pointer_size_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/myisam_data_pointer_size_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/myisam_stats_method_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/myisam_use_mmap_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/ndb_log_update_as_write_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/ndb_log_updated_only_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/net_buffer_length_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/net_read_timeout_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/net_write_timeout_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/new_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/old_passwords_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/optimizer_search_depth_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/preload_buffer_size_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/query_cache_type_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test Path conflict: Percona-Server/mysql-test/suite/sys_vars/t/query_prealloc_size_basic.test / Percona-Server/mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/read_buffer_size_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/read_only_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/read_rnd_buffer_size_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/relay_log_purge_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/rpl_init_slave_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/secure_auth_basic.test Path conflict: Percona-Server/mysql-test/suite/sys_vars/t/server_id_basic.test / Percona-Server/mysql-test/suite/sys_vars/inc/server_id_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/slave_allow_batching_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/slave_compressed_protocol_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/slave_exec_mode_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/slave_net_timeout_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/slow_launch_time_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/slow_launch_time_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/slow_query_log_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_auto_is_null_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_big_selects_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_big_tables_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_log_off_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_mode_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_notes_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_select_limit_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_slave_skip_counter_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sql_warnings_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/storage_engine_basic.test Path conflict: Percona-Server/mysql-test/suite/sys_vars/t/sync_binlog_basic.test / Percona-Server/mysql-test/suite/sys_vars/inc/sync_binlog_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/sync_frm_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/table_definition_cache_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/table_open_cache_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/thread_cache_size_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/timed_mutexes_basic.test Path conflict: Percona-Server/mysql-test/suite/sys_vars/t/timestamp_basic.test / Percona-Server/mysql-test/suite/sys_vars/inc/timestamp_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/tx_isolation_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/tx_isolation_func.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/unique_checks_basic.test Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/updatable_views_with_limit_basic.test Path conflict: Percona-Server/mysql-test/suite/sys_vars/t/wait_timeout_basic.test / Percona-Server/mysql-test/suite/sys_vars/inc/wait_timeout_basic.inc Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/wait_timeout_func.test Text conflict in Percona-Server/mysql-test/t/alias.test Text conflict in Percona-Server/mysql-test/t/alter_table-big.test Text conflict in Percona-Server/mysql-test/t/alter_table.test Text conflict in Percona-Server/mysql-test/t/archive.test Text conflict in Percona-Server/mysql-test/t/auto_increment.test Text conflict in Percona-Server/mysql-test/t/bigint.test Text conflict in Percona-Server/mysql-test/t/bootstrap.test Text conflict in Percona-Server/mysql-test/t/bug46080-master.opt Text conflict in Percona-Server/mysql-test/t/bug46080.test Text conflict in Percona-Server/mysql-test/t/bug46261.test Text conflict in Percona-Server/mysql-test/t/bug46760.test Text conflict in Percona-Server/mysql-test/t/bug47671-master.opt Text conflict in Percona-Server/mysql-test/t/cache_innodb.test Text conflict in Percona-Server/mysql-test/t/case.test Text conflict in Percona-Server/mysql-test/t/cast.test Text conflict in Percona-Server/mysql-test/t/change_user.test Text conflict in Percona-Server/mysql-test/t/check.test Text conflict in Percona-Server/mysql-test/t/commit_1innodb.test Text conflict in Percona-Server/mysql-test/t/connect.test Text conflict in Percona-Server/mysql-test/t/constraints.test Text conflict in Percona-Server/mysql-test/t/count_distinct.test Text conflict in Percona-Server/mysql-test/t/count_distinct2-master.opt Text conflict in Percona-Server/mysql-test/t/crash_commit_before-master.opt Text conflict in Percona-Server/mysql-test/t/create-big.test Text conflict in Percona-Server/mysql-test/t/create.test Text conflict in Percona-Server/mysql-test/t/create_select_tmp.test Text conflict in Percona-Server/mysql-test/t/csv.test Text conflict in Percona-Server/mysql-test/t/ctype_big5.test Text conflict in Percona-Server/mysql-test/t/ctype_collate.test Text conflict in Percona-Server/mysql-test/t/ctype_cp1250_ch.test Text conflict in Percona-Server/mysql-test/t/ctype_cp1251.test Text conflict in Percona-Server/mysql-test/t/ctype_cp932_binlog_stm.test Text conflict in Percona-Server/mysql-test/t/ctype_eucjpms.test Text conflict in Percona-Server/mysql-test/t/ctype_euckr.test Text conflict in Percona-Server/mysql-test/t/ctype_gb2312.test Text conflict in Percona-Server/mysql-test/t/ctype_gbk.test Text conflict in Percona-Server/mysql-test/t/ctype_latin1.test Text conflict in Percona-Server/mysql-test/t/ctype_latin1_de-master.opt Text conflict in Percona-Server/mysql-test/t/ctype_ldml.test Text conflict in Percona-Server/mysql-test/t/ctype_many.test Text conflict in Percona-Server/mysql-test/t/ctype_sjis.test Text conflict in Percona-Server/mysql-test/t/ctype_uca.test Text conflict in Percona-Server/mysql-test/t/ctype_ucs.test Text conflict in Percona-Server/mysql-test/t/ctype_ucs2_def-master.opt Text conflict in Percona-Server/mysql-test/t/ctype_ujis.test Text conflict in Percona-Server/mysql-test/t/ctype_utf8.test Text conflict in Percona-Server/mysql-test/t/date_formats.test Text conflict in Percona-Server/mysql-test/t/ddl_i18n_koi8r.test Text conflict in Percona-Server/mysql-test/t/ddl_i18n_utf8.test Text conflict in Percona-Server/mysql-test/t/debug_sync.test Text conflict in Percona-Server/mysql-test/t/delayed.test Text conflict in Percona-Server/mysql-test/t/delete.test Text conflict in Percona-Server/mysql-test/t/derived.test Text conflict in Percona-Server/mysql-test/t/dirty_close.test Text conflict in Percona-Server/mysql-test/t/disabled.def Text conflict in Percona-Server/mysql-test/t/distinct.test Text conflict in Percona-Server/mysql-test/t/drop.test Text conflict in Percona-Server/mysql-test/t/endspace.test Text conflict in Percona-Server/mysql-test/t/errors.test Text conflict in Percona-Server/mysql-test/t/events_2.test Text conflict in Percona-Server/mysql-test/t/events_bugs.test Text conflict in Percona-Server/mysql-test/t/events_restart.test Text conflict in Percona-Server/mysql-test/t/events_trans.test Text conflict in Percona-Server/mysql-test/t/execution_constants.test Text conflict in Percona-Server/mysql-test/t/explain.test Text conflict in Percona-Server/mysql-test/t/fix_priv_tables.test Text conflict in Percona-Server/mysql-test/t/flush.test Text conflict in Percona-Server/mysql-test/t/flush_block_commit.test Text conflict in Percona-Server/mysql-test/t/flush_block_commit_notembedded.test Text conflict in Percona-Server/mysql-test/t/flush_read_lock_kill.test Text conflict in Percona-Server/mysql-test/t/flush_table.test Text conflict in Percona-Server/mysql-test/t/foreign_key.test Text conflict in Percona-Server/mysql-test/t/fulltext.test Text conflict in Percona-Server/mysql-test/t/fulltext_plugin.test Path conflict: Percona-Server/mysql-test/t/func_analyse.test / Percona-Server/mysql-test/t/analyse.test Text conflict in Percona-Server/mysql-test/t/func_des_encrypt.test Text conflict in Percona-Server/mysql-test/t/func_encrypt.test Text conflict in Percona-Server/mysql-test/t/func_encrypt_ucs2.test Text conflict in Percona-Server/mysql-test/t/func_gconcat.test Text conflict in Percona-Server/mysql-test/t/func_group.test Text conflict in Percona-Server/mysql-test/t/func_group_innodb.test Text conflict in Percona-Server/mysql-test/t/func_if.test Text conflict in Percona-Server/mysql-test/t/func_in.test Text conflict in Percona-Server/mysql-test/t/func_isnull.test Text conflict in Percona-Server/mysql-test/t/func_math.test Text conflict in Percona-Server/mysql-test/t/func_misc.test Text conflict in Percona-Server/mysql-test/t/func_sapdb.test Text conflict in Percona-Server/mysql-test/t/func_set.test Text conflict in Percona-Server/mysql-test/t/func_str.test Text conflict in Percona-Server/mysql-test/t/func_test.test Text conflict in Percona-Server/mysql-test/t/func_time.test Text conflict in Percona-Server/mysql-test/t/gis.test Text conflict in Percona-Server/mysql-test/t/grant.test Text conflict in Percona-Server/mysql-test/t/grant2.test Text conflict in Percona-Server/mysql-test/t/group_by.test Text conflict in Percona-Server/mysql-test/t/group_min_max.test Text conflict in Percona-Server/mysql-test/t/group_min_max_innodb.test Text conflict in Percona-Server/mysql-test/t/heap_hash.test Text conflict in Percona-Server/mysql-test/t/implicit_char_to_num_conversion.test Text conflict in Percona-Server/mysql-test/t/index_merge_innodb.test Text conflict in Percona-Server/mysql-test/t/index_merge_myisam.test Text conflict in Percona-Server/mysql-test/t/information_schema.test Text conflict in Percona-Server/mysql-test/t/information_schema_db.test Text conflict in Percona-Server/mysql-test/t/information_schema_inno.test Text conflict in Percona-Server/mysql-test/t/init_connect-master.opt Text conflict in Percona-Server/mysql-test/t/innodb_ignore_builtin-master.opt Text conflict in Percona-Server/mysql-test/t/innodb_ignore_builtin.test Text conflict in Percona-Server/mysql-test/t/innodb_mysql_lock2.test Text conflict in Percona-Server/mysql-test/t/insert.test Text conflict in Percona-Server/mysql-test/t/insert_notembedded.test Text conflict in Percona-Server/mysql-test/t/join_outer.test Text conflict in Percona-Server/mysql-test/t/join_outer_innodb.test Text conflict in Percona-Server/mysql-test/t/key_cache.test Text conflict in Percona-Server/mysql-test/t/keywords.test Text conflict in Percona-Server/mysql-test/t/kill.test Text conflict in Percona-Server/mysql-test/t/loaddata.test Text conflict in Percona-Server/mysql-test/t/locale.test Text conflict in Percona-Server/mysql-test/t/lock.test Text conflict in Percona-Server/mysql-test/t/lock_multi.test Text conflict in Percona-Server/mysql-test/t/lock_sync.test Text conflict in Percona-Server/mysql-test/t/log_state.test Text conflict in Percona-Server/mysql-test/t/log_tables-big-master.opt Text conflict in Percona-Server/mysql-test/t/log_tables.test Text conflict in Percona-Server/mysql-test/t/log_tables_debug.test Text conflict in Percona-Server/mysql-test/t/lowercase_fs_off.test Text conflict in Percona-Server/mysql-test/t/lowercase_table2.test Text conflict in Percona-Server/mysql-test/t/lowercase_table4.test Text conflict in Percona-Server/mysql-test/t/merge-big.test Text conflict in Percona-Server/mysql-test/t/merge.test Text conflict in Percona-Server/mysql-test/t/metadata.test Text conflict in Percona-Server/mysql-test/t/multi_update-master.opt Text conflict in Percona-Server/mysql-test/t/multi_update.test Text conflict in Percona-Server/mysql-test/t/multi_update2-master.opt Text conflict in Percona-Server/mysql-test/t/multi_update_tiny_hash-master.opt Text conflict in Percona-Server/mysql-test/t/myisam.test Text conflict in Percona-Server/mysql-test/t/myisam_crash_before_flush_keys.test Text conflict in Percona-Server/mysql-test/t/myisampack.test Text conflict in Percona-Server/mysql-test/t/mysql.test Text conflict in Percona-Server/mysql-test/t/mysql_client_test-master.opt Text conflict in Percona-Server/mysql-test/t/mysql_client_test.test Text conflict in Percona-Server/mysql-test/t/mysql_upgrade.test Text conflict in Percona-Server/mysql-test/t/mysqladmin.test Text conflict in Percona-Server/mysql-test/t/mysqlbinlog.test Text conflict in Percona-Server/mysql-test/t/mysqlbinlog2.test Text conflict in Percona-Server/mysql-test/t/mysqlcheck.test Text conflict in Percona-Server/mysql-test/t/mysqldump.test Text conflict in Percona-Server/mysql-test/t/mysqlshow.test Text conflict in Percona-Server/mysql-test/t/mysqltest.test Text conflict in Percona-Server/mysql-test/t/named_pipe.test Text conflict in Percona-Server/mysql-test/t/no-threads.test Text conflict in Percona-Server/mysql-test/t/not_embedded_server.test Text conflict in Percona-Server/mysql-test/t/not_partition.test Text conflict in Percona-Server/mysql-test/t/odbc.test Text conflict in Percona-Server/mysql-test/t/openssl_1.test Text conflict in Percona-Server/mysql-test/t/order_by.test Text conflict in Percona-Server/mysql-test/t/order_fill_sortbuf-master.opt Text conflict in Percona-Server/mysql-test/t/outfile.test Text conflict in Percona-Server/mysql-test/t/parser.test Text conflict in Percona-Server/mysql-test/t/parser_not_embedded.test Text conflict in Percona-Server/mysql-test/t/parser_stack.test Text conflict in Percona-Server/mysql-test/t/partition.test Text conflict in Percona-Server/mysql-test/t/partition_archive.test Text conflict in Percona-Server/mysql-test/t/partition_binlog_stmt.test Text conflict in Percona-Server/mysql-test/t/partition_datatype.test Text conflict in Percona-Server/mysql-test/t/partition_debug_sync.test Text conflict in Percona-Server/mysql-test/t/partition_error.test Text conflict in Percona-Server/mysql-test/t/partition_innodb.test Text conflict in Percona-Server/mysql-test/t/partition_innodb_plugin.test Text conflict in Percona-Server/mysql-test/t/partition_innodb_semi_consistent-master.opt Text conflict in Percona-Server/mysql-test/t/partition_innodb_semi_consistent.test Text conflict in Percona-Server/mysql-test/t/partition_innodb_stmt.test Text conflict in Percona-Server/mysql-test/t/partition_list.test Text conflict in Percona-Server/mysql-test/t/partition_mgm_err.test Text conflict in Percona-Server/mysql-test/t/partition_myisam.test Text conflict in Percona-Server/mysql-test/t/partition_pruning.test Text conflict in Percona-Server/mysql-test/t/partition_range.test Text conflict in Percona-Server/mysql-test/t/partition_symlink.test Conflict adding file Percona-Server/mysql-test/t/percona_bug45702.test. Moved existing file to Percona-Server/mysql-test/t/percona_bug45702.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_bug643149.test. Moved existing file to Percona-Server/mysql-test/t/percona_bug643149.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_bug933969.test. Moved existing file to Percona-Server/mysql-test/t/percona_bug933969.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_innodb_buffer_pool_shm-master.opt. Moved existing file to Percona-Server/mysql-test/t/percona_innodb_buffer_pool_shm-master.opt.moved. Conflict adding file Percona-Server/mysql-test/t/percona_innodb_buffer_pool_shm.test. Moved existing file to Percona-Server/mysql-test/t/percona_innodb_buffer_pool_shm.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_innodb_deadlock_count.test. Moved existing file to Percona-Server/mysql-test/t/percona_innodb_deadlock_count.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_innodb_doublewrite_file-master.opt. Moved existing file to Percona-Server/mysql-test/t/percona_innodb_doublewrite_file-master.opt.moved. Conflict adding file Percona-Server/mysql-test/t/percona_innodb_doublewrite_file.test. Moved existing file to Percona-Server/mysql-test/t/percona_innodb_doublewrite_file.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_innodb_expand_fast_index_creation.test. Moved existing file to Percona-Server/mysql-test/t/percona_innodb_expand_fast_index_creation.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_innodb_fake_changes.test. Moved existing file to Percona-Server/mysql-test/t/percona_innodb_fake_changes.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_innodb_fake_changes_locks.test. Moved existing file to Percona-Server/mysql-test/t/percona_innodb_fake_changes_locks.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx.test. Moved existing file to Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx_locks.test. Moved existing file to Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx_locks.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_innodb_use_sys_stats_table-master.opt. Moved existing file to Percona-Server/mysql-test/t/percona_innodb_use_sys_stats_table-master.opt.moved. Conflict adding file Percona-Server/mysql-test/t/percona_innodb_use_sys_stats_table.test. Moved existing file to Percona-Server/mysql-test/t/percona_innodb_use_sys_stats_table.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_innodb_version.test. Moved existing file to Percona-Server/mysql-test/t/percona_innodb_version.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_connection_error-master.opt. Moved existing file to Percona-Server/mysql-test/t/percona_log_connection_error-master.opt.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_connection_error.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_connection_error.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config.cnf. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config.cnf.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_false.cnf. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_false.cnf.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_false.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_false.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_foo.cnf. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_foo.cnf.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_foo.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_foo.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_true.cnf. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_true.cnf.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_true.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_true.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_admin_statements.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_admin_statements.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_filter-cl-master.opt. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_filter-cl-master.opt.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_filter-cl.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_filter-cl.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_filter.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_filter.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_slave_statements-cl-master.opt. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_slave_statements-cl-master.opt.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_slave_statements-cl.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_slave_statements-cl.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_slave_statements-innodb-slave.opt. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_slave_statements-innodb-slave.opt.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_slave_statements-innodb.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_slave_statements-innodb.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_slave_statements-slave.opt. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_slave_statements-slave.opt.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_slave_statements.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_slave_statements.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_sp_statements-cl-master.opt. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_sp_statements-cl-master.opt.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_sp_statements-cl.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_sp_statements-cl.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_sp_statements.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_sp_statements.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl-master.opt. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl-master.opt.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_log_slow_verbosity.test. Moved existing file to Percona-Server/mysql-test/t/percona_log_slow_verbosity.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_long_query_time.test. Moved existing file to Percona-Server/mysql-test/t/percona_long_query_time.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_min_examined_row_limit.test. Moved existing file to Percona-Server/mysql-test/t/percona_min_examined_row_limit.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_mysqldump_innodb_optimize_keys.test. Moved existing file to Percona-Server/mysql-test/t/percona_mysqldump_innodb_optimize_keys.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_query_cache_with_comments.test. Moved existing file to Percona-Server/mysql-test/t/percona_query_cache_with_comments.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_query_cache_with_comments_crash.test. Moved existing file to Percona-Server/mysql-test/t/percona_query_cache_with_comments_crash.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_query_cache_with_comments_disable.test. Moved existing file to Percona-Server/mysql-test/t/percona_query_cache_with_comments_disable.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_query_cache_with_comments_prepared_statements.test. Moved existing file to Percona-Server/mysql-test/t/percona_query_cache_with_comments_prepared_statements.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_query_response_time-replication.test. Moved existing file to Percona-Server/mysql-test/t/percona_query_response_time-replication.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_query_response_time-stored.test. Moved existing file to Percona-Server/mysql-test/t/percona_query_response_time-stored.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_query_response_time.test. Moved existing file to Percona-Server/mysql-test/t/percona_query_response_time.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_server_variables_debug.test. Moved existing file to Percona-Server/mysql-test/t/percona_server_variables_debug.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_server_variables_release.test. Moved existing file to Percona-Server/mysql-test/t/percona_server_variables_release.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_show_slave_status_nolock.test. Moved existing file to Percona-Server/mysql-test/t/percona_show_slave_status_nolock.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_show_temp_tables.test. Moved existing file to Percona-Server/mysql-test/t/percona_show_temp_tables.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_sql_no_fcache.test. Moved existing file to Percona-Server/mysql-test/t/percona_sql_no_fcache.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_status_wait_query_cache_mutex.test. Moved existing file to Percona-Server/mysql-test/t/percona_status_wait_query_cache_mutex.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_ucs2_general50_ci.test. Moved existing file to Percona-Server/mysql-test/t/percona_ucs2_general50_ci.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_utf8_general50_ci.test. Moved existing file to Percona-Server/mysql-test/t/percona_utf8_general50_ci.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_xtradb_admin_command.test. Moved existing file to Percona-Server/mysql-test/t/percona_xtradb_admin_command.test.moved. Conflict adding file Percona-Server/mysql-test/t/percona_xtradb_bug317074.test. Moved existing file to Percona-Server/mysql-test/t/percona_xtradb_bug317074.test.moved. Text conflict in Percona-Server/mysql-test/t/perror.test Text conflict in Percona-Server/mysql-test/t/plugin.test Text conflict in Percona-Server/mysql-test/t/plugin_not_embedded.test Text conflict in Percona-Server/mysql-test/t/profiling.test Text conflict in Percona-Server/mysql-test/t/ps-master.opt Text conflict in Percona-Server/mysql-test/t/ps.test Text conflict in Percona-Server/mysql-test/t/ps_1general.test Text conflict in Percona-Server/mysql-test/t/ps_3innodb.test Text conflict in Percona-Server/mysql-test/t/ps_ddl.test Text conflict in Percona-Server/mysql-test/t/ps_ddl1.test Text conflict in Percona-Server/mysql-test/t/ps_not_windows.test Text conflict in Percona-Server/mysql-test/t/query_cache.test Text conflict in Percona-Server/mysql-test/t/query_cache_28249.test Text conflict in Percona-Server/mysql-test/t/query_cache_debug.test Conflict adding file Percona-Server/mysql-test/t/query_cache_disabled-master.opt. Moved existing file to Percona-Server/mysql-test/t/query_cache_disabled-master.opt.moved. Conflict adding file Percona-Server/mysql-test/t/query_cache_disabled.test. Moved existing file to Percona-Server/mysql-test/t/query_cache_disabled.test.moved. Text conflict in Percona-Server/mysql-test/t/query_cache_notembedded.test Text conflict in Percona-Server/mysql-test/t/read_only_innodb.test Text conflict in Percona-Server/mysql-test/t/rename.test Text conflict in Percona-Server/mysql-test/t/repair.test Text conflict in Percona-Server/mysql-test/t/schema.test Text conflict in Percona-Server/mysql-test/t/select.test Text conflict in Percona-Server/mysql-test/t/select_safe.test Text conflict in Percona-Server/mysql-test/t/shm.test Text conflict in Percona-Server/mysql-test/t/show_check-master.opt Text conflict in Percona-Server/mysql-test/t/show_check.test Text conflict in Percona-Server/mysql-test/t/skip_name_resolve.test Text conflict in Percona-Server/mysql-test/t/sp-bugs.test Text conflict in Percona-Server/mysql-test/t/sp-code.test Text conflict in Percona-Server/mysql-test/t/sp-destruct.test Text conflict in Percona-Server/mysql-test/t/sp-error.test Text conflict in Percona-Server/mysql-test/t/sp-security.test Text conflict in Percona-Server/mysql-test/t/sp-threads.test Text conflict in Percona-Server/mysql-test/t/sp-ucs2.test Text conflict in Percona-Server/mysql-test/t/sp-vars.test Text conflict in Percona-Server/mysql-test/t/sp.test Text conflict in Percona-Server/mysql-test/t/sp_notembedded.test Text conflict in Percona-Server/mysql-test/t/sp_sync.test Text conflict in Percona-Server/mysql-test/t/sp_trans.test Text conflict in Percona-Server/mysql-test/t/sp_trans_log.test Text conflict in Percona-Server/mysql-test/t/sql_mode.test Text conflict in Percona-Server/mysql-test/t/ssl-big.test Text conflict in Percona-Server/mysql-test/t/ssl.test Text conflict in Percona-Server/mysql-test/t/ssl_8k_key.test Text conflict in Percona-Server/mysql-test/t/ssl_compress.test Text conflict in Percona-Server/mysql-test/t/ssl_connect.test Text conflict in Percona-Server/mysql-test/t/status.test Text conflict in Percona-Server/mysql-test/t/strict.test Text conflict in Percona-Server/mysql-test/t/subselect.test Text conflict in Percona-Server/mysql-test/t/subselect3.test Text conflict in Percona-Server/mysql-test/t/subselect4.test Text conflict in Percona-Server/mysql-test/t/subselect_innodb.test Text conflict in Percona-Server/mysql-test/t/symlink.test Text conflict in Percona-Server/mysql-test/t/system_mysql_db_fix40123.test Text conflict in Percona-Server/mysql-test/t/system_mysql_db_fix50030.test Text conflict in Percona-Server/mysql-test/t/system_mysql_db_fix50117.test Text conflict in Percona-Server/mysql-test/t/temp_table.test Text conflict in Percona-Server/mysql-test/t/trigger-compat.test Text conflict in Percona-Server/mysql-test/t/trigger-trans.test Text conflict in Percona-Server/mysql-test/t/trigger.test Text conflict in Percona-Server/mysql-test/t/trigger_notembedded.test Text conflict in Percona-Server/mysql-test/t/truncate.test Text conflict in Percona-Server/mysql-test/t/type_blob.test Text conflict in Percona-Server/mysql-test/t/type_date.test Text conflict in Percona-Server/mysql-test/t/type_datetime.test Text conflict in Percona-Server/mysql-test/t/type_decimal.test Text conflict in Percona-Server/mysql-test/t/type_float.test Text conflict in Percona-Server/mysql-test/t/type_newdecimal.test Text conflict in Percona-Server/mysql-test/t/type_time.test Text conflict in Percona-Server/mysql-test/t/type_timestamp.test Text conflict in Percona-Server/mysql-test/t/type_varchar.test Text conflict in Percona-Server/mysql-test/t/udf.test Text conflict in Percona-Server/mysql-test/t/udf_skip_grants-master.opt Text conflict in Percona-Server/mysql-test/t/union-master.opt Text conflict in Percona-Server/mysql-test/t/union.test Text conflict in Percona-Server/mysql-test/t/user_limits.test Text conflict in Percona-Server/mysql-test/t/user_var.test Conflict adding file Percona-Server/mysql-test/t/userstat_bug602047.test. Moved existing file to Percona-Server/mysql-test/t/userstat_bug602047.test.moved. Text conflict in Percona-Server/mysql-test/t/variables-big.test Text conflict in Percona-Server/mysql-test/t/variables.test Text conflict in Percona-Server/mysql-test/t/variables_community.test Text conflict in Percona-Server/mysql-test/t/variables_debug.test Text conflict in Percona-Server/mysql-test/t/view.test Text conflict in Percona-Server/mysql-test/t/view_grant.test Text conflict in Percona-Server/mysql-test/t/warnings.test Text conflict in Percona-Server/mysql-test/t/xa.test Text conflict in Percona-Server/mysql-test/t/xml.test Text conflict in Percona-Server/mysql-test/valgrind.supp Text conflict in Percona-Server/mysys/CMakeLists.txt Text conflict in Percona-Server/mysys/array.c Text conflict in Percona-Server/mysys/base64.c Text conflict in Percona-Server/mysys/charset-def.c Text conflict in Percona-Server/mysys/charset.c Text conflict in Percona-Server/mysys/checksum.c Text conflict in Percona-Server/mysys/default.c Text conflict in Percona-Server/mysys/errors.c Text conflict in Percona-Server/mysys/hash.c Text conflict in Percona-Server/mysys/list.c Text conflict in Percona-Server/mysys/mf_cache.c Text conflict in Percona-Server/mysys/mf_dirname.c Text conflict in Percona-Server/mysys/mf_fn_ext.c Text conflict in Percona-Server/mysys/mf_format.c Text conflict in Percona-Server/mysys/mf_getdate.c Text conflict in Percona-Server/mysys/mf_iocache.c Text conflict in Percona-Server/mysys/mf_iocache2.c Text conflict in Percona-Server/mysys/mf_keycache.c Text conflict in Percona-Server/mysys/mf_keycaches.c Text conflict in Percona-Server/mysys/mf_loadpath.c Text conflict in Percona-Server/mysys/mf_pack.c Text conflict in Percona-Server/mysys/mf_path.c Text conflict in Percona-Server/mysys/mf_sort.c Text conflict in Percona-Server/mysys/mf_tempdir.c Text conflict in Percona-Server/mysys/mf_tempfile.c Text conflict in Percona-Server/mysys/mf_unixpath.c Text conflict in Percona-Server/mysys/my_alloc.c Conflict adding file Percona-Server/mysys/my_atomic.c. Moved existing file to Percona-Server/mysys/my_atomic.c.moved. Text conflict in Percona-Server/mysys/my_bit.c Text conflict in Percona-Server/mysys/my_bitmap.c Text conflict in Percona-Server/mysys/my_chsize.c Conflict adding file Percona-Server/mysys/my_compare.c. Moved existing file to Percona-Server/mysys/my_compare.c.moved. Text conflict in Percona-Server/mysys/my_compress.c Text conflict in Percona-Server/mysys/my_copy.c Text conflict in Percona-Server/mysys/my_create.c Text conflict in Percona-Server/mysys/my_delete.c Text conflict in Percona-Server/mysys/my_error.c Text conflict in Percona-Server/mysys/my_file.c Text conflict in Percona-Server/mysys/my_fopen.c Text conflict in Percona-Server/mysys/my_fstream.c Text conflict in Percona-Server/mysys/my_gethwaddr.c Text conflict in Percona-Server/mysys/my_getncpus.c Text conflict in Percona-Server/mysys/my_getopt.c Text conflict in Percona-Server/mysys/my_getsystime.c Text conflict in Percona-Server/mysys/my_getwd.c Text conflict in Percona-Server/mysys/my_handler_errors.h Text conflict in Percona-Server/mysys/my_init.c Text conflict in Percona-Server/mysys/my_largepage.c Text conflict in Percona-Server/mysys/my_lib.c Text conflict in Percona-Server/mysys/my_lock.c Text conflict in Percona-Server/mysys/my_lockmem.c Text conflict in Percona-Server/mysys/my_malloc.c Path conflict: Percona-Server/mysys/my_mess.c / Percona-Server/mysys/my_messnc.c Text conflict in Percona-Server/mysys/my_messnc.c Text conflict in Percona-Server/mysys/my_mmap.c Text conflict in Percona-Server/mysys/my_new.cc Text conflict in Percona-Server/mysys/my_once.c Text conflict in Percona-Server/mysys/my_open.c Text conflict in Percona-Server/mysys/my_pread.c Text conflict in Percona-Server/mysys/my_pthread.c Text conflict in Percona-Server/mysys/my_quick.c Text conflict in Percona-Server/mysys/my_read.c Text conflict in Percona-Server/mysys/my_redel.c Text conflict in Percona-Server/mysys/my_rename.c Text conflict in Percona-Server/mysys/my_seek.c Text conflict in Percona-Server/mysys/my_sleep.c Text conflict in Percona-Server/mysys/my_static.c Text conflict in Percona-Server/mysys/my_static.h Text conflict in Percona-Server/mysys/my_symlink.c Text conflict in Percona-Server/mysys/my_sync.c Text conflict in Percona-Server/mysys/my_thr_init.c Text conflict in Percona-Server/mysys/my_wincond.c Text conflict in Percona-Server/mysys/my_windac.c Text conflict in Percona-Server/mysys/my_winthread.c Text conflict in Percona-Server/mysys/my_write.c Text conflict in Percona-Server/mysys/mysys_priv.h Text conflict in Percona-Server/mysys/ptr_cmp.c Text conflict in Percona-Server/mysys/queues.c Text conflict in Percona-Server/mysys/rijndael.c Text conflict in Percona-Server/mysys/stacktrace.c Text conflict in Percona-Server/mysys/string.c Text conflict in Percona-Server/mysys/test_charset.c Text conflict in Percona-Server/mysys/testhash.c Text conflict in Percona-Server/mysys/thr_alarm.c Text conflict in Percona-Server/mysys/thr_lock.c Text conflict in Percona-Server/mysys/thr_mutex.c Text conflict in Percona-Server/mysys/thr_rwlock.c Text conflict in Percona-Server/mysys/tree.c Text conflict in Percona-Server/mysys/typelib.c Conflict adding file Percona-Server/patch_info. Moved existing file to Percona-Server/patch_info.moved. Text conflict in Percona-Server/plugin/daemon_example/daemon_example.cc Text conflict in Percona-Server/plugin/fulltext/plugin_example.c Text conflict in Percona-Server/regex/CMakeLists.txt Text conflict in Percona-Server/regex/regcomp.c Text conflict in Percona-Server/regex/regcomp.ih Text conflict in Percona-Server/regex/regex2.h Text conflict in Percona-Server/scripts/CMakeLists.txt Text conflict in Percona-Server/scripts/mysql_config.pl.in Text conflict in Percona-Server/scripts/mysql_config.sh Text conflict in Percona-Server/scripts/mysql_install_db.sh Text conflict in Percona-Server/scripts/mysql_system_tables.sql Text conflict in Percona-Server/scripts/mysql_system_tables_data.sql Text conflict in Percona-Server/scripts/mysql_system_tables_fix.sql Text conflict in Percona-Server/scripts/mysqld_multi.sh Text conflict in Percona-Server/scripts/mysqld_safe.sh Text conflict in Percona-Server/scripts/mysqldumpslow.sh Text conflict in Percona-Server/scripts/mysqlhotcopy.sh Text conflict in Percona-Server/sql-bench/Comments/mysql.benchmark Text conflict in Percona-Server/sql-bench/compare-results.sh Text conflict in Percona-Server/sql-common/client.c Text conflict in Percona-Server/sql-common/my_time.c Text conflict in Percona-Server/sql-common/my_user.c Text conflict in Percona-Server/sql/CMakeLists.txt Text conflict in Percona-Server/sql/add_errmsg Text conflict in Percona-Server/sql/authors.h Text conflict in Percona-Server/sql/client_settings.h Text conflict in Percona-Server/sql/contributors.h Text conflict in Percona-Server/sql/debug_sync.cc Text conflict in Percona-Server/sql/debug_sync.h Text conflict in Percona-Server/sql/derror.cc Text conflict in Percona-Server/sql/des_key_file.cc Text conflict in Percona-Server/sql/discover.cc Text conflict in Percona-Server/sql/event_data_objects.cc Text conflict in Percona-Server/sql/event_data_objects.h Text conflict in Percona-Server/sql/event_db_repository.cc Text conflict in Percona-Server/sql/event_db_repository.h Text conflict in Percona-Server/sql/event_parse_data.cc Text conflict in Percona-Server/sql/event_parse_data.h Text conflict in Percona-Server/sql/event_queue.cc Text conflict in Percona-Server/sql/event_queue.h Text conflict in Percona-Server/sql/event_scheduler.cc Text conflict in Percona-Server/sql/event_scheduler.h Text conflict in Percona-Server/sql/events.cc Text conflict in Percona-Server/sql/events.h Text conflict in Percona-Server/sql/examples/CMakeLists.txt Text conflict in Percona-Server/sql/field.cc Text conflict in Percona-Server/sql/field.h Text conflict in Percona-Server/sql/field_conv.cc Text conflict in Percona-Server/sql/filesort.cc Text conflict in Percona-Server/sql/frm_crypt.cc Text conflict in Percona-Server/sql/gen_lex_hash.cc Text conflict in Percona-Server/sql/gstream.cc Text conflict in Percona-Server/sql/gstream.h Text conflict in Percona-Server/sql/ha_ndbcluster.cc Text conflict in Percona-Server/sql/ha_ndbcluster.h Text conflict in Percona-Server/sql/ha_ndbcluster_binlog.cc Text conflict in Percona-Server/sql/ha_ndbcluster_binlog.h Text conflict in Percona-Server/sql/ha_ndbcluster_cond.cc Text conflict in Percona-Server/sql/ha_ndbcluster_cond.h Text conflict in Percona-Server/sql/ha_ndbcluster_tables.h Text conflict in Percona-Server/sql/ha_partition.cc Text conflict in Percona-Server/sql/ha_partition.h Text conflict in Percona-Server/sql/handler.cc Text conflict in Percona-Server/sql/handler.h Text conflict in Percona-Server/sql/hash_filo.cc Text conflict in Percona-Server/sql/hash_filo.h Text conflict in Percona-Server/sql/hostname.cc Text conflict in Percona-Server/sql/init.cc Text conflict in Percona-Server/sql/item.cc Text conflict in Percona-Server/sql/item.h Text conflict in Percona-Server/sql/item_buff.cc Text conflict in Percona-Server/sql/item_cmpfunc.cc Text conflict in Percona-Server/sql/item_cmpfunc.h Text conflict in Percona-Server/sql/item_create.cc Text conflict in Percona-Server/sql/item_create.h Text conflict in Percona-Server/sql/item_func.cc Text conflict in Percona-Server/sql/item_func.h Text conflict in Percona-Server/sql/item_geofunc.cc Text conflict in Percona-Server/sql/item_geofunc.h Text conflict in Percona-Server/sql/item_row.cc Text conflict in Percona-Server/sql/item_row.h Text conflict in Percona-Server/sql/item_strfunc.cc Text conflict in Percona-Server/sql/item_strfunc.h Text conflict in Percona-Server/sql/item_subselect.cc Text conflict in Percona-Server/sql/item_subselect.h Text conflict in Percona-Server/sql/item_sum.cc Text conflict in Percona-Server/sql/item_sum.h Text conflict in Percona-Server/sql/item_timefunc.cc Text conflict in Percona-Server/sql/item_timefunc.h Text conflict in Percona-Server/sql/item_xmlfunc.cc Text conflict in Percona-Server/sql/item_xmlfunc.h Text conflict in Percona-Server/sql/key.cc Text conflict in Percona-Server/sql/lex.h Text conflict in Percona-Server/sql/lock.cc Text conflict in Percona-Server/sql/log.cc Text conflict in Percona-Server/sql/log.h Text conflict in Percona-Server/sql/log_event.cc Text conflict in Percona-Server/sql/log_event.h Text conflict in Percona-Server/sql/log_event_old.cc Text conflict in Percona-Server/sql/message.h Text conflict in Percona-Server/sql/mf_iocache.cc Text conflict in Percona-Server/sql/my_decimal.cc Text conflict in Percona-Server/sql/my_decimal.h Text conflict in Percona-Server/sql/mysql_priv.h Text conflict in Percona-Server/sql/mysqld.cc Text conflict in Percona-Server/sql/mysqld_suffix.h Text conflict in Percona-Server/sql/net_serv.cc Text conflict in Percona-Server/sql/nt_servc.cc Text conflict in Percona-Server/sql/nt_servc.h Text conflict in Percona-Server/sql/opt_range.cc Text conflict in Percona-Server/sql/opt_range.h Text conflict in Percona-Server/sql/opt_sum.cc Text conflict in Percona-Server/sql/parse_file.cc Text conflict in Percona-Server/sql/parse_file.h Text conflict in Percona-Server/sql/partition_element.h Text conflict in Percona-Server/sql/partition_info.cc Text conflict in Percona-Server/sql/partition_info.h Text conflict in Percona-Server/sql/password.c Text conflict in Percona-Server/sql/procedure.cc Text conflict in Percona-Server/sql/procedure.h Text conflict in Percona-Server/sql/protocol.cc Text conflict in Percona-Server/sql/protocol.h Conflict adding file Percona-Server/sql/query_response_time.cc. Moved existing file to Percona-Server/sql/query_response_time.cc.moved. Conflict adding file Percona-Server/sql/query_response_time.h. Moved existing file to Percona-Server/sql/query_response_time.h.moved. Conflict adding file Percona-Server/sql/query_strip_comments.h. Moved existing file to Percona-Server/sql/query_strip_comments.h.moved. Text conflict in Percona-Server/sql/records.cc Text conflict in Percona-Server/sql/repl_failsafe.cc Text conflict in Percona-Server/sql/repl_failsafe.h Text conflict in Percona-Server/sql/rpl_filter.cc Text conflict in Percona-Server/sql/rpl_filter.h Text conflict in Percona-Server/sql/rpl_injector.cc Text conflict in Percona-Server/sql/rpl_injector.h Text conflict in Percona-Server/sql/rpl_mi.cc Text conflict in Percona-Server/sql/rpl_mi.h Text conflict in Percona-Server/sql/rpl_record.cc Text conflict in Percona-Server/sql/rpl_record.h Text conflict in Percona-Server/sql/rpl_record_old.cc Text conflict in Percona-Server/sql/rpl_record_old.h Text conflict in Percona-Server/sql/rpl_reporting.cc Text conflict in Percona-Server/sql/rpl_reporting.h Text conflict in Percona-Server/sql/rpl_rli.cc Text conflict in Percona-Server/sql/rpl_rli.h Text conflict in Percona-Server/sql/rpl_tblmap.cc Text conflict in Percona-Server/sql/rpl_tblmap.h Text conflict in Percona-Server/sql/rpl_utility.cc Text conflict in Percona-Server/sql/rpl_utility.h Text conflict in Percona-Server/sql/scheduler.cc Text conflict in Percona-Server/sql/scheduler.h Text conflict in Percona-Server/sql/set_var.cc Text conflict in Percona-Server/sql/set_var.h Text conflict in Percona-Server/sql/signal_handler.cc Text conflict in Percona-Server/sql/slave.cc Text conflict in Percona-Server/sql/slave.h Text conflict in Percona-Server/sql/sp.cc Text conflict in Percona-Server/sql/sp.h Text conflict in Percona-Server/sql/sp_cache.cc Text conflict in Percona-Server/sql/sp_cache.h Text conflict in Percona-Server/sql/sp_head.cc Text conflict in Percona-Server/sql/sp_head.h Text conflict in Percona-Server/sql/sp_pcontext.cc Text conflict in Percona-Server/sql/sp_pcontext.h Text conflict in Percona-Server/sql/sp_rcontext.cc Text conflict in Percona-Server/sql/sp_rcontext.h Text conflict in Percona-Server/sql/spatial.cc Text conflict in Percona-Server/sql/spatial.h Text conflict in Percona-Server/sql/sql_acl.cc Text conflict in Percona-Server/sql/sql_acl.h Text conflict in Percona-Server/sql/sql_analyse.cc Text conflict in Percona-Server/sql/sql_analyse.h Text conflict in Percona-Server/sql/sql_array.h Text conflict in Percona-Server/sql/sql_base.cc Text conflict in Percona-Server/sql/sql_binlog.cc Text conflict in Percona-Server/sql/sql_bitmap.h Text conflict in Percona-Server/sql/sql_builtin.cc.in Text conflict in Percona-Server/sql/sql_cache.cc Text conflict in Percona-Server/sql/sql_cache.h Text conflict in Percona-Server/sql/sql_class.cc Text conflict in Percona-Server/sql/sql_class.h Text conflict in Percona-Server/sql/sql_client.cc Text conflict in Percona-Server/sql/sql_connect.cc Text conflict in Percona-Server/sql/sql_crypt.cc Text conflict in Percona-Server/sql/sql_crypt.h Text conflict in Percona-Server/sql/sql_cursor.cc Text conflict in Percona-Server/sql/sql_cursor.h Text conflict in Percona-Server/sql/sql_db.cc Text conflict in Percona-Server/sql/sql_delete.cc Text conflict in Percona-Server/sql/sql_derived.cc Text conflict in Percona-Server/sql/sql_do.cc Text conflict in Percona-Server/sql/sql_error.cc Text conflict in Percona-Server/sql/sql_error.h Text conflict in Percona-Server/sql/sql_handler.cc Text conflict in Percona-Server/sql/sql_help.cc Text conflict in Percona-Server/sql/sql_insert.cc Text conflict in Percona-Server/sql/sql_lex.cc Text conflict in Percona-Server/sql/sql_lex.h Text conflict in Percona-Server/sql/sql_list.cc Text conflict in Percona-Server/sql/sql_list.h Text conflict in Percona-Server/sql/sql_load.cc Text conflict in Percona-Server/sql/sql_locale.cc Text conflict in Percona-Server/sql/sql_manager.cc Text conflict in Percona-Server/sql/sql_parse.cc Text conflict in Percona-Server/sql/sql_partition.cc Text conflict in Percona-Server/sql/sql_partition.h Text conflict in Percona-Server/sql/sql_plugin.cc Text conflict in Percona-Server/sql/sql_plugin.h Text conflict in Percona-Server/sql/sql_prepare.cc Path conflict: Percona-Server/sql/sql_priv.h / Percona-Server/sql/mysql_priv.h Text conflict in Percona-Server/sql/sql_profile.cc Text conflict in Percona-Server/sql/sql_profile.h Text conflict in Percona-Server/sql/sql_rename.cc Text conflict in Percona-Server/sql/sql_repl.cc Text conflict in Percona-Server/sql/sql_repl.h Text conflict in Percona-Server/sql/sql_select.cc Text conflict in Percona-Server/sql/sql_select.h Text conflict in Percona-Server/sql/sql_servers.cc Text conflict in Percona-Server/sql/sql_servers.h Text conflict in Percona-Server/sql/sql_show.cc Text conflict in Percona-Server/sql/sql_show.h Text conflict in Percona-Server/sql/sql_sort.h Text conflict in Percona-Server/sql/sql_string.cc Text conflict in Percona-Server/sql/sql_string.h Text conflict in Percona-Server/sql/sql_table.cc Text conflict in Percona-Server/sql/sql_tablespace.cc Text conflict in Percona-Server/sql/sql_test.cc Path conflict: Percona-Server/sql/sql_time.cc / Percona-Server/sql/time.cc Text conflict in Percona-Server/sql/sql_trigger.cc Text conflict in Percona-Server/sql/sql_trigger.h Text conflict in Percona-Server/sql/sql_udf.cc Text conflict in Percona-Server/sql/sql_udf.h Text conflict in Percona-Server/sql/sql_union.cc Text conflict in Percona-Server/sql/sql_update.cc Text conflict in Percona-Server/sql/sql_view.cc Text conflict in Percona-Server/sql/sql_view.h Text conflict in Percona-Server/sql/sql_yacc.yy Text conflict in Percona-Server/sql/strfunc.cc Text conflict in Percona-Server/sql/structs.h Text conflict in Percona-Server/sql/table.cc Text conflict in Percona-Server/sql/table.h Text conflict in Percona-Server/sql/thr_malloc.cc Text conflict in Percona-Server/sql/time.cc Text conflict in Percona-Server/sql/tzfile.h Text conflict in Percona-Server/sql/tztime.cc Text conflict in Percona-Server/sql/tztime.h Text conflict in Percona-Server/sql/udf_example.c Text conflict in Percona-Server/sql/uniques.cc Text conflict in Percona-Server/sql/unireg.cc Text conflict in Percona-Server/sql/unireg.h Text conflict in Percona-Server/storage/archive/CMakeLists.txt Text conflict in Percona-Server/storage/archive/archive_reader.c Text conflict in Percona-Server/storage/archive/azio.c Text conflict in Percona-Server/storage/archive/azlib.h Text conflict in Percona-Server/storage/archive/ha_archive.cc Text conflict in Percona-Server/storage/archive/ha_archive.h Text conflict in Percona-Server/storage/blackhole/CMakeLists.txt Text conflict in Percona-Server/storage/blackhole/ha_blackhole.cc Text conflict in Percona-Server/storage/blackhole/ha_blackhole.h Text conflict in Percona-Server/storage/csv/CMakeLists.txt Text conflict in Percona-Server/storage/csv/ha_tina.cc Text conflict in Percona-Server/storage/csv/ha_tina.h Text conflict in Percona-Server/storage/csv/transparent_file.cc Text conflict in Percona-Server/storage/csv/transparent_file.h Text conflict in Percona-Server/storage/example/CMakeLists.txt Text conflict in Percona-Server/storage/example/ha_example.cc Text conflict in Percona-Server/storage/example/ha_example.h Text conflict in Percona-Server/storage/federated/CMakeLists.txt Text conflict in Percona-Server/storage/federated/ha_federated.cc Text conflict in Percona-Server/storage/federated/ha_federated.h Text conflict in Percona-Server/storage/heap/CMakeLists.txt Text conflict in Percona-Server/storage/heap/_check.c Text conflict in Percona-Server/storage/heap/_rectest.c Text conflict in Percona-Server/storage/heap/ha_heap.cc Text conflict in Percona-Server/storage/heap/ha_heap.h Text conflict in Percona-Server/storage/heap/heapdef.h Text conflict in Percona-Server/storage/heap/hp_block.c Text conflict in Percona-Server/storage/heap/hp_clear.c Text conflict in Percona-Server/storage/heap/hp_close.c Text conflict in Percona-Server/storage/heap/hp_create.c Text conflict in Percona-Server/storage/heap/hp_delete.c Text conflict in Percona-Server/storage/heap/hp_extra.c Text conflict in Percona-Server/storage/heap/hp_hash.c Text conflict in Percona-Server/storage/heap/hp_info.c Text conflict in Percona-Server/storage/heap/hp_open.c Text conflict in Percona-Server/storage/heap/hp_panic.c Text conflict in Percona-Server/storage/heap/hp_rename.c Text conflict in Percona-Server/storage/heap/hp_rfirst.c Text conflict in Percona-Server/storage/heap/hp_rkey.c Text conflict in Percona-Server/storage/heap/hp_rlast.c Text conflict in Percona-Server/storage/heap/hp_rnext.c Text conflict in Percona-Server/storage/heap/hp_rprev.c Text conflict in Percona-Server/storage/heap/hp_rrnd.c Text conflict in Percona-Server/storage/heap/hp_rsame.c Text conflict in Percona-Server/storage/heap/hp_scan.c Text conflict in Percona-Server/storage/heap/hp_static.c Text conflict in Percona-Server/storage/heap/hp_test1.c Text conflict in Percona-Server/storage/heap/hp_test2.c Text conflict in Percona-Server/storage/heap/hp_update.c Text conflict in Percona-Server/storage/heap/hp_write.c Conflict adding file Percona-Server/storage/innobase. Moved existing file to Percona-Server/storage/innobase.moved. Path conflict: Percona-Server/storage/innobase.moved/btr / Percona-Server/storage/innodb_plugin/btr Path conflict: Percona-Server/storage/innobase.moved/buf / Percona-Server/storage/innodb_plugin/buf Path conflict: Percona-Server/storage/innobase.moved/compile-innodb / Percona-Server/storage/innodb_plugin/compile-innodb Path conflict: Percona-Server/storage/innobase.moved/data / Percona-Server/storage/innodb_plugin/data Path conflict: Percona-Server/storage/innobase.moved/dict / Percona-Server/storage/innodb_plugin/dict Path conflict: Percona-Server/storage/innobase.moved/dyn / Percona-Server/storage/innodb_plugin/dyn Path conflict: Percona-Server/storage/innobase.moved/eval / Percona-Server/storage/innodb_plugin/eval Path conflict: Percona-Server/storage/innobase.moved/fil / Percona-Server/storage/innodb_plugin/fil Path conflict: Percona-Server/storage/innobase.moved/fsp / Percona-Server/storage/innodb_plugin/fsp Path conflict: Percona-Server/storage/innobase.moved/fut / Percona-Server/storage/innodb_plugin/fut Path conflict: Percona-Server/storage/innobase.moved/ha / Percona-Server/storage/innodb_plugin/ha Path conflict: Percona-Server/storage/innobase.moved/handler / Percona-Server/storage/innodb_plugin/handler Path conflict: Percona-Server/storage/innobase.moved/ibuf / Percona-Server/storage/innodb_plugin/ibuf Path conflict: Percona-Server/storage/innobase.moved/include / Percona-Server/storage/innodb_plugin/include Path conflict: Percona-Server/storage/innobase.moved/lock / Percona-Server/storage/innodb_plugin/lock Path conflict: Percona-Server/storage/innobase.moved/log / Percona-Server/storage/innodb_plugin/log Path conflict: Percona-Server/storage/innobase.moved/mach / Percona-Server/storage/innodb_plugin/mach Path conflict: Percona-Server/storage/innobase.moved/mem / Percona-Server/storage/innodb_plugin/mem Path conflict: Percona-Server/storage/innobase.moved/mtr / Percona-Server/storage/innodb_plugin/mtr Path conflict: Percona-Server/storage/innobase.moved/os / Percona-Server/storage/innodb_plugin/os Path conflict: Percona-Server/storage/innobase.moved/page / Percona-Server/storage/innodb_plugin/page Path conflict: Percona-Server/storage/innobase.moved/pars / Percona-Server/storage/innodb_plugin/pars Path conflict: Percona-Server/storage/innobase.moved/que / Percona-Server/storage/innodb_plugin/que Path conflict: Percona-Server/storage/innobase.moved/read / Percona-Server/storage/innodb_plugin/read Path conflict: Percona-Server/storage/innobase.moved/rem / Percona-Server/storage/innodb_plugin/rem Path conflict: Percona-Server/storage/innobase.moved/row / Percona-Server/storage/innodb_plugin/row Path conflict: Percona-Server/storage/innobase.moved/srv / Percona-Server/storage/innodb_plugin/srv Path conflict: Percona-Server/storage/innobase.moved/sync / Percona-Server/storage/innodb_plugin/sync Path conflict: Percona-Server/storage/innobase.moved/trx / Percona-Server/storage/innodb_plugin/trx Path conflict: Percona-Server/storage/innobase.moved/usr / Percona-Server/storage/innodb_plugin/usr Path conflict: Percona-Server/storage/innobase.moved/ut / Percona-Server/storage/innodb_plugin/ut Text conflict in Percona-Server/storage/innodb_plugin/btr/btr0btr.c Text conflict in Percona-Server/storage/innodb_plugin/btr/btr0cur.c Text conflict in Percona-Server/storage/innodb_plugin/btr/btr0pcur.c Text conflict in Percona-Server/storage/innodb_plugin/btr/btr0sea.c Text conflict in Percona-Server/storage/innodb_plugin/buf/buf0buddy.c Text conflict in Percona-Server/storage/innodb_plugin/buf/buf0buf.c Text conflict in Percona-Server/storage/innodb_plugin/buf/buf0flu.c Text conflict in Percona-Server/storage/innodb_plugin/buf/buf0lru.c Text conflict in Percona-Server/storage/innodb_plugin/buf/buf0rea.c Text conflict in Percona-Server/storage/innodb_plugin/compile-innodb Text conflict in Percona-Server/storage/innodb_plugin/data/data0data.c Text conflict in Percona-Server/storage/innodb_plugin/data/data0type.c Text conflict in Percona-Server/storage/innodb_plugin/dict/dict0boot.c Text conflict in Percona-Server/storage/innodb_plugin/dict/dict0crea.c Text conflict in Percona-Server/storage/innodb_plugin/dict/dict0dict.c Text conflict in Percona-Server/storage/innodb_plugin/dict/dict0load.c Text conflict in Percona-Server/storage/innodb_plugin/dict/dict0mem.c Text conflict in Percona-Server/storage/innodb_plugin/fil/fil0fil.c Text conflict in Percona-Server/storage/innodb_plugin/fsp/fsp0fsp.c Text conflict in Percona-Server/storage/innodb_plugin/ha/ha0ha.c Text conflict in Percona-Server/storage/innodb_plugin/ha/hash0hash.c Text conflict in Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc Text conflict in Percona-Server/storage/innodb_plugin/handler/ha_innodb.h Text conflict in Percona-Server/storage/innodb_plugin/handler/handler0alter.cc Text conflict in Percona-Server/storage/innodb_plugin/handler/i_s.cc Text conflict in Percona-Server/storage/innodb_plugin/handler/i_s.h Text conflict in Percona-Server/storage/innodb_plugin/ibuf/ibuf0ibuf.c Text conflict in Percona-Server/storage/innodb_plugin/include/btr0btr.h Text conflict in Percona-Server/storage/innodb_plugin/include/btr0btr.ic Text conflict in Percona-Server/storage/innodb_plugin/include/btr0cur.h Text conflict in Percona-Server/storage/innodb_plugin/include/btr0pcur.h Text conflict in Percona-Server/storage/innodb_plugin/include/btr0pcur.ic Text conflict in Percona-Server/storage/innodb_plugin/include/btr0sea.h Text conflict in Percona-Server/storage/innodb_plugin/include/btr0sea.ic Text conflict in Percona-Server/storage/innodb_plugin/include/btr0types.h Text conflict in Percona-Server/storage/innodb_plugin/include/buf0buddy.h Text conflict in Percona-Server/storage/innodb_plugin/include/buf0buddy.ic Text conflict in Percona-Server/storage/innodb_plugin/include/buf0buf.h Text conflict in Percona-Server/storage/innodb_plugin/include/buf0buf.ic Text conflict in Percona-Server/storage/innodb_plugin/include/buf0flu.h Text conflict in Percona-Server/storage/innodb_plugin/include/buf0flu.ic Text conflict in Percona-Server/storage/innodb_plugin/include/buf0lru.h Text conflict in Percona-Server/storage/innodb_plugin/include/buf0rea.h Text conflict in Percona-Server/storage/innodb_plugin/include/buf0types.h Text conflict in Percona-Server/storage/innodb_plugin/include/data0data.h Text conflict in Percona-Server/storage/innodb_plugin/include/data0data.ic Text conflict in Percona-Server/storage/innodb_plugin/include/data0type.h Text conflict in Percona-Server/storage/innodb_plugin/include/data0type.ic Text conflict in Percona-Server/storage/innodb_plugin/include/db0err.h Text conflict in Percona-Server/storage/innodb_plugin/include/dict0boot.h Text conflict in Percona-Server/storage/innodb_plugin/include/dict0boot.ic Text conflict in Percona-Server/storage/innodb_plugin/include/dict0dict.h Text conflict in Percona-Server/storage/innodb_plugin/include/dict0dict.ic Text conflict in Percona-Server/storage/innodb_plugin/include/dict0load.h Text conflict in Percona-Server/storage/innodb_plugin/include/dict0mem.h Text conflict in Percona-Server/storage/innodb_plugin/include/dict0mem.ic Text conflict in Percona-Server/storage/innodb_plugin/include/dict0types.h Text conflict in Percona-Server/storage/innodb_plugin/include/fil0fil.h Text conflict in Percona-Server/storage/innodb_plugin/include/fsp0fsp.h Text conflict in Percona-Server/storage/innodb_plugin/include/fsp0fsp.ic Conflict adding file Percona-Server/storage/innodb_plugin/include/fsp0types.h. Moved existing file to Percona-Server/storage/innodb_plugin/include/fsp0types.h.moved. Text conflict in Percona-Server/storage/innodb_plugin/include/ha0ha.ic Text conflict in Percona-Server/storage/innodb_plugin/include/ha_prototypes.h Text conflict in Percona-Server/storage/innodb_plugin/include/handler0alter.h Text conflict in Percona-Server/storage/innodb_plugin/include/ibuf0ibuf.h Text conflict in Percona-Server/storage/innodb_plugin/include/ibuf0ibuf.ic Text conflict in Percona-Server/storage/innodb_plugin/include/lock0lock.h Text conflict in Percona-Server/storage/innodb_plugin/include/lock0lock.ic Text conflict in Percona-Server/storage/innodb_plugin/include/log0log.h Text conflict in Percona-Server/storage/innodb_plugin/include/log0log.ic Text conflict in Percona-Server/storage/innodb_plugin/include/mach0data.h Text conflict in Percona-Server/storage/innodb_plugin/include/mach0data.ic Text conflict in Percona-Server/storage/innodb_plugin/include/mem0mem.h Text conflict in Percona-Server/storage/innodb_plugin/include/mem0mem.ic Text conflict in Percona-Server/storage/innodb_plugin/include/mtr0log.h Text conflict in Percona-Server/storage/innodb_plugin/include/mtr0log.ic Text conflict in Percona-Server/storage/innodb_plugin/include/mtr0mtr.h Text conflict in Percona-Server/storage/innodb_plugin/include/mtr0mtr.ic Text conflict in Percona-Server/storage/innodb_plugin/include/os0file.h Text conflict in Percona-Server/storage/innodb_plugin/include/os0sync.h Text conflict in Percona-Server/storage/innodb_plugin/include/os0sync.ic Text conflict in Percona-Server/storage/innodb_plugin/include/os0thread.h Text conflict in Percona-Server/storage/innodb_plugin/include/page0cur.ic Text conflict in Percona-Server/storage/innodb_plugin/include/page0page.h Text conflict in Percona-Server/storage/innodb_plugin/include/page0page.ic Text conflict in Percona-Server/storage/innodb_plugin/include/pars0pars.h Text conflict in Percona-Server/storage/innodb_plugin/include/que0que.h Text conflict in Percona-Server/storage/innodb_plugin/include/read0read.h Text conflict in Percona-Server/storage/innodb_plugin/include/read0read.ic Text conflict in Percona-Server/storage/innodb_plugin/include/rem0rec.h Text conflict in Percona-Server/storage/innodb_plugin/include/rem0rec.ic Text conflict in Percona-Server/storage/innodb_plugin/include/rem0types.h Text conflict in Percona-Server/storage/innodb_plugin/include/row0ext.h Text conflict in Percona-Server/storage/innodb_plugin/include/row0ext.ic Text conflict in Percona-Server/storage/innodb_plugin/include/row0merge.h Text conflict in Percona-Server/storage/innodb_plugin/include/row0mysql.h Text conflict in Percona-Server/storage/innodb_plugin/include/row0purge.h Text conflict in Percona-Server/storage/innodb_plugin/include/row0row.h Text conflict in Percona-Server/storage/innodb_plugin/include/row0sel.h Text conflict in Percona-Server/storage/innodb_plugin/include/row0types.h Text conflict in Percona-Server/storage/innodb_plugin/include/row0upd.h Text conflict in Percona-Server/storage/innodb_plugin/include/srv0srv.h Text conflict in Percona-Server/storage/innodb_plugin/include/srv0start.h Text conflict in Percona-Server/storage/innodb_plugin/include/sync0rw.h Text conflict in Percona-Server/storage/innodb_plugin/include/sync0rw.ic Text conflict in Percona-Server/storage/innodb_plugin/include/sync0sync.h Text conflict in Percona-Server/storage/innodb_plugin/include/sync0sync.ic Text conflict in Percona-Server/storage/innodb_plugin/include/trx0i_s.h Text conflict in Percona-Server/storage/innodb_plugin/include/trx0purge.h Text conflict in Percona-Server/storage/innodb_plugin/include/trx0rec.h Text conflict in Percona-Server/storage/innodb_plugin/include/trx0rec.ic Text conflict in Percona-Server/storage/innodb_plugin/include/trx0rseg.h Text conflict in Percona-Server/storage/innodb_plugin/include/trx0sys.h Text conflict in Percona-Server/storage/innodb_plugin/include/trx0sys.ic Text conflict in Percona-Server/storage/innodb_plugin/include/trx0trx.h Text conflict in Percona-Server/storage/innodb_plugin/include/trx0trx.ic Text conflict in Percona-Server/storage/innodb_plugin/include/trx0types.h Text conflict in Percona-Server/storage/innodb_plugin/include/trx0undo.h Text conflict in Percona-Server/storage/innodb_plugin/include/trx0undo.ic Text conflict in Percona-Server/storage/innodb_plugin/include/univ.i Text conflict in Percona-Server/storage/innodb_plugin/include/ut0byte.h Text conflict in Percona-Server/storage/innodb_plugin/include/ut0byte.ic Text conflict in Percona-Server/storage/innodb_plugin/include/ut0dbg.h Text conflict in Percona-Server/storage/innodb_plugin/include/ut0lst.h Text conflict in Percona-Server/storage/innodb_plugin/include/ut0mem.h Conflict adding file Percona-Server/storage/innodb_plugin/include/ut0rbt.h. Moved existing file to Percona-Server/storage/innodb_plugin/include/ut0rbt.h.moved. Text conflict in Percona-Server/storage/innodb_plugin/include/ut0rnd.h Text conflict in Percona-Server/storage/innodb_plugin/include/ut0rnd.ic Text conflict in Percona-Server/storage/innodb_plugin/include/ut0ut.h Text conflict in Percona-Server/storage/innodb_plugin/lock/lock0lock.c Text conflict in Percona-Server/storage/innodb_plugin/log/log0log.c Text conflict in Percona-Server/storage/innodb_plugin/log/log0recv.c Text conflict in Percona-Server/storage/innodb_plugin/mach/mach0data.c Text conflict in Percona-Server/storage/innodb_plugin/mem/mem0dbg.c Text conflict in Percona-Server/storage/innodb_plugin/mem/mem0mem.c Text conflict in Percona-Server/storage/innodb_plugin/mem/mem0pool.c Text conflict in Percona-Server/storage/innodb_plugin/mtr/mtr0log.c Text conflict in Percona-Server/storage/innodb_plugin/mtr/mtr0mtr.c Text conflict in Percona-Server/storage/innodb_plugin/os/os0file.c Text conflict in Percona-Server/storage/innodb_plugin/os/os0proc.c Text conflict in Percona-Server/storage/innodb_plugin/os/os0sync.c Text conflict in Percona-Server/storage/innodb_plugin/os/os0thread.c Text conflict in Percona-Server/storage/innodb_plugin/page/page0cur.c Text conflict in Percona-Server/storage/innodb_plugin/page/page0page.c Text conflict in Percona-Server/storage/innodb_plugin/page/page0zip.c Text conflict in Percona-Server/storage/innodb_plugin/pars/pars0opt.c Text conflict in Percona-Server/storage/innodb_plugin/pars/pars0pars.c Text conflict in Percona-Server/storage/innodb_plugin/que/que0que.c Text conflict in Percona-Server/storage/innodb_plugin/read/read0read.c Text conflict in Percona-Server/storage/innodb_plugin/rem/rem0rec.c Text conflict in Percona-Server/storage/innodb_plugin/row/row0ext.c Text conflict in Percona-Server/storage/innodb_plugin/row/row0ins.c Text conflict in Percona-Server/storage/innodb_plugin/row/row0merge.c Text conflict in Percona-Server/storage/innodb_plugin/row/row0mysql.c Text conflict in Percona-Server/storage/innodb_plugin/row/row0purge.c Text conflict in Percona-Server/storage/innodb_plugin/row/row0row.c Text conflict in Percona-Server/storage/innodb_plugin/row/row0sel.c Text conflict in Percona-Server/storage/innodb_plugin/row/row0uins.c Text conflict in Percona-Server/storage/innodb_plugin/row/row0umod.c Text conflict in Percona-Server/storage/innodb_plugin/row/row0undo.c Text conflict in Percona-Server/storage/innodb_plugin/row/row0upd.c Text conflict in Percona-Server/storage/innodb_plugin/row/row0vers.c Text conflict in Percona-Server/storage/innodb_plugin/srv/srv0srv.c Text conflict in Percona-Server/storage/innodb_plugin/srv/srv0start.c Text conflict in Percona-Server/storage/innodb_plugin/sync/sync0arr.c Text conflict in Percona-Server/storage/innodb_plugin/sync/sync0rw.c Text conflict in Percona-Server/storage/innodb_plugin/sync/sync0sync.c Text conflict in Percona-Server/storage/innodb_plugin/trx/trx0i_s.c Text conflict in Percona-Server/storage/innodb_plugin/trx/trx0purge.c Text conflict in Percona-Server/storage/innodb_plugin/trx/trx0rec.c Text conflict in Percona-Server/storage/innodb_plugin/trx/trx0roll.c Text conflict in Percona-Server/storage/innodb_plugin/trx/trx0rseg.c Text conflict in Percona-Server/storage/innodb_plugin/trx/trx0sys.c Text conflict in Percona-Server/storage/innodb_plugin/trx/trx0trx.c Text conflict in Percona-Server/storage/innodb_plugin/trx/trx0undo.c Text conflict in Percona-Server/storage/innodb_plugin/ut/ut0byte.c Text conflict in Percona-Server/storage/innodb_plugin/ut/ut0dbg.c Text conflict in Percona-Server/storage/innodb_plugin/ut/ut0mem.c Conflict adding file Percona-Server/storage/innodb_plugin/ut/ut0rbt.c. Moved existing file to Percona-Server/storage/innodb_plugin/ut/ut0rbt.c.moved. Text conflict in Percona-Server/storage/innodb_plugin/ut/ut0ut.c Text conflict in Percona-Server/storage/innodb_plugin/ut/ut0wqueue.c Text conflict in Percona-Server/storage/myisam/CMakeLists.txt Text conflict in Percona-Server/storage/myisam/ft_boolean_search.c Text conflict in Percona-Server/storage/myisam/ft_nlq_search.c Text conflict in Percona-Server/storage/myisam/ft_parser.c Text conflict in Percona-Server/storage/myisam/ft_static.c Text conflict in Percona-Server/storage/myisam/ft_stopwords.c Text conflict in Percona-Server/storage/myisam/ft_update.c Text conflict in Percona-Server/storage/myisam/ftdefs.h Text conflict in Percona-Server/storage/myisam/fulltext.h Text conflict in Percona-Server/storage/myisam/ha_myisam.cc Text conflict in Percona-Server/storage/myisam/ha_myisam.h Text conflict in Percona-Server/storage/myisam/mi_cache.c Text conflict in Percona-Server/storage/myisam/mi_changed.c Text conflict in Percona-Server/storage/myisam/mi_check.c Text conflict in Percona-Server/storage/myisam/mi_close.c Text conflict in Percona-Server/storage/myisam/mi_create.c Text conflict in Percona-Server/storage/myisam/mi_dbug.c Text conflict in Percona-Server/storage/myisam/mi_delete.c Text conflict in Percona-Server/storage/myisam/mi_delete_all.c Text conflict in Percona-Server/storage/myisam/mi_delete_table.c Text conflict in Percona-Server/storage/myisam/mi_dynrec.c Text conflict in Percona-Server/storage/myisam/mi_extra.c Text conflict in Percona-Server/storage/myisam/mi_info.c Text conflict in Percona-Server/storage/myisam/mi_key.c Text conflict in Percona-Server/storage/myisam/mi_keycache.c Text conflict in Percona-Server/storage/myisam/mi_locking.c Text conflict in Percona-Server/storage/myisam/mi_log.c Text conflict in Percona-Server/storage/myisam/mi_open.c Text conflict in Percona-Server/storage/myisam/mi_packrec.c Text conflict in Percona-Server/storage/myisam/mi_page.c Text conflict in Percona-Server/storage/myisam/mi_panic.c Text conflict in Percona-Server/storage/myisam/mi_preload.c Text conflict in Percona-Server/storage/myisam/mi_range.c Text conflict in Percona-Server/storage/myisam/mi_rename.c Text conflict in Percona-Server/storage/myisam/mi_rkey.c Text conflict in Percona-Server/storage/myisam/mi_rnext.c Text conflict in Percona-Server/storage/myisam/mi_rnext_same.c Text conflict in Percona-Server/storage/myisam/mi_rprev.c Text conflict in Percona-Server/storage/myisam/mi_rsame.c Text conflict in Percona-Server/storage/myisam/mi_search.c Text conflict in Percona-Server/storage/myisam/mi_static.c Text conflict in Percona-Server/storage/myisam/mi_statrec.c Text conflict in Percona-Server/storage/myisam/mi_test1.c Text conflict in Percona-Server/storage/myisam/mi_test2.c Text conflict in Percona-Server/storage/myisam/mi_test3.c Text conflict in Percona-Server/storage/myisam/mi_unique.c Text conflict in Percona-Server/storage/myisam/mi_update.c Text conflict in Percona-Server/storage/myisam/mi_write.c Text conflict in Percona-Server/storage/myisam/myisam_ftdump.c Text conflict in Percona-Server/storage/myisam/myisamchk.c Text conflict in Percona-Server/storage/myisam/myisamdef.h Text conflict in Percona-Server/storage/myisam/myisamlog.c Text conflict in Percona-Server/storage/myisam/myisampack.c Text conflict in Percona-Server/storage/myisam/rt_index.c Text conflict in Percona-Server/storage/myisam/rt_split.c Text conflict in Percona-Server/storage/myisam/rt_test.c Text conflict in Percona-Server/storage/myisam/sort.c Text conflict in Percona-Server/storage/myisam/sp_key.c Text conflict in Percona-Server/storage/myisam/sp_test.c Text conflict in Percona-Server/storage/myisammrg/CMakeLists.txt Text conflict in Percona-Server/storage/myisammrg/ha_myisammrg.cc Text conflict in Percona-Server/storage/myisammrg/ha_myisammrg.h Text conflict in Percona-Server/storage/myisammrg/myrg_close.c Text conflict in Percona-Server/storage/myisammrg/myrg_create.c Text conflict in Percona-Server/storage/myisammrg/myrg_def.h Text conflict in Percona-Server/storage/myisammrg/myrg_extra.c Text conflict in Percona-Server/storage/myisammrg/myrg_info.c Text conflict in Percona-Server/storage/myisammrg/myrg_open.c Text conflict in Percona-Server/storage/myisammrg/myrg_queue.c Text conflict in Percona-Server/storage/myisammrg/myrg_rkey.c Text conflict in Percona-Server/storage/myisammrg/myrg_static.c Text conflict in Percona-Server/storage/ndb/Makefile.am Text conflict in Percona-Server/storage/ndb/config/win-lib.am Text conflict in Percona-Server/storage/ndb/config/win-prg.am Text conflict in Percona-Server/storage/ndb/docs/Makefile.am Text conflict in Percona-Server/storage/ndb/include/Makefile.am Text conflict in Percona-Server/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp Text conflict in Percona-Server/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp Text conflict in Percona-Server/storage/ndb/include/mgmapi/ndb_logevent.h Text conflict in Percona-Server/storage/ndb/include/ndbapi/NdbEventOperation.hpp Text conflict in Percona-Server/storage/ndb/include/ndbapi/NdbOperation.hpp Text conflict in Percona-Server/storage/ndb/include/portlib/prefetch.h Text conflict in Percona-Server/storage/ndb/include/util/NdbAutoPtr.hpp Text conflict in Percona-Server/storage/ndb/include/util/ndb_opts.h Path conflict: Percona-Server/storage/ndb/ndb_configure.m4 / Percona-Server/config/ac-macros/ha_ndbcluster.m4 Text conflict in Percona-Server/storage/ndb/plug.in Text conflict in Percona-Server/storage/ndb/src/Makefile.am Text conflict in Percona-Server/storage/ndb/src/common/Makefile.am Text conflict in Percona-Server/storage/ndb/src/common/debugger/Makefile.am Text conflict in Percona-Server/storage/ndb/src/common/debugger/signaldata/Makefile.am Text conflict in Percona-Server/storage/ndb/src/common/logger/Makefile.am Text conflict in Percona-Server/storage/ndb/src/common/mgmcommon/Makefile.am Text conflict in Percona-Server/storage/ndb/src/common/portlib/Makefile.am Text conflict in Percona-Server/storage/ndb/src/common/portlib/NdbMutex.c Text conflict in Percona-Server/storage/ndb/src/common/transporter/Makefile.am Text conflict in Percona-Server/storage/ndb/src/common/util/Makefile.am Text conflict in Percona-Server/storage/ndb/src/common/util/version.c Text conflict in Percona-Server/storage/ndb/src/cw/Makefile.am Text conflict in Percona-Server/storage/ndb/src/cw/cpcd/Makefile.am Text conflict in Percona-Server/storage/ndb/src/cw/cpcd/main.cpp Text conflict in Percona-Server/storage/ndb/src/kernel/Makefile.am Text conflict in Percona-Server/storage/ndb/src/kernel/blocks/Makefile.am Text conflict in Percona-Server/storage/ndb/src/kernel/blocks/backup/Makefile.am Text conflict in Percona-Server/storage/ndb/src/kernel/blocks/backup/read.cpp Text conflict in Percona-Server/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp Text conflict in Percona-Server/storage/ndb/src/kernel/blocks/dbdict/Makefile.am Text conflict in Percona-Server/storage/ndb/src/kernel/blocks/dbdih/Makefile.am Text conflict in Percona-Server/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp Text conflict in Percona-Server/storage/ndb/src/kernel/blocks/dblqh/Makefile.am Text conflict in Percona-Server/storage/ndb/src/kernel/blocks/dbtup/Makefile.am Text conflict in Percona-Server/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp Text conflict in Percona-Server/storage/ndb/src/kernel/blocks/lgman.cpp Text conflict in Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp Text conflict in Percona-Server/storage/ndb/src/kernel/blocks/suma/Suma.cpp Text conflict in Percona-Server/storage/ndb/src/kernel/error/Makefile.am Text conflict in Percona-Server/storage/ndb/src/kernel/vm/Configuration.cpp Text conflict in Percona-Server/storage/ndb/src/kernel/vm/Makefile.am Text conflict in Percona-Server/storage/ndb/src/mgmapi/Makefile.am Text conflict in Percona-Server/storage/ndb/src/mgmapi/mgmapi.cpp Text conflict in Percona-Server/storage/ndb/src/mgmapi/ndb_logevent.cpp Text conflict in Percona-Server/storage/ndb/src/mgmclient/Makefile.am Text conflict in Percona-Server/storage/ndb/src/mgmclient/main.cpp Text conflict in Percona-Server/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp Text conflict in Percona-Server/storage/ndb/src/mgmsrv/Makefile.am Text conflict in Percona-Server/storage/ndb/src/mgmsrv/main.cpp Text conflict in Percona-Server/storage/ndb/src/ndbapi/DictCache.cpp Text conflict in Percona-Server/storage/ndb/src/ndbapi/Makefile.am Text conflict in Percona-Server/storage/ndb/src/ndbapi/NdbEventOperation.cpp Text conflict in Percona-Server/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp Text conflict in Percona-Server/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp Text conflict in Percona-Server/storage/ndb/src/ndbapi/TransporterFacade.hpp Text conflict in Percona-Server/storage/ndb/test/Makefile.am Text conflict in Percona-Server/storage/ndb/test/ndbapi/Makefile.am Text conflict in Percona-Server/storage/ndb/test/ndbapi/bank/Makefile.am Text conflict in Percona-Server/storage/ndb/test/ndbapi/testIndexStat.cpp Text conflict in Percona-Server/storage/ndb/test/ndbapi/test_event_merge.cpp Text conflict in Percona-Server/storage/ndb/test/ndbapi/test_event_multi_table.cpp Text conflict in Percona-Server/storage/ndb/test/run-test/Makefile.am Text conflict in Percona-Server/storage/ndb/test/run-test/atrt.hpp Text conflict in Percona-Server/storage/ndb/test/run-test/main.cpp Text conflict in Percona-Server/storage/ndb/test/run-test/setup.cpp Text conflict in Percona-Server/storage/ndb/test/src/Makefile.am Text conflict in Percona-Server/storage/ndb/test/src/NDBT_Test.cpp Text conflict in Percona-Server/storage/ndb/test/tools/Makefile.am Text conflict in Percona-Server/storage/ndb/test/tools/connect.cpp Text conflict in Percona-Server/storage/ndb/tools/Makefile.am Text conflict in Percona-Server/storage/ndb/tools/delete_all.cpp Text conflict in Percona-Server/storage/ndb/tools/desc.cpp Text conflict in Percona-Server/storage/ndb/tools/drop_index.cpp Text conflict in Percona-Server/storage/ndb/tools/drop_tab.cpp Text conflict in Percona-Server/storage/ndb/tools/listTables.cpp Text conflict in Percona-Server/storage/ndb/tools/ndb_config.cpp Text conflict in Percona-Server/storage/ndb/tools/restore/consumer_restore.cpp Text conflict in Percona-Server/storage/ndb/tools/restore/consumer_restorem.cpp Text conflict in Percona-Server/storage/ndb/tools/restore/restore_main.cpp Text conflict in Percona-Server/storage/ndb/tools/select_all.cpp Text conflict in Percona-Server/storage/ndb/tools/select_count.cpp Text conflict in Percona-Server/storage/ndb/tools/waiter.cpp Text conflict in Percona-Server/strings/CMakeLists.txt Text conflict in Percona-Server/strings/bchange.c Text conflict in Percona-Server/strings/bmove_upp.c Text conflict in Percona-Server/strings/conf_to_src.c Text conflict in Percona-Server/strings/ctype-big5.c Text conflict in Percona-Server/strings/ctype-bin.c Text conflict in Percona-Server/strings/ctype-cp932.c Text conflict in Percona-Server/strings/ctype-czech.c Text conflict in Percona-Server/strings/ctype-euc_kr.c Text conflict in Percona-Server/strings/ctype-eucjpms.c Text conflict in Percona-Server/strings/ctype-extra.c Text conflict in Percona-Server/strings/ctype-gb2312.c Text conflict in Percona-Server/strings/ctype-gbk.c Text conflict in Percona-Server/strings/ctype-latin1.c Text conflict in Percona-Server/strings/ctype-mb.c Text conflict in Percona-Server/strings/ctype-simple.c Text conflict in Percona-Server/strings/ctype-sjis.c Text conflict in Percona-Server/strings/ctype-tis620.c Text conflict in Percona-Server/strings/ctype-uca.c Text conflict in Percona-Server/strings/ctype-ucs2.c Text conflict in Percona-Server/strings/ctype-ujis.c Text conflict in Percona-Server/strings/ctype-utf8.c Text conflict in Percona-Server/strings/ctype-win1250ch.c Text conflict in Percona-Server/strings/ctype.c Text conflict in Percona-Server/strings/decimal.c Text conflict in Percona-Server/strings/do_ctype.c Text conflict in Percona-Server/strings/dump_map.c Text conflict in Percona-Server/strings/int2str.c Text conflict in Percona-Server/strings/is_prefix.c Text conflict in Percona-Server/strings/llstr.c Text conflict in Percona-Server/strings/longlong2str.c Text conflict in Percona-Server/strings/my_strchr.c Text conflict in Percona-Server/strings/my_strtoll10.c Text conflict in Percona-Server/strings/my_vsnprintf.c Text conflict in Percona-Server/strings/str2int.c Text conflict in Percona-Server/strings/str_alloc.c Text conflict in Percona-Server/strings/strappend.c Text conflict in Percona-Server/strings/strcend.c Text conflict in Percona-Server/strings/strcont.c Text conflict in Percona-Server/strings/strend.c Text conflict in Percona-Server/strings/strfill.c Text conflict in Percona-Server/strings/string.doc Text conflict in Percona-Server/strings/strmake.c Text conflict in Percona-Server/strings/strmov.c Text conflict in Percona-Server/strings/strnlen.c Text conflict in Percona-Server/strings/strnmov.c Text conflict in Percona-Server/strings/strxmov.c Text conflict in Percona-Server/strings/strxnmov.c Text conflict in Percona-Server/strings/uca-dump.c Text conflict in Percona-Server/strings/uctypedump.c Text conflict in Percona-Server/strings/utr11-dump.c Text conflict in Percona-Server/strings/xml.c Text conflict in Percona-Server/support-files/MySQL-shared-compat.spec.sh Text conflict in Percona-Server/support-files/my-huge.cnf.sh Text conflict in Percona-Server/support-files/my-innodb-heavy-4G.cnf.sh Text conflict in Percona-Server/support-files/my-large.cnf.sh Text conflict in Percona-Server/support-files/my-medium.cnf.sh Text conflict in Percona-Server/support-files/my-small.cnf.sh Text conflict in Percona-Server/support-files/mysql-multi.server.sh Text conflict in Percona-Server/support-files/mysql.server.sh Text conflict in Percona-Server/support-files/mysql.spec.sh Text conflict in Percona-Server/support-files/ndb-config-2-node.ini.sh Text conflict in Percona-Server/tests/CMakeLists.txt Text conflict in Percona-Server/tests/big_record.pl Text conflict in Percona-Server/tests/bug25714.c Text conflict in Percona-Server/tests/myisam-big-rows.tst Text conflict in Percona-Server/tests/mysql_client_test.c Text conflict in Percona-Server/tests/thread_test.c Text conflict in Percona-Server/unittest/examples/core-t.c Text conflict in Percona-Server/unittest/examples/no_plan-t.c Text conflict in Percona-Server/unittest/examples/skip-t.c Text conflict in Percona-Server/unittest/examples/skip_all-t.c Text conflict in Percona-Server/unittest/examples/todo-t.c Text conflict in Percona-Server/unittest/mysys/base64-t.c Text conflict in Percona-Server/unittest/mysys/bitmap-t.c Text conflict in Percona-Server/unittest/mytap/t/basic-t.c Text conflict in Percona-Server/unittest/mytap/tap.c Text conflict in Percona-Server/unittest/mytap/tap.h Text conflict in Percona-Server/unittest/unit.pl Text conflict in Percona-Server/vio/CMakeLists.txt Text conflict in Percona-Server/vio/test-ssl.c Text conflict in Percona-Server/vio/test-sslclient.c Text conflict in Percona-Server/vio/test-sslserver.c Text conflict in Percona-Server/vio/vio.c Text conflict in Percona-Server/vio/vio_priv.h Text conflict in Percona-Server/vio/viosocket.c Text conflict in Percona-Server/vio/viossl.c Text conflict in Percona-Server/vio/viosslfactories.c Text conflict in Percona-Server/vio/viotest-ssl.c Text conflict in Percona-Server/win/create_def_file.js Text conflict in Percona-Server/zlib/CMakeLists.txt Conflict adding file README.HandlerSocket. Moved existing file to README.HandlerSocket.moved. Conflict adding file UDF. Moved existing file to UDF.moved. Conflict adding file build. Moved existing file to build.moved. Conflict adding file doc. Moved existing file to doc.moved. Conflict adding file handlersocket.patch. Moved existing file to handlersocket.patch.moved. Conflict adding file lrusort.py. Moved existing file to lrusort.py.moved. Conflict adding file python-for-subunit2junitxml. Moved existing file to python-for-subunit2junitxml.moved. Conflict adding file subunit2junitxml. Moved existing file to subunit2junitxml.moved. |
||||||||||||
To merge this branch: | bzr merge lp:~gl-az/percona-server/5.1-lru_dump_load_work | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov | Pending | ||
Review via email: mp+106105@code.launchpad.net |
Description of the change
- Launchpad Bug #686392 : Buffer pool dump may result in incomplete dump file.
- Implemented simple temp file on save and rename to real file on successful dump.
- Carried over one or two dump file sanity checks from Alexey K prior work.
- Launchpad Bug #712055 : Loading LRU dump prevents shutdown
- Merged patch noted in bug and also implemented same logic when shutdown comes while performing actual dump. Was able to test and verify its effectiveness with a 1G buffer pool and innodb_
- Tried to create a test case for this issue but I don't think a proper 'success' case can be built due to the need for a sizable, existing ib_lru_dump file and the natural race conditions ump/that this works with (there is no guarantee that the preload won't finish before the shutdown signal comes).
- Launchpad Bug #713481 : Clean up messaging for LRU dump
- It appears that PS 5.1 already has begin/end messages for lru restore. Added some verbage to the missing file message to make it not so scary.
Jenkins results at: http://
I am unsure about the failures but they _look_ like Jenkins issues..