diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-11 15:46:39 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-11 15:46:39 +0200 |
| commit | 934f5cc4662ded62609ce64be15c54d327cc554e (patch) | |
| tree | 39c72cd72a11f307f9898185deca1854ccf90c57 /sql/slave.cc | |
| parent | 3c9b877b19bd4eaa4734ea5d699add9ca70a4e53 (diff) | |
| download | mariadb-git-934f5cc4662ded62609ce64be15c54d327cc554e.tar.gz | |
Ensure that BEGIN / COMMIT is handled properly if slave dies
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
Docs/internals.texi:
Update binary protocol description
innobase/include/db0err.h:
Merge from 3.23
mysql-test/r/insert.result:
Updated test result from 3.23
sql/log.cc:
Fixed bug in replication and log rotation
sql/log_event.cc:
Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/slave.cc:
Fixed bug in replication and log rotation
sql/slave.h:
Ensure that BEGIN / COMMIT is handled properly if slave dies
sql/sql_analyse.cc:
Moved usage of res before res is destroyed (by bzero(&s...))
sql/sql_yacc.yy:
Added syntax support for
CREATE TABLE foo (a char CHARACTER SET latin1) CHARSET=latin1;
To be able to read MySQL 4.1 dump files.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index eb53e488856..a4e0b029bbf 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2711,7 +2711,12 @@ static IO_CACHE *reopen_relay_log(RELAY_LOG_INFO *rli, const char **errmsg) if ((rli->cur_log_fd=open_binlog(cur_log,rli->relay_log_name, errmsg)) <0) DBUG_RETURN(0); - my_b_seek(cur_log,rli->relay_log_pos); + /* + We want to start exactly where we was before: + relay_log_pos Current log pos + pending Number of bytes already processed from the event + */ + my_b_seek(cur_log,rli->relay_log_pos + rli->pending); DBUG_RETURN(cur_log); } |