Commit 5527f9bf authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

mysql-test/t/rpl_sporadic_master.test 

    fixed test case to produce same results on txn-enabled binary. 
    temporary fix - permanent fix is it make mysqld behave the same with
    MyISAM on auto_increment insert after delete from tbl_name regardless
    of how the binary was compiled
sql/slave.cc
    fixed concurrency bug with log_seq
sql/slave.h
    last_log_seq needs to be updated atomically with pos
sql/sql_repl.cc
    cleared up comment and fixed concurrency bug
parent db4a8602

mysql-test/t/rpl_sporadic_master.test

+5 −0
Original line number Diff line number Diff line
@@ -6,12 +6,17 @@ drop table if exists t1; 
create table t1(n int not null auto_increment primary key);

insert into t1 values (NULL),(NULL);

delete from t1;

set insert_id=1;

insert into t1 values (NULL),(NULL);

set insert_id=3;

insert into t1 values (NULL),(NULL);

flush logs;

delete from t1;

set insert_id=1;

insert into t1 values (NULL),(NULL);

set insert_id=3;

insert into t1 values (NULL),(NULL);

set insert_id=5;

insert into t1 values (NULL),(NULL);

save_master_pos;

connection slave;

sql/slave.cc

+13 −17
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) 
      if(type_code == LOAD_EVENT)

	skip_load_data_infile(net);

	

      mi->inc_pos(event_len);

      mi->inc_pos(event_len, ev->log_seq);

      flush_master_info(mi);

      if(slave_skip_counter)

        --slave_skip_counter;
@@ -1019,10 +1019,9 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) 
	return 1;

      }

      free_root(&thd->mem_root,0);

      mi->last_log_seq = ev->log_seq;

      delete ev;

      thd->log_seq = 0;

      mi->inc_pos(event_len);

      mi->inc_pos(event_len, ev->log_seq);

      delete ev;

      flush_master_info(mi);

      break;

    }
@@ -1035,11 +1034,10 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) 
	mysql_bin_log.write(sev);

      }



      mi->last_log_seq = ev->log_seq;

      delete ev;

      thd->log_seq = 0;

      mi->inc_pos(event_len);

      mi->inc_pos(event_len, ev->log_seq);

      flush_master_info(mi);

      delete ev;

      break;

    }
@@ -1150,8 +1148,6 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) 
	return 1;

      }

      

      mi->last_log_seq = ev->log_seq;

      delete ev;

      thd->log_seq = 0;

      free_root(&thd->mem_root,0);
@@ -1159,18 +1155,19 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) 
      {

	sql_print_error("Slave: Fatal error running query '%s' ",

			thd->query);

        delete ev;

	return 1;

      }



      mi->inc_pos(event_len);

      mi->inc_pos(event_len, ev->log_seq);

      delete ev;

      flush_master_info(mi);

      break;

    }



    case START_EVENT:

      close_temporary_tables(thd);

      mi->inc_pos(event_len);

      mi->last_log_seq = ev->log_seq;

      mi->inc_pos(event_len, ev->log_seq);

      flush_master_info(mi);

      delete ev;

      thd->log_seq = 0;
@@ -1180,10 +1177,9 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) 
      if(mi->pos > 4) // stop event should be ignored after rotate event

	{

          close_temporary_tables(thd);

          mi->inc_pos(event_len);

          mi->inc_pos(event_len, ev->log_seq);

          flush_master_info(mi);

	}

      mi->last_log_seq = ev->log_seq;

      delete ev;

      thd->log_seq = 0;

      break;
@@ -1207,17 +1203,17 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) 
      }

      mi->pos = rev->pos; 

      mi->last_log_seq = ev->log_seq;

      pthread_cond_broadcast(&mi->cond);

      pthread_mutex_unlock(&mi->lock);

#ifndef DBUG_OFF

      if (abort_slave_event_count)

	++events_till_abort;

#endif

      if (rotate_binlog)

      {

	mi->last_log_seq = 0;

	mysql_bin_log.new_file();

	mi->last_log_seq = 0;

      }

      pthread_cond_broadcast(&mi->cond);

      pthread_mutex_unlock(&mi->lock);

      flush_master_info(mi);

      

      if (write_slave_event)

sql/slave.h

+2 −1
Original line number Diff line number Diff line
@@ -36,11 +36,12 @@ typedef struct st_master_info 
  {

    pending += val;

  }

  inline void inc_pos(ulonglong val)

  inline void inc_pos(ulonglong val, uint32 log_seq)

  {

    pthread_mutex_lock(&lock);

    pos += val + pending;

    pending = 0;

    last_log_seq = log_seq;

    pthread_cond_broadcast(&cond);

    pthread_mutex_unlock(&lock);

  }

sql/sql_repl.cc

+5 −13
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



// Sasha Pachev <sasha@mysql.com> is currently in charge of this file

// Do not mess with it without his permission!



#include "mysql_priv.h"

#include "sql_repl.h"
@@ -259,9 +258,10 @@ void adjust_linfo_offsets(my_off_t purge_offset) 
    if ((linfo = tmp->current_linfo))

    {

      pthread_mutex_lock(&linfo->lock);

      // Why (monty): I don't understand this comment

      // no big deal if we just started reading the log

      // nothing to adjust

      /* index file offset can be less that purge offset

	 only if we just started reading the index file. In that case

	 we have nothing to adjust

      */

      if (linfo->index_file_offset < purge_offset)

	linfo->fatal = (linfo->index_file_offset != 0);

      else
@@ -935,16 +935,7 @@ int translate_master(THD* thd, LEX_MASTER_INFO* mi, char* errmsg) 


  linfo.index_file_offset = 0;

  

  /*

    WARNING: POSSIBLE BUG:

    Sasha, you are setting an uninitialized linfo into

    thd->current_linfo.

    What will happen if some other thread calls log_in_use() or

    adjust_linfo_offsets() after the next instruction as linfo may

    contain anything ?

  */



  thd->current_linfo = &linfo;

  search_file_name[0] = 0;



  if (mysql_bin_log.find_first_log(&linfo, search_file_name))
@@ -952,6 +943,7 @@ int translate_master(THD* thd, LEX_MASTER_INFO* mi, char* errmsg) 
    strmov(errmsg,"Could not find first log");

    return 1;

  }

  thd->current_linfo = &linfo;



  bzero((char*) &log,sizeof(log));

  log_lock = mysql_bin_log.get_log_lock();