diff options
| author | sasha@mysql.sashanet.com <> | 2002-03-09 13:50:07 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2002-03-09 13:50:07 -0700 |
| commit | c9a4a5d88ec53b1887e46637ab9f3559bb8b7b5a (patch) | |
| tree | 2734469f3e9206ce704b8a68c87817a18a37f664 | |
| parent | 66cb43d216431a38d068b9418e9b612a7d86a442 (diff) | |
| download | mariadb-git-c9a4a5d88ec53b1887e46637ab9f3559bb8b7b5a.tar.gz | |
fixed replication bug
not yet tested - will not be pushed for a few hours - need to commit in
order to pull
| -rwxr-xr-x | BUILD/compile-pentium-debug | 2 | ||||
| -rw-r--r-- | sql/slave.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/BUILD/compile-pentium-debug b/BUILD/compile-pentium-debug index 7d25ac4a406..d8a6b60809b 100755 --- a/BUILD/compile-pentium-debug +++ b/BUILD/compile-pentium-debug @@ -6,7 +6,7 @@ path=`dirname $0` extra_flags="$pentium_cflags $debug_cflags" c_warnings="$c_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 " diff --git a/sql/slave.cc b/sql/slave.cc index 6add1885a4d..0ffc37eb975 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2470,6 +2470,8 @@ Log_event* next_event(RELAY_LOG_INFO* rli) sql_print_error("Slave SQL thread: I/O error reading \ event(errno=%d,cur_log->error=%d)", 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 pthread_mutex_unlock(&rli->data_lock); safe_sleep(rli->sql_thd,1,(CHECK_KILLED_FUNC)sql_slave_killed, |