mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysql-test/r
History
unknown 75686dc73f WL#3629 - Replication of Invocation and Invoked Features 
This patch corrects errors that occurred in a local manual merge as a result
of updating the local repository and includes changes necessary to correct 
problems found during the recalculation of next execution of events in RBR.


mysql-test/include/rpl_events.inc:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch changes the rpl_events test to be more comprehensive in catching
  errors as a result of RBR. Changes include clarification of SELECTs with
  WHERE clauses and synchronization with master and slave.
mysql-test/r/rpl_events.result:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch changes the results for the rpl_events test to accomodate the changes
  in the test.
scripts/mysql_system_tables.sql:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch adds the originator column and a new enum value to the mysql.event table.
  This change was necessary to accomodate changes as a result of other patches.
sql/event_data_objects.cc:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch corrects an error in merging that occurred during manual merge.
  The status check was changed to include either ENABLED or DISABLED in the
  gate to change the status to SLAVESIDE_DISABLED for events replicated to 
  the slave.
  
  This patch also includes an update to correct a problem encountered during
  testing after the local merge. The update_timing_fields method is replicating
  the timing changes in RBR to the slave thereby over writing the change to the
  status column in the process. This code includes a check to turn off the next
  binlog event if in RBR.
sql/event_queue.cc:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch corrects an error in merging that occurred during manual merge.
  The code was corrected to include both types of disabled status enums
  (DISABLED, SLAVESIDE_DISABLED) in the create_event and update_event methods.
sql/sql_show.cc:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch corrects an error in merging that occurred during manual merge.
  It corrects the order in which the originator column appears in the show
  structures. The error caused incorrect output on SHOW EVENTS commands.
2007-03-29 08:17:19 -04:00
..
1st.result
alias.result
alter_table-big.result
alter_table.result
analyse.result
analyze.result
ansi.result
archive.result
archive_bitfield.result
archive_gis.result
auto_increment.result
backup.result
bench_count_distinct.result
big_test.require
bigint.result
binary.result
binlog_row_binlog.result
binlog_row_blackhole.result
binlog_row_ctype_cp932.result
binlog_row_ctype_ucs.result
binlog_row_drop_tmp_tbl.result
binlog_row_innodb_stat.result
binlog_row_insert_select.result
binlog_row_mix_innodb_myisam.result
binlog_statement_insert_delayed.result
binlog_stm_binlog.result
binlog_stm_blackhole.result
binlog_stm_ctype_cp932.result
binlog_stm_ctype_ucs.result
binlog_stm_drop_tmp_tbl.result
binlog_stm_innodb_stat.result
binlog_stm_insert_select.result
binlog_stm_mix_innodb_myisam.result
bool.result
bootstrap.result
bulk_replace.result
cache_innodb.result
case.result
case_sensitive_file_system.require
cast.result
check.result
check_var_limit.require
client_xml.result
comments.result
compare.result
compress.result
concurrent_innodb.result
connect.result
consistent_snapshot.result
constraints.result
contributors.result
count_distinct.result
count_distinct2.result
count_distinct3.result
crash_commit_before.result
create.result
create_not_windows.result
create_select_tmp.result
csv.result
ctype_big5.result
ctype_collate.result
ctype_cp932_binlog_row.result
ctype_cp932_binlog_stm.result
ctype_cp1250_ch.result
ctype_cp1251.result
ctype_create.result
ctype_eucjpms.result
ctype_euckr.result
ctype_filename.result
ctype_gb2312.result
ctype_gbk.result
ctype_hebrew.result
ctype_latin1.result
ctype_latin1_de.result
ctype_latin2.result
ctype_latin2_ch.result
ctype_many.result
ctype_mb.result
ctype_recoding.result
ctype_sjis.result
ctype_tis620.result
ctype_uca.result
ctype_ucs.result
ctype_ucs2_def.result
ctype_ujis.result
ctype_utf8.result
date_formats.result
deadlock_innodb.result
default.result
delayed.result
delete.result
derived.result
dirty_close.result
distinct.result
drop.result
empty_table.result
endspace.result
errors.result
events.result WL#3629 - Replication of Invocation and Invoked Features 2007-03-16 09:56:57 -04:00
events_bugs.result
events_grant.result WL#3629 - Replication of Invocation and Invoked Features 2007-03-16 09:56:57 -04:00
events_logs_tests.result
events_microsec.result
events_restart_phase0.result
events_restart_phase1.result WL#3629 - Replication of Invocation and Invoked Features 2007-03-16 09:56:57 -04:00
events_restart_phase2.result
events_restart_phase3.result
events_scheduling.result
events_stress.result
exampledb.result
execution_constants.result
explain.result Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-03-11 00:26:45 +03:00
federated.result
federated_archive.result
federated_bug_13118.result
federated_server.result
federated_transactions.result
fix_priv_tables.result
fix_priv_tabs.result
flush.result
flush2.result
flush_block_commit.result
flush_block_commit_notembedded.result
flush_read_lock_kill.result
flush_table.result
foreign_key.result
fulltext.result
fulltext2.result
fulltext_cache.result
fulltext_distinct.result
fulltext_left_join.result
fulltext_multi.result
fulltext_order_by.result
fulltext_update.result
fulltext_var.result
func_compress.result
func_concat.result
func_crypt.result
func_date_add.result
func_default.result Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-03-11 00:26:45 +03:00
func_des_encrypt.result
func_encrypt.result
func_encrypt_nossl.result
func_equal.result
func_gconcat.result
func_group.result
func_group_innodb.result
func_if.result
func_in.result
func_isnull.result
func_like.result
func_math.result
func_misc.result
func_op.result
func_regexp.result Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-03-11 00:26:45 +03:00
func_sapdb.result
func_set.result
func_str.result Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-03-11 00:26:45 +03:00
func_system.result
func_test.result Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-03-11 00:26:45 +03:00
func_time.result
func_timestamp.result
gcc296.result
gis-rtree.result
gis.result
grant.result
grant2.result
grant3.result
grant_cache.result
greedy_optimizer.result
group_by.result
group_min_max.result
group_min_max_innodb.result
handler_innodb.result
handler_myisam.result
have_big5.require
have_binlog_format_mixed.require
have_binlog_format_row.require
have_binlog_format_statement.require
have_compress.require
have_cp932.require
have_cp1250_ch.require
have_crypt.require
have_debug.require
have_dynamic_loading.require
have_eucjpms.require
have_euckr.require
have_example_plugin.require
have_gb2312.require
have_gbk.require
have_geometry.require
have_latin2_ch.require
have_met_timezone.require
have_moscow_leap_timezone.require
have_mysql_upgrade.result
have_ndb_extra.require
have_ndbapi_examples.require
have_outfile.require
have_partition.require
have_perror.require
have_query_cache.require
have_sjis.require
have_ssl.require
have_symlink.require
have_tis620.require
have_ucs2.require
have_udf_example.require
have_ujis.require
having.result Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-03-11 00:26:45 +03:00
heap.result
heap_auto_increment.result
heap_btree.result
heap_hash.result
help.result
im_cmd_line.result
im_daemon_life_cycle.result
im_instance_conf.result
im_life_cycle.result
im_options.result
im_utils.result
index_merge_innodb.result
index_merge_myisam.result
information_schema.result
information_schema_chmod.result
information_schema_db.result
information_schema_inno.result
information_schema_part.result
init_connect.result
init_file.result
innodb-lock.result
innodb-replace.result
innodb-ucs2.result
innodb.result
innodb_gis.result
innodb_mysql.result
innodb_notembedded.result
innodb_timeout_rollback.result
insert.result
insert_notembedded.result
insert_select.result
insert_update.result
is_debug_build.require
isam.result
join.result
join_crash.result
join_nested.result
join_outer.result
join_outer_innodb.result
key.result
key_cache.result
key_diff.result
key_primary.result
keywords.result
kill.result
limit.result
loaddata.result
loaddata_autocom_innodb.result
loaddata_autocom_ndb.result
lock.result
lock_multi.result
lock_tables_lost_commit.result
log_state.result
log_tables.result
lowercase0.require
lowercase2.require
lowercase_fs_off.result
lowercase_table.result
lowercase_table2.result
lowercase_table3.result
lowercase_table_grant.result
lowercase_table_qcache.result
lowercase_view.result
merge.result
metadata.result
mix2_myisam.result
mix2_myisam_ucs2.result
multi_statement.result
multi_update.result
myisam-blob.result
myisam-system.result
myisam.result
mysql.result
mysql_client_test.result
mysql_cp932.result
mysql_protocols.result
mysql_upgrade.result
mysqladmin.result
mysqlbinlog-cp932.result
mysqlbinlog.result
mysqlbinlog2.result
mysqlbinlog_base64.result
mysqlcheck.result
mysqldump-max.result
mysqldump.result
mysqlshow.result
mysqlslap.result
mysqltest.result
ndb_alter_table.result
ndb_alter_table2.result
ndb_alter_table3.result
ndb_autodiscover.result
ndb_autodiscover2.result
ndb_autodiscover3.result
ndb_basic.result
ndb_binlog_basic.result
ndb_binlog_basic2.result
ndb_binlog_ddl_multi.result
ndb_binlog_discover.result
ndb_binlog_ignore_db.result
ndb_binlog_multi.result
ndb_bitfield.result
ndb_blob.result
ndb_blob_partition.result
ndb_cache.result
ndb_cache2.result
ndb_cache_multi.result
ndb_cache_multi2.result
ndb_charset.result
ndb_condition_pushdown.result
ndb_config.result
ndb_config2.result
ndb_cursor.result
ndb_database.result
ndb_dd_alter.result
ndb_dd_backuprestore.result
ndb_dd_basic.result
ndb_dd_ddl.result
ndb_dd_disk2memory.result
ndb_dd_dump.result
ndb_dd_sql_features.result
ndb_default_cluster.require
ndb_gis.result
ndb_grant.result
ndb_index.result
ndb_index_ordered.result
ndb_index_unique.result
ndb_insert.result
ndb_limit.result
ndb_load.result
ndb_loaddatalocal.result
ndb_lock.result
ndb_minmax.result
ndb_multi.result
ndb_multi_row.result
ndb_partition_error.result
ndb_partition_key.result
ndb_partition_list.result
ndb_partition_range.result
ndb_read_multi_range.result
ndb_rename.result
ndb_replace.result
ndb_restore.result
ndb_restore_compat.result
ndb_restore_partition.result
ndb_sp.result
ndb_subquery.result
ndb_temporary.result
ndb_transaction.result
ndb_trigger.result
ndb_truncate.result
ndb_types.result
ndb_update.result
ndb_view.result
ndbapi.result
negation_elimination.result
no-threads.result
not_as_root.require
not_embedded.require
not_embedded_server.result
not_ndb.require
not_ndb_default.require
not_openssl.require
not_partition.require
not_partition.result
not_valgrind.require
not_windows.require
null.result
null_key.result
odbc.result
olap.result Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-03-11 00:26:45 +03:00
one_thread_per_connection.require
openssl_1.result
openssl_2.result
order_by.result
order_fill_sortbuf.result
outfile.result
overflow.result
packet.result
parser.result
parser_bug21114_innodb.result
partition.result
partition_02myisam.result
partition_03ndb.result
partition_charset.result
partition_error.result
partition_federated.result
partition_grant.result
partition_hash.result
partition_innodb.result
partition_list.result
partition_mgm.result
partition_mgm_err.result
partition_mgm_err2.result
partition_order.result
partition_pruning.result
partition_range.result
perror.result
plugin.result
preload.result
ps.result
ps_1general.result
ps_2myisam.result
ps_3innodb.result
ps_4heap.result
ps_5merge.result
ps_7ndb.result
ps_10nestset.result
ps_11bugs.result
ps_grant.result
ps_not_windows.result
query_cache.result
query_cache_merge.result
query_cache_notembedded.result
raid.result
range.result
read_many_rows_innodb.result
read_only.result
read_only_innodb.result
rename.result
renamedb.result
repair.result
replace.result
rollback.result
round.result
row.result
rowid_order_innodb.result
rpl000001.a.result
rpl000001.b.result
rpl000010.result
rpl000011.result
rpl000013.result
rpl000017.result
rpl_000015.result
rpl_alter.result
rpl_alter_db.result
rpl_auto_increment.result
rpl_auto_increment_11932.result
rpl_bit.result
rpl_bit_npk.result
rpl_change_master.result
rpl_charset_sjis.result
rpl_commit_after_flush.result
rpl_create_database.result
rpl_ddl.result
rpl_deadlock_innodb.result
rpl_delete_no_where.result
rpl_do_grant.result
rpl_drop.result
rpl_drop_db.result
rpl_drop_temp.result
rpl_dual_pos_advance.result
rpl_EE_err.result
rpl_empty_master_crash.result
rpl_err_ignoredtable.result
rpl_events.result WL#3629 - Replication of Invocation and Invoked Features 2007-03-29 08:17:19 -04:00
rpl_extraCol_innodb.result
rpl_extraCol_myisam.result
rpl_failed_optimize.result
rpl_flushlog_loop.result
rpl_foreign_key_innodb.result
rpl_free_items.result
rpl_get_lock.result
rpl_ignore_grant.result
rpl_ignore_revoke.result
rpl_ignore_table.result
rpl_ignore_table_update.result
rpl_init_slave.result
rpl_innodb.result
rpl_insert.result
rpl_insert_id.result
rpl_insert_id_pk.result
rpl_insert_ignore.result
rpl_insert_select.result
rpl_known_bugs_detection.result
rpl_LD_INFILE.result
rpl_load_from_master.result
rpl_load_table_from_master.result
rpl_loaddata.result
rpl_loaddata_charset.result
rpl_loaddata_m.result
rpl_loaddata_s.result
rpl_loaddata_simple.result
rpl_loaddatalocal.result
rpl_loadfile.result
rpl_locale.result
rpl_log_pos.result
rpl_many_optimize.result
rpl_master_pos_wait.result
rpl_misc_functions.result Bug #25543 Replication of wrong values if using rand() in stored procedure 2007-03-09 12:18:28 -05:00
rpl_mixed_ddl_dml.result
rpl_multi_delete.result
rpl_multi_delete2.result
rpl_multi_engine.result
rpl_multi_update.result
rpl_multi_update2.result
rpl_multi_update3.result
rpl_multi_update4.result
rpl_ndb_2innodb.result
rpl_ndb_2myisam.result
rpl_ndb_auto_inc.result
rpl_ndb_bank.result
rpl_ndb_basic.result BUG#23171: Illegal group log position 2007-03-22 16:59:55 +01:00
rpl_ndb_blob.result
rpl_ndb_blob2.result
rpl_ndb_charset.result
rpl_ndb_commit_afterflush.result
rpl_ndb_dd_advance.result
rpl_ndb_dd_basic.result
rpl_ndb_dd_partitions.result
rpl_ndb_ddl.result
rpl_ndb_delete_nowhere.result
rpl_ndb_do_db.result
rpl_ndb_do_table.result
rpl_ndb_extraCol.result
rpl_ndb_func003.result
rpl_ndb_idempotent.result
rpl_ndb_innodb_trans.result
rpl_ndb_insert_ignore.result
rpl_ndb_load.result
rpl_ndb_log.result
rpl_ndb_multi.result
rpl_ndb_multi_update2.result
rpl_ndb_multi_update3.result
rpl_ndb_relayrotate.result
rpl_ndb_rep_ignore.result
rpl_ndb_row_001.result
rpl_ndb_sp003.result
rpl_ndb_sp006.result
rpl_ndb_sync.result
rpl_ndb_trig004.result
rpl_ndb_UUID.result
rpl_ndbapi_multi.result
rpl_openssl.result
rpl_optimize.result
rpl_packet.result
rpl_ps.result
rpl_rbr_to_sbr.result
rpl_read_only.result
rpl_redirect.result
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_rewrt_db.result
rpl_rotate_logs.result
rpl_row_001.result
rpl_row_4_bytes.result
rpl_row_basic_2myisam.result
rpl_row_basic_3innodb.result
rpl_row_basic_7ndb.result
rpl_row_basic_8partition.result
rpl_row_basic_11bugs.result
rpl_row_blob_innodb.result
rpl_row_blob_myisam.result
rpl_row_charset.result
rpl_row_create_table.result
rpl_row_delayed_ins.result
rpl_row_drop.result
rpl_row_err_ignoredtable.result
rpl_row_flsh_tbls.result
rpl_row_func001.result
rpl_row_func002.result
rpl_row_func003.result
rpl_row_inexist_tbl.result
rpl_row_insert_delayed.result
rpl_row_loaddata_m.result
rpl_row_log.result
rpl_row_log_innodb.result
rpl_row_max_relay_size.result
rpl_row_multi_query.result
rpl_row_mysqlbinlog.result
rpl_row_mystery22.result
rpl_row_NOW.result
rpl_row_reset_slave.result
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_stop_middle.result
rpl_row_stop_middle_update.result
rpl_row_tabledefs_2myisam.result Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2007-03-22 09:05:11 +01:00
rpl_row_tabledefs_3innodb.result Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2007-03-22 09:05:11 +01:00
rpl_row_tabledefs_7ndb.result
rpl_row_trig001.result
rpl_row_trig002.result
rpl_row_trig003.result
rpl_row_trig004.result
rpl_row_until.result
rpl_row_USER.result
rpl_row_UUID.result
rpl_row_view01.result
rpl_server_id1.result
rpl_server_id2.result
rpl_session_var.result
rpl_set_charset.result
rpl_sf.result
rpl_skip_error.result
rpl_slave_status.result
rpl_sp.result
rpl_sp004.result
rpl_sp_effects.result
rpl_sporadic_master.result
rpl_ssl.result rpl_ssl.result, rpl_ssl.test: 2007-03-08 19:57:35 +01:00
rpl_start_stop_slave.result
rpl_stm_000001.result
rpl_stm_charset.result
rpl_stm_EE_err2.result
rpl_stm_flsh_tbls.result
rpl_stm_insert_delayed.result
rpl_stm_log.result
rpl_stm_max_relay_size.result
rpl_stm_multi_query.result
rpl_stm_mystery22.result
rpl_stm_no_op.result
rpl_stm_reset_slave.result
rpl_stm_until.result
rpl_switch_stm_row_mixed.result
rpl_temp_table.result
rpl_temporary.result
rpl_timezone.result
rpl_trigger.result
rpl_trunc_temp.result
rpl_truncate_2myisam.result
rpl_truncate_3innodb.result
rpl_truncate_7ndb.result
rpl_truncate_7ndb_2.result
rpl_udf.result WL#3629 - Replication of Invocation and Invoked Features 2007-03-16 09:56:57 -04:00
rpl_user_variables.result
rpl_variables.result
rpl_view.result
schema.result
select.result
select_found.result
select_safe.result
server_id.require
server_id1.require
show_check.result
skip_grants.result
skip_name_resolve.result
slave-running.result
slave-stopped.result
sp-big.result
sp-code.result
sp-destruct.result
sp-dynamic.result
sp-error.result
sp-prelocking.result
sp-security.result
sp-threads.result
sp-ucs2.result
sp-vars.result
sp.result aftermerge fix 2007-03-09 13:38:40 +04:00
sp_gis.result
sp_notembedded.result
sp_stress_case.result
sp_trans.result
sql_mode.result
ssl.result
ssl_compress.result
ssl_connect.result
status.result
strict.result
strict_autoinc_1myisam.result
strict_autoinc_2innodb.result
strict_autoinc_3heap.result
strict_autoinc_4bdb.result
strict_autoinc_5ndb.result
subselect.result Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-03-11 00:26:45 +03:00
subselect2.result
subselect3.result
subselect_gis.result
subselect_innodb.result
subselect_notembedded.result
sum_distinct-big.result
sum_distinct.result
symlink.result
synchronization.result
sysdate_is_now.result
system_mysql_db.result WL#3629 - Replication of Invocation and Invoked Features 2007-03-16 09:56:57 -04:00
system_mysql_db_refs.result
tablelock.result
temp_table.result
testdb_only.require
timezone.result
timezone2.result
timezone3.result
timezone4.result
timezone_grant.result
trigger-compat.result
trigger-grant.result
trigger-trans.result
trigger.result
true.require
truncate.result
type_binary.result
type_bit.result
type_bit_innodb.result
type_blob.result
type_date.result
type_datetime.result
type_decimal.result
type_enum.result
type_float.result
type_nchar.result
type_newdecimal-big.result
type_newdecimal.result
type_ranges.result
type_set.result
type_time.result
type_timestamp.result
type_uint.result
type_varchar.result
type_year.result
udf.result
union.result Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-03-11 00:26:45 +03:00
unsafe_binlog_innodb.result
update.result
upgrade.result
user_limits.result
user_var-binlog.result
user_var.result
varbinary.result Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-03-11 00:26:45 +03:00
variables.result
view.result aftermerge fix 2007-03-09 13:38:40 +04:00
view_grant.result
view_query_cache.result
wait_timeout.result
warnings.result
warnings_engine_disabled.result
windows.require
windows.result
xa.result
xml.result