Commit ea86f4fe authored by unknown's avatar unknown

fixed replication bug

not yet tested - will not be pushed for a few hours - need to commit in 
order to pull


BUILD/compile-pentium-debug:
  link statically
sql/slave.cc:
  properly seek the position when recovering from a partial read
parent 5bdc999b
...@@ -6,7 +6,7 @@ path=`dirname $0` ...@@ -6,7 +6,7 @@ path=`dirname $0`
extra_flags="$pentium_cflags $debug_cflags" extra_flags="$pentium_cflags $debug_cflags"
c_warnings="$c_warnings $debug_extra_warnings" c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings" cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$pentium_configs $debug_configs" extra_configs="$pentium_configs $debug_configs $static_link"
extra_configs="$extra_configs " extra_configs="$extra_configs "
......
...@@ -2470,6 +2470,8 @@ Log_event* next_event(RELAY_LOG_INFO* rli) ...@@ -2470,6 +2470,8 @@ Log_event* next_event(RELAY_LOG_INFO* rli)
sql_print_error("Slave SQL thread: I/O error reading \ sql_print_error("Slave SQL thread: I/O error reading \
event(errno=%d,cur_log->error=%d)", event(errno=%d,cur_log->error=%d)",
my_errno,cur_log->error); my_errno,cur_log->error);
// set read position to the beginning of the event
my_b_seek(cur_log,rli->relay_log_pos+rli->pending);
// no need to hog the mutex while we sleep // no need to hog the mutex while we sleep
pthread_mutex_unlock(&rli->data_lock); pthread_mutex_unlock(&rli->data_lock);
safe_sleep(rli->sql_thd,1,(CHECK_KILLED_FUNC)sql_slave_killed, safe_sleep(rli->sql_thd,1,(CHECK_KILLED_FUNC)sql_slave_killed,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment