mariadb/mysql-test/suite/rpl/r
Alexander Nozdrin b3018e8613 Manual merge from mysql-trunk-merge.
Conflicts:
  - client/mysql.cc
  - client/mysqldump.c
  - configure.in
  - mysql-test/r/csv.result
  - mysql-test/r/func_time.result
  - mysql-test/r/show_check.result
  - mysql-test/r/sp-error.result
  - mysql-test/r/sp.result
  - mysql-test/r/sp_trans.result
  - mysql-test/r/type_blob.result
  - mysql-test/r/type_timestamp.result
  - mysql-test/r/warnings.result
  - mysql-test/suite/rpl/r/rpl_sp.result
  - sql/mysql_priv.h
  - sql/mysqld.cc
  - sql/sp.cc
  - sql/sql_base.cc
  - sql/sql_table.cc
  - sql/sql_trigger.cc
  - sql/sql_view.cc
  - sql/table.h
  - sql/share/errmsg.txt
  - mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
2010-02-24 16:52:27 +03:00
..
rpl000001.a.result
rpl000001.b.result
rpl000010.result
rpl000011.result
rpl000013.result
rpl000017.result BUG#48048: Deprecated constructs need removal in Betony 2009-11-04 12:28:20 +00:00
rpl_000015.result BUG#48048: Deprecated constructs need removal in Betony 2009-11-04 12:28:20 +00:00
rpl_alter.result
rpl_alter_db.result
rpl_auto_increment.result
rpl_auto_increment_11932.result
rpl_auto_increment_update_failure.result
rpl_begin_commit_rollback.result Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing. 2010-02-02 10:56:42 +03:00
rpl_binlog_auto_inc_bug33029.result Bug#48308. 2010-02-16 22:34:34 +03:00
rpl_binlog_corruption.result
rpl_binlog_grant.result Manual merge from mysql-5.1-bugteam. 2010-02-03 17:01:48 +03:00
rpl_binlog_query_filter_rules.result
rpl_bit.result
rpl_bit_npk.result
rpl_blackhole.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_bug26395.result
rpl_bug31076.result WL#5151: Conversion between different types when replicating 2009-12-14 12:04:55 +01:00
rpl_bug33931.result WL#3894, post-push fix. 2009-11-28 17:53:48 +03:00
rpl_bug38694.result
rpl_bug41902.result Bug #48463 backporting from 6.0-rpl to celosia a set of bugs 2009-11-20 15:30:35 +02:00
rpl_change_master.result
rpl_charset.result WL#4738 streamline/simplify @@variable creation process 2009-12-22 10:35:56 +01:00
rpl_charset_sjis.result
rpl_circular_for_4_hosts.result
rpl_colSize.result WL#5151: Conversion between different types when replicating 2009-12-14 12:04:55 +01:00
rpl_commit_after_flush.result
rpl_concurrency_error.result Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing. 2010-02-02 10:56:42 +03:00
rpl_create_database.result
rpl_create_if_not_exists.result BUG#47418 RBR fails, failure with mixup of base/temporary/view 2010-01-16 15:44:24 +08:00
rpl_create_tmp_table_if_not_exists.result
rpl_critical_errors.result
rpl_critical_errors.result.txt
rpl_cross_version.result
rpl_ddl.result
rpl_deadlock_innodb.result
rpl_delete_no_where.result
rpl_do_grant.result BUG#50984: check_testcase fails for rpl_tmp_table_and_DDL 2010-02-10 12:12:55 +00:00
rpl_drop.result
rpl_drop_db.result
rpl_drop_if_exists.result
rpl_drop_temp.result Bug #49137 Replication failure on SBR/MBR + multi-table DROP TEMPORARY TABLE 2009-12-31 12:04:19 +08:00
rpl_drop_view.result
rpl_dual_pos_advance.result
rpl_EE_err.result
rpl_empty_master_host.result
rpl_err_ignoredtable.result PB2 was showing some valgrind warnings after WL#5151 was pushed. 2009-12-22 11:51:46 +00:00
rpl_events.result Manual merge from mysql-trunk-merge. 2010-02-03 19:21:17 +03:00
rpl_extraCol_innodb.result merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-07 15:39:11 +00:00
rpl_extraCol_myisam.result merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-07 15:39:11 +00:00
rpl_extraColmaster_innodb.result merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-07 15:39:11 +00:00
rpl_extraColmaster_myisam.result merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-07 15:39:11 +00:00
rpl_failed_optimize.result
rpl_filter_tables_not_exist.result
rpl_flush_logs.result WL#5142 FLUSH LOGS should take optional arguments for which log(s) to flush 2009-12-03 16:59:58 +08:00
rpl_flushlog_loop.result
rpl_foreign_key_innodb.result
rpl_free_items.result
rpl_geometry.result Bug#48776 row based replication breaks with spatial / geometry types, cause crashes! 2010-01-05 14:25:29 +08:00
rpl_get_lock.result merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 2009-12-17 21:43:35 +00:00
rpl_get_master_version_and_clock.result Manual merge from mysql-trunk-merge. 2010-01-31 00:26:38 +03:00
rpl_grant.result
rpl_heartbeat.result WL#4738 streamline/simplify @@variable creation process 2009-12-22 10:35:56 +01:00
rpl_heartbeat_2slaves.result
rpl_heartbeat_basic.result BUG#50767: Some RPL tests started to fail in next-mr-merge on 2010-02-02 12:26:28 +03:00
rpl_heartbeat_ssl.result
rpl_idempotency.result Fixes two remaining test failures: 2010-01-13 00:23:07 +00:00
rpl_ignore_grant.result
rpl_ignore_revoke.result
rpl_ignore_table.result
rpl_ignore_table_update.result
rpl_incident.result
rpl_init_slave.result
rpl_init_slave_errors.result
rpl_innodb_bug28430.result
rpl_innodb_bug30888.result
rpl_innodb_mixed_ddl.result
rpl_innodb_mixed_dml.result Manual merge from mysql-trunk-merge. 2010-02-03 19:21:17 +03:00
rpl_insert.result
rpl_insert_id.result merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-07 15:39:11 +00:00
rpl_insert_id_pk.result
rpl_insert_ignore.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_insert_select.result
rpl_invoked_features.result
rpl_ip_mix.result New patch for bug#49579, now with "have_ipv4_mapped.inc". 2010-01-29 11:48:11 +01:00
rpl_ip_mix2.result New patch for bug#49579, now with "have_ipv4_mapped.inc". 2010-01-29 11:48:11 +01:00
rpl_ipv4_as_ipv6.result New patch for bug#49579, now with "have_ipv4_mapped.inc". 2010-01-29 11:48:11 +01:00
rpl_ipv6.result New patch for bug#49579, now with "have_ipv4_mapped.inc". 2010-01-29 11:48:11 +01:00
rpl_killed_ddl.result Merge from 5.0-bugteam 2009-12-10 11:51:42 +08:00
rpl_known_bugs_detection.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_LD_INFILE.result
rpl_loaddata.result merge: 5.1-bugteam bug branch --> 5.1 bugteam latest. 2010-01-07 10:34:27 +00:00
rpl_loaddata_charset.result
rpl_loaddata_fatal.result Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. 2010-01-15 14:26:53 +03:00
rpl_loaddata_m.result WL#2360 Performance schema 2010-01-11 18:47:27 -07:00
rpl_loaddata_map.result Manual merge from mysql-trunk-merge. 2010-01-19 19:36:14 +03:00
rpl_loaddata_s.result
rpl_loaddata_simple.result
rpl_loaddata_symlink.result Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with --slave-load-tm 2009-11-28 12:43:16 +08:00
rpl_loaddatalocal.result
rpl_loadfile.result
rpl_locale.result
rpl_log_pos.result merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade fail and are under treatment 2009-11-10 20:45:15 +02:00
rpl_manual_change_index_file.result BUG #28421 Infinite loop on slave relay logs 2010-01-08 13:42:23 +08:00
rpl_many_optimize.result
rpl_master_pos_wait.result
rpl_misc_functions.result BUG#50767: Some RPL tests started to fail in next-mr-merge on 2010-02-02 12:26:28 +03:00
rpl_mix_found_rows.result
rpl_mix_insert_delayed.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_mixed_binlog_max_cache_size.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_mixed_bit_pk.result
rpl_mixed_ddl_dml.result
rpl_mixed_implicit_commit_binlog.result Manual merge from mysql-trunk-merge. 2010-02-03 19:21:17 +03:00
rpl_mixed_mixing_engines.result Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing. 2010-02-02 10:56:42 +03:00
rpl_mixed_row_innodb.result next-mr -> next-4284 merge. 2010-02-05 20:04:38 +03:00
rpl_multi_delete.result
rpl_multi_delete2.result Backport of Bug#27525 to mysql-next-mr 2009-11-10 16:48:46 -02:00
rpl_multi_engine.result
rpl_multi_update.result
rpl_multi_update2.result
rpl_multi_update3.result
rpl_multi_update4.result
rpl_mysql_upgrade.result Post-fix for merge mysql-5.1-rep+2 --> mysql-5.1-rep+3 2009-11-11 13:51:49 +00:00
rpl_name_const.result
rpl_nondeterministic_functions.result BUG#50767: Some RPL tests started to fail in next-mr-merge on 2010-02-02 12:26:28 +03:00
rpl_not_null_innodb.result
rpl_not_null_myisam.result
rpl_optimize.result BUG#49222: Mark RAND() as unsafe 2010-01-13 10:00:03 +01:00
rpl_packet.result
rpl_plugin_load.result
rpl_ps.result
rpl_rbr_to_sbr.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_read_only.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_relay_space_innodb.result
rpl_relay_space_myisam.result
rpl_relayrotate.result
rpl_relayspace.result
rpl_replicate_do.result
rpl_replicate_ignore_db.result
rpl_report.result
rpl_rewrt_db.result
rpl_rotate_logs.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_row_001.result
rpl_row_4_bytes.result
rpl_row_basic_2myisam.result WL#5151: Conversion between different types when replicating 2009-12-14 12:04:55 +01:00
rpl_row_basic_3innodb.result WL#5151: Conversion between different types when replicating 2009-12-14 12:04:55 +01:00
rpl_row_basic_8partition.result
rpl_row_basic_11bugs.result WL#2360 Performance schema 2010-01-11 18:47:27 -07:00
rpl_row_binlog_max_cache_size.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_row_blob_innodb.result
rpl_row_blob_myisam.result
rpl_row_colSize.result merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-07 15:39:11 +00:00
rpl_row_conflicts.result
rpl_row_create_table.result merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 2009-12-17 21:43:35 +00:00
rpl_row_delayed_ins.result
rpl_row_disabled_slave_key.result
rpl_row_drop.result
rpl_row_err_ignoredtable.result
rpl_row_flsh_tbls.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_row_func001.result
rpl_row_func002.result
rpl_row_func003.result BUG#49222: Mark RAND() as unsafe 2010-01-13 10:00:03 +01:00
rpl_row_idempotency.result Fixes for three test failures: 2010-01-12 17:52:02 +00:00
rpl_row_implicit_commit_binlog.result Fix test result file after manual merge. 2010-02-04 09:35:40 +03:00
rpl_row_inexist_tbl.result
rpl_row_insert_delayed.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_row_loaddata_concurrent.result Manual merge from mysql-trunk-merge. 2010-01-31 01:06:50 +03:00
rpl_row_loaddata_m.result
rpl_row_log.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_row_log_innodb.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_row_max_relay_size.result WL#4738 streamline/simplify @@variable creation process 2009-12-22 10:35:56 +01:00
rpl_row_mixing_engines.result BUG#50038 Deadlock on flush logs with concurrent DML and RBR 2010-01-05 16:55:23 +00:00
rpl_row_multi_query.result
rpl_row_mysqlbinlog.result WL#5182 Remove more deprecated 4.1/5.0 features 2010-01-27 13:23:28 +01:00
rpl_row_NOW.result
rpl_row_reset_slave.result BUG#48048: Deprecated constructs need removal in Betony 2009-11-04 12:28:20 +00:00
rpl_row_show_relaylog_events.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_row_sp001.result
rpl_row_sp002_innodb.result
rpl_row_sp003.result
rpl_row_sp005.result
rpl_row_sp006_InnoDB.result
rpl_row_sp007_innodb.result
rpl_row_sp008.result
rpl_row_sp009.result
rpl_row_sp010.result
rpl_row_sp011.result
rpl_row_sp012.result
rpl_row_tabledefs_2myisam.result merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-07 15:39:11 +00:00
rpl_row_tabledefs_3innodb.result merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-07 15:39:11 +00:00
rpl_row_tabledefs_7ndb.result
rpl_row_tbl_metadata.result BUG#50018: binlog corruption when table has many columns 2010-01-07 17:45:54 +00:00
rpl_row_trig001.result
rpl_row_trig002.result
rpl_row_trig003.result
rpl_row_trig004.result
rpl_row_trunc_temp.result Bug #48350 truncate temporary table crashes replication 2009-11-22 13:10:33 +08:00
rpl_row_unsafe_funcs.result
rpl_row_until.result
rpl_row_USER.result
rpl_row_UUID.result
rpl_row_view01.result
rpl_row_wide_table.result
rpl_semi_sync.result BUG#50157 Assertion !active_tranxs_->is_tranx_end_pos(..) in ReplSemiSyncMaster::commitTrx 2010-01-31 02:26:51 +08:00
rpl_semi_sync_event.result Bug#49020 Semi-sync master crashed with free_pool == NULL, assertion `free_pool_' 2009-12-04 09:46:33 +08:00
rpl_server_id.result
rpl_server_id1.result
rpl_server_id2.result
rpl_server_id_ignore.result
rpl_session_var.result
rpl_set_charset.result
rpl_set_null_innodb.result BUG#49481: RBR: MyISAM and bit fields may cause slave to stop on delete: 2010-01-21 17:20:24 +00:00
rpl_set_null_myisam.result BUG#49481: RBR: MyISAM and bit fields may cause slave to stop on delete: 2010-01-21 17:20:24 +00:00
rpl_sf.result
rpl_show_slave_hosts.result
rpl_skip_error.result
rpl_slave_grp_exec.result
rpl_slave_load_in.result
rpl_slave_load_remove_tmpfile.result BUG#50474: rpl_slave_load_remove_tmpfile failed on windows debug 2010-01-21 00:41:32 +00:00
rpl_slave_load_tmpdir_not_exist.result
rpl_slave_skip.result BUG#49562: SBR out of sync when using numeric data types + user 2010-01-15 17:52:46 +00:00
rpl_slave_status.result
rpl_slow_query_log.result BUG#50620: Adding an index to a table prevents slave from logging 2010-02-05 17:48:01 +00:00
rpl_sp.result Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
rpl_sp004.result
rpl_sp_effects.result
rpl_spec_variables.result
rpl_sporadic_master.result
rpl_ssl.result
rpl_ssl1.result
rpl_stm_000001.result merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 2009-12-17 21:43:35 +00:00
rpl_stm_auto_increment_bug33029.result merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-07 15:39:11 +00:00
rpl_stm_binlog_max_cache_size.result Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing. 2010-02-02 10:56:42 +03:00
rpl_stm_conflicts.result
rpl_stm_EE_err2.result
rpl_stm_flsh_tbls.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_stm_found_rows.result merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-07 15:39:11 +00:00
rpl_stm_implicit_commit_binlog.result 1. Disable ndb_condition_pushdown.test due to Bug 49746. 2010-02-09 13:16:01 +03:00
rpl_stm_innodb.result Merge next-mr -> next-4284. 2010-02-05 01:08:08 +03:00
rpl_stm_insert_delayed.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_stm_loaddata_concurrent.result Manual merge from mysql-trunk-merge. 2010-01-19 19:36:14 +03:00
rpl_stm_loadfile.result next-mr -> next-4284 merge. 2010-02-05 20:04:38 +03:00
rpl_stm_log.result Manual merge from mysql-trunk-merge. 2010-01-19 19:36:14 +03:00
rpl_stm_max_relay_size.result WL#4738 streamline/simplify @@variable creation process 2009-12-22 10:35:56 +01:00
rpl_stm_mix_show_relaylog_events.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_stm_mixing_engines.result Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing. 2010-02-02 10:56:42 +03:00
rpl_stm_multi_query.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_stm_no_op.result
rpl_stm_reset_slave.result BUG#48048: Deprecated constructs need removal in Betony 2009-11-04 12:28:20 +00:00
rpl_stm_start_stop_slave.result Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing. 2010-02-02 10:56:42 +03:00
rpl_stm_stop_middle_group.result Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing. 2010-02-02 10:56:42 +03:00
rpl_stm_until.result Manual merge from mysql-trunk-merge. 2010-01-31 01:06:50 +03:00
rpl_stm_user_variables.result Post-push fix: float/double to string conversions and vice versa 2010-02-10 00:05:45 +00:00
rpl_switch_stm_row_mixed.result WL#4738 streamline/simplify @@variable creation process 2009-12-22 10:35:56 +01:00
rpl_sync.result
rpl_temp_table.result
rpl_temp_table_mix_row.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
rpl_temporary.result Automerge from mysql-5.1-bugteam to mysql-trunk-merge. 2009-12-17 18:09:04 +03:00
rpl_temporary_errors.result
rpl_timezone.result
rpl_tmp_table_and_DDL.result Bug #49132 Replication failure on temporary table + DDL 2010-01-22 17:38:21 +08:00
rpl_trigger.result Merge next-mr -> next-4284. 2010-02-05 01:08:08 +03:00
rpl_trunc_temp.result
rpl_truncate_2myisam.result
rpl_truncate_3innodb.result
rpl_typeconv.result BUG#49836: Replication of geometric fields is broken after WL#5151 2009-12-24 01:07:35 +00:00
rpl_typeconv_innodb.result BUG#49618: Field length stored incorrectly in binary log 2009-12-15 16:11:44 +01:00
rpl_udf.result
rpl_user.result Revert a patch for Bug#48231, which introduced valgrind warnings. 2010-02-02 16:38:44 +03:00
rpl_user_variables.result
rpl_variables.result
rpl_variables_stm.result Manual merge from next-mr. 2010-01-12 20:07:09 +08:00
rpl_view.result
rpl_view_multi.result Backport of: 2009-11-30 19:21:40 +03:00