diff options
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index aa06b1cfb0e..4f31b26fa6f 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1204,8 +1204,8 @@ int reset_slave(THD *thd, Master_info* mi) MY_STAT stat_area; char fname[FN_REFLEN]; int thread_mask= 0, error= 0; - uint sql_errno=ER_UNKNOWN_ERROR; - const char* errmsg= "Unknown error occured while reseting slave"; + uint sql_errno=0; + const char* errmsg=0; DBUG_ENTER("reset_slave"); lock_slave_threads(mi); @@ -1939,8 +1939,7 @@ err: replication events along LOAD DATA processing. @param file pointer to io-cache - @retval 0 success - @retval 1 failure + @return 0 */ int log_loaded_block(IO_CACHE* file) { @@ -1967,8 +1966,7 @@ int log_loaded_block(IO_CACHE* file) Append_block_log_event a(lf_info->thd, lf_info->thd->db, buffer, min(block_len, max_event_size), lf_info->log_delayed); - if (mysql_bin_log.write(&a)) - DBUG_RETURN(1); + mysql_bin_log.write(&a); } else { @@ -1976,8 +1974,7 @@ int log_loaded_block(IO_CACHE* file) buffer, min(block_len, max_event_size), lf_info->log_delayed); - if (mysql_bin_log.write(&b)) - DBUG_RETURN(1); + mysql_bin_log.write(&b); lf_info->wrote_create_file= 1; DBUG_SYNC_POINT("debug_lock.created_file_event",10); } |