MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Luis Soares Date:February 15 2010 12:19pm
Subject:bzr push into mysql-5.1-rpl-merge branch (luis.soares:2956 to 2957)
View as plain text  
 2957 Luis Soares	2010-02-15 [merge]
      Manual merge from mysql-5.1-rep+2 into mysql-5.1-rpl-merge.
      
      Conflicts
      =========
        Text conflict in sql/log_event.cc

    modified:
      sql/log_event.cc
 2956 Luis Soares	2010-02-14 [merge]
      Automerge from mysql-next-mr.

    added:
      mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result
      mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_basic.result
      mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result
      mysql-test/suite/sys_vars/r/innodb_file_format_basic.result
      mysql-test/suite/sys_vars/r/innodb_file_format_check_basic.result
      mysql-test/suite/sys_vars/r/innodb_io_capacity_basic.result
      mysql-test/suite/sys_vars/r/innodb_old_blocks_pct_basic.result
      mysql-test/suite/sys_vars/r/innodb_old_blocks_time_basic.result
      mysql-test/suite/sys_vars/r/innodb_read_ahead_threshold_basic.result
      mysql-test/suite/sys_vars/r/innodb_read_io_threads_basic.result
      mysql-test/suite/sys_vars/r/innodb_replication_delay_basic.result
      mysql-test/suite/sys_vars/r/innodb_spin_wait_delay_basic.result
      mysql-test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result
      mysql-test/suite/sys_vars/r/innodb_stats_sample_pages_basic.result
      mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result
      mysql-test/suite/sys_vars/r/innodb_use_sys_malloc_basic.result
      mysql-test/suite/sys_vars/r/innodb_version_basic.result
      mysql-test/suite/sys_vars/r/innodb_write_io_threads_basic.result
      mysql-test/suite/sys_vars/r/rpl_semi_sync_master_enabled_basic.result
      mysql-test/suite/sys_vars/r/rpl_semi_sync_master_timeout_basic.result
      mysql-test/suite/sys_vars/r/rpl_semi_sync_master_trace_level_basic.result
      mysql-test/suite/sys_vars/r/rpl_semi_sync_master_wait_no_slave_basic.result
      mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_enabled_basic.result
      mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_trace_level_basic.result
      mysql-test/suite/sys_vars/t/all_vars-master.opt
      mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_basic.test
      mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test
      mysql-test/suite/sys_vars/t/innodb_change_buffering_basic.test
      mysql-test/suite/sys_vars/t/innodb_file_format_basic.test
      mysql-test/suite/sys_vars/t/innodb_file_format_check_basic.test
      mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test
      mysql-test/suite/sys_vars/t/innodb_old_blocks_pct_basic.test
      mysql-test/suite/sys_vars/t/innodb_old_blocks_time_basic.test
      mysql-test/suite/sys_vars/t/innodb_read_ahead_threshold_basic.test
      mysql-test/suite/sys_vars/t/innodb_read_io_threads_basic.test
      mysql-test/suite/sys_vars/t/innodb_replication_delay_basic.test
      mysql-test/suite/sys_vars/t/innodb_spin_wait_delay_basic.test
      mysql-test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test
      mysql-test/suite/sys_vars/t/innodb_stats_sample_pages_basic.test
      mysql-test/suite/sys_vars/t/innodb_strict_mode_basic.test
      mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test
      mysql-test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test
      mysql-test/suite/sys_vars/t/innodb_version_basic.test
      mysql-test/suite/sys_vars/t/innodb_write_io_threads_basic.test
      mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic-master.opt
      mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic.test
      mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic-master.opt
      mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic.test
      mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic-master.opt
      mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic.test
      mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic-master.opt
      mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic.test
      mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic-master.opt
      mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic.test
      mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic-master.opt
      mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test
    modified:
      mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result
      mysql-test/suite/sys_vars/r/last_insert_id_basic.result
      mysql-test/suite/sys_vars/r/lc_messages_basic.result
      mysql-test/suite/sys_vars/r/log_slow_queries_basic.result
      mysql-test/suite/sys_vars/r/lower_case_file_system_basic.result
      mysql-test/suite/sys_vars/r/lower_case_table_names_basic.result
      mysql-test/suite/sys_vars/r/max_join_size_basic.result
      mysql-test/suite/sys_vars/r/old_alter_table_basic.result
      mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
      mysql-test/suite/sys_vars/r/profiling_basic.result
      mysql-test/suite/sys_vars/r/profiling_history_size_basic.result
      mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result
      mysql-test/suite/sys_vars/r/rand_seed1_basic.result
      mysql-test/suite/sys_vars/r/rand_seed2_basic.result
      mysql-test/suite/sys_vars/r/relay_log_recovery_basic.result
      mysql-test/suite/sys_vars/r/sql_log_update_basic.result
      mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result
      mysql-test/suite/sys_vars/r/sql_select_limit_basic.result
      mysql-test/suite/sys_vars/r/thread_cache_size_basic.result
      mysql-test/suite/sys_vars/t/all_vars.test
      mysql-test/suite/sys_vars/t/last_insert_id_basic.test
      mysql-test/suite/sys_vars/t/lc_messages_basic.test
      mysql-test/suite/sys_vars/t/log_slow_queries_basic.test
      mysql-test/suite/sys_vars/t/lower_case_file_system_basic.test
      mysql-test/suite/sys_vars/t/lower_case_table_names_basic.test
      mysql-test/suite/sys_vars/t/max_join_size_basic.test
      mysql-test/suite/sys_vars/t/old_alter_table_basic.test
      mysql-test/suite/sys_vars/t/optimizer_switch_basic.test
      mysql-test/suite/sys_vars/t/profiling_basic.test
      mysql-test/suite/sys_vars/t/profiling_history_size_basic.test
      mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test
      mysql-test/suite/sys_vars/t/rand_seed1_basic.test
      mysql-test/suite/sys_vars/t/rand_seed2_basic.test
      mysql-test/suite/sys_vars/t/relay_log_recovery_basic.test
      mysql-test/suite/sys_vars/t/sql_log_update_basic.test
      mysql-test/suite/sys_vars/t/sql_max_join_size_basic.test
      mysql-test/suite/sys_vars/t/sql_select_limit_basic.test
      mysql-test/suite/sys_vars/t/thread_cache_size_basic.test
      support-files/mysql.spec.sh
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2010-02-14 01:37:30 +0000
+++ b/sql/log_event.cc	2010-02-15 12:14:18 +0000
@@ -6517,9 +6517,7 @@ int Append_block_log_event::do_apply_eve
   }
 
   DBUG_EXECUTE_IF("remove_slave_load_file_before_write",
-                  {
-                    my_delete_allow_opened(fname, MYF(0));
-                  });
+                  my_delete_allow_opened(fname, MYF(0)););
 
   if (mysql_file_write(fd, (uchar*) block, block_len, MYF(MY_WME+MY_NABP)))
   {


Attachment: [text/bzr-bundle] bzr/luis.soares@sun.com-20100215121418-11pfoma42rnv1hfz.bundle
Thread
bzr push into mysql-5.1-rpl-merge branch (luis.soares:2956 to 2957)Luis Soares15 Feb