mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
2c86b5ad16
into romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl client/Makefile.am: Auto merged sql/Makefile.am: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/rpl_injector.h: Auto merged sql/sql_parse.cc: Auto merged mysql-test/r/ctype_cp932_binlog_stm.result: Manual merge , mysql-test/r/flush_block_commit_notembedded.result: Manual merge mysql-test/r/rpl_000015.result: Manual merge mysql-test/r/rpl_change_master.result: Manual merge mysql-test/r/rpl_deadlock_innodb.result: Manual merge mysql-test/r/rpl_flushlog_loop.result: Manual merge , mysql-test/r/rpl_loaddata.result: manual merge mysql-test/r/rpl_loaddata_s.result: manual merge , mysql-test/r/rpl_log_pos.result: manual merge mysql-test/r/rpl_ndb_charset.result: manual merge mysql-test/r/rpl_ndb_log.result: manual merge , mysql-test/r/rpl_ndb_multi.result: manual merge mysql-test/r/rpl_rbr_to_sbr.result: manual merge mysql-test/r/rpl_rotate_logs.result: Manual merge mysql-test/r/rpl_row_basic_11bugs.result: Manual merge mysql-test/r/rpl_row_charset.result: Manual merge mysql-test/r/rpl_row_create_table.result: Manual merge mysql-test/r/rpl_row_delayed_ins.result: Manual merge mysql-test/r/rpl_row_drop.result: Manual merge mysql-test/r/rpl_row_flsh_tbls.result: Manual merge mysql-test/r/rpl_row_inexist_tbl.result: Manual merge mysql-test/r/rpl_row_log.result: Manual merge mysql-test/r/rpl_row_log_innodb.result: Manual merge mysql-test/r/rpl_row_max_relay_size.result: Manual merge mysql-test/r/rpl_row_reset_slave.result: Manual merge mysql-test/r/rpl_row_until.result: Manual merge mysql-test/r/rpl_server_id1.result: Manual merge mysql-test/r/rpl_server_id2.result: Manual merge mysql-test/r/rpl_sp.result: Manual merge mysql-test/r/rpl_stm_charset.result: Manual merge mysql-test/r/rpl_stm_flsh_tbls.result: Manual merge mysql-test/r/rpl_stm_log.result: Manual merge mysql-test/r/rpl_stm_max_relay_size.result: Manual merge mysql-test/r/rpl_stm_multi_query.result: Manual merge mysql-test/r/rpl_stm_reset_slave.result: Manual merge mysql-test/r/rpl_stm_until.result: Manual merge mysql-test/r/rpl_switch_stm_row_mixed.result: Manual merge mysql-test/r/rpl_truncate_2myisam.result: Manual merge mysql-test/r/rpl_truncate_3innodb.result: Manual merge mysql-test/r/rpl_truncate_7ndb.result: Manual merge mysql-test/r/user_var-binlog.result: Manual merge mysql-test/t/binlog_row_mix_innodb_myisam.test: Manual merge mysql-test/extra/binlog_tests/binlog.test: Binlog position change. mysql-test/extra/binlog_tests/binlog_insert_delayed.test: Binlog position change. mysql-test/extra/binlog_tests/ctype_cp932_binlog.test: Binlog position change. mysql-test/extra/binlog_tests/ctype_ucs_binlog.test: Binlog position change. mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_deadlock.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_log.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_multi_query.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_row_charset.test: Binlog position change. mysql-test/extra/rpl_tests/rpl_stm_charset.test: Binlog position change. mysql-test/include/show_binlog_events.inc: Binlog position change. mysql-test/r/binlog_row_binlog.result: Result change mysql-test/r/binlog_row_ctype_ucs.result: Result change mysql-test/r/binlog_row_insert_select.result: Result change mysql-test/r/binlog_row_mix_innodb_myisam.result: Result change mysql-test/r/binlog_stm_binlog.result: Result change mysql-test/r/binlog_stm_ctype_ucs.result: Result change mysql-test/r/binlog_stm_insert_select.result: Result change mysql-test/r/binlog_stm_mix_innodb_myisam.result: Result change mysql-test/r/ctype_cp932_binlog_row.result: Result change mysql-test/t/binlog_stm_mix_innodb_myisam.test: Binlog position change. mysql-test/t/ctype_cp932_binlog_stm.test: Binlog position change. mysql-test/t/mysqlbinlog.test: Binlog position change. mysql-test/t/mysqlbinlog2.test: Binlog position change. mysql-test/t/rpl_loaddata_s.test: Binlog position change. mysql-test/t/rpl_log_pos.test: Binlog position change. mysql-test/t/rpl_row_basic_11bugs.test: Binlog position change. mysql-test/t/rpl_row_create_table.test: Binlog position change. mysql-test/t/rpl_row_flsh_tbls.test: Binlog position change. mysql-test/t/rpl_row_mysqlbinlog.test: Binlog position change. mysql-test/t/rpl_sp.test: Binlog position change. mysql-test/t/rpl_stm_flsh_tbls.test: Binlog position change. mysql-test/t/rpl_switch_stm_row_mixed.test: Binlog position change. mysql-test/t/user_var-binlog.test: Binlog position change. sql/share/errmsg.txt: Merging error messages |
||
---|---|---|
.. | ||
add_anonymous_users.inc | ||
analyze_failure_sync_with_master.test | ||
big_test.inc | ||
check-testcase.test | ||
check_var_limit.inc | ||
common-tests.inc | ||
concurrent.inc | ||
ctype_common.inc | ||
ctype_filesort.inc | ||
ctype_innodb_like.inc | ||
ctype_like_escape.inc | ||
deadlock.inc | ||
delete_anonymous_users.inc | ||
endspace.inc | ||
federated.inc | ||
federated_cleanup.inc | ||
get_binlog_dump_thread_id.inc | ||
gis_generic.inc | ||
handler.inc | ||
have_archive.inc | ||
have_big5.inc | ||
have_binlog_format_mixed.inc | ||
have_binlog_format_mixed_or_row.inc | ||
have_binlog_format_mixed_or_statement.inc | ||
have_binlog_format_row.inc | ||
have_binlog_format_statement.inc | ||
have_blackhole.inc | ||
have_case_sensitive_file_system.inc | ||
have_compress.inc | ||
have_cp932.inc | ||
have_cp1250_ch.inc | ||
have_crypt.inc | ||
have_csv.inc | ||
have_debug.inc | ||
have_eucjpms.inc | ||
have_euckr.inc | ||
have_example_plugin.inc | ||
have_exampledb.inc | ||
have_federated_db.inc | ||
have_gb2312.inc | ||
have_gbk.inc | ||
have_geometry.inc | ||
have_innodb.inc | ||
have_latin2_ch.inc | ||
have_lowercase0.inc | ||
have_multi_ndb.inc | ||
have_ndb.inc | ||
have_ndb_extra.inc | ||
have_ndbapi_examples.inc | ||
have_outfile.inc | ||
have_partition.inc | ||
have_query_cache.inc | ||
have_sjis.inc | ||
have_ssl.inc | ||
have_tis620.inc | ||
have_ucs2.inc | ||
have_udf.inc | ||
have_ujis.inc | ||
im_check_env.inc | ||
index_merge1.inc | ||
index_merge2.inc | ||
index_merge_2sweeps.inc | ||
index_merge_ror.inc | ||
index_merge_ror_cpk.inc | ||
innodb_rollback_on_timeout.inc | ||
is_debug_build.inc | ||
loaddata_autocom.inc | ||
master-slave-end.inc | ||
master-slave-reset.inc | ||
master-slave.inc | ||
mix1.inc | ||
mix2.inc | ||
mix2_ucs2.inc | ||
mysqltest-x.inc | ||
ndb_backup.inc | ||
ndb_backup_print.inc | ||
ndb_default_cluster.inc | ||
ndb_not_readonly.inc | ||
ndb_restore_master.inc | ||
ndb_restore_slave_eoption.inc | ||
ndb_setup_slave.inc | ||
not_as_root.inc | ||
not_embedded.inc | ||
not_ndb.inc | ||
not_ndb_default.inc | ||
not_openssl.inc | ||
not_valgrind.inc | ||
not_windows.inc | ||
one_thread_per_connection.inc | ||
parser_bug21114.inc | ||
partition_1.inc | ||
partition_10.inc | ||
partition_11.inc | ||
partition_12.inc | ||
partition_layout.inc | ||
ps_conv.inc | ||
ps_create.inc | ||
ps_modify.inc | ||
ps_modify1.inc | ||
ps_query.inc | ||
ps_renew.inc | ||
query_cache.inc | ||
read_many_rows.inc | ||
report-features.test | ||
rowid_order.inc | ||
rpl_events.inc | ||
rpl_multi_engine.inc | ||
rpl_multi_engine3.inc | ||
rpl_stmt_seq.inc | ||
rpl_stmt_seq2.inc | ||
rpl_udf.inc | ||
safe_set_to_maybe_ro_var.inc | ||
show_binlog_events.inc | ||
show_msg.inc | ||
show_msg80.inc | ||
sp-vars.inc | ||
strict_autoinc.inc | ||
system_db_struct.inc | ||
test_outfile.inc | ||
testdb_only.inc | ||
unsafe_binlog.inc | ||
varchar.inc | ||
wait_condition.inc | ||
wait_for_query_to_suceed.inc | ||
wait_show_pattern.inc | ||
wait_slave_status.inc | ||
wait_until_connected_again.inc | ||
wait_until_rows_count.inc | ||
windows.inc |