mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

slave.h, slave.cc:

Browse source 
Do not flush the position to master.info file if we have a transaction open


sql/slave.cc:
  Do not flush the position to master.info file if we have a transaction open
sql/slave.h:
  Do not flush the position to master.info file if we have a transaction open
This commit is contained in:
unknown 2002-06-22 20:00:32 +03:00
parent 9ee25c7109
commit 23dbcb0fa4
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sql/slave.cc
View file

@ -907,6 +907,12 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
event_len); event_len);
char llbuff[22]; char llbuff[22];
mi->event_len = event_len; /* Added by Heikki: InnoDB internally stores the
master log position it has processed so far;
position to store is really
mi->pos + mi->pending + mi->event_len
since we must store the pos of the END of the
current log event */
if (ev) if (ev)
{ {
int type_code = ev->get_type_code(); int type_code = ev->get_type_code();
@ -1017,7 +1023,16 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
delete ev; delete ev;
mi->inc_pos(event_len); mi->inc_pos(event_len);
if (!(thd->options & (OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN))) {
/* We only flush the master info position to the master.info file if
the transaction is not open any more: an incomplete transaction will
be rolled back automatically in crash recovery in transactional
table handlers */
flush_master_info(mi); flush_master_info(mi);
}
break; break;
} }
@ -1139,10 +1154,16 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
} }
mi->inc_pos(event_len); mi->inc_pos(event_len);
if (!(thd->options & (OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN)))
flush_master_info(mi); flush_master_info(mi);
break; break;
} }
/* Question: in a START or STOP event, what happens if we have transaction
open? */
case START_EVENT: case START_EVENT:
mi->inc_pos(event_len); mi->inc_pos(event_len);
flush_master_info(mi); flush_master_info(mi);
@ -1168,6 +1189,8 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
mi->pos = 4; // skip magic number mi->pos = 4; // skip magic number
pthread_cond_broadcast(&mi->cond); pthread_cond_broadcast(&mi->cond);
pthread_mutex_unlock(&mi->lock); pthread_mutex_unlock(&mi->lock);
if (!(thd->options & (OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN)))
flush_master_info(mi); flush_master_info(mi);
#ifndef DBUG_OFF #ifndef DBUG_OFF
if(abort_slave_event_count) if(abort_slave_event_count)

6
sql/slave.h
View file

@ -12,6 +12,12 @@ typedef struct st_master_info
{ {
char log_file_name[FN_REFLEN]; char log_file_name[FN_REFLEN];
ulonglong pos,pending; ulonglong pos,pending;
int event_len; /* Added by Heikki: InnoDB internally stores the
master log position it has processed so far; the
position to store is really the sum
pos + pending + event_len
here since we must store the pos of the END of the
current log event */
File fd; // we keep the file open, so we need to remember the file pointer File fd; // we keep the file open, so we need to remember the file pointer
IO_CACHE file; IO_CACHE file;
// the variables below are needed because we can change masters on the fly // the variables below are needed because we can change masters on the fly