Commit 67eef6a5 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

sql/slave.cc 

    mutex now initialized in the constructor
sql/sql_class.h
    intialize MASTER_INFO mutex in the constructor
sql/sql_repl.cc
    fixed typo in error message
    if the user does not specify offset in CHANGE MASTER TO, set it to skip magic number
repl-tests/test-repl-ts/repl-timestamp.master.reject
    New BitKeeper file ``repl-tests/test-repl-ts/repl-timestamp.master.reject''
parent 60cdfe07

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -172,3 +172,4 @@ mysql-test/var/lib/test/elt_ck1.MYI 
mysql-test/var/lib/test/elt_ck2.frm

mysql-test/var/lib/test/elt_ck2.MYD

mysql-test/var/lib/test/elt_ck2.MYI

repl-tests/test-repl-ts/repl-timestamp.master.reject

repl-tests/test-repl-ts/repl-timestamp.master.reject

0 → 100644
+2 −0
Original line number Diff line number Diff line 
unix_timestamp(t)	

973302660

sql/slave.cc

+1 −3
Original line number Diff line number Diff line
@@ -290,8 +290,6 @@ int init_master_info(MASTER_INFO* mi) 
  char fname[FN_REFLEN+128];

  fn_format(fname, master_info_file, mysql_data_home, "", 4+16+32);

  

  if(!mi->inited)

   pthread_mutex_init(&mi->lock, NULL);



  // we need a mutex while we are changing master info parameters to

  // keep other threads from reading bogus info

sql/sql_class.h

+10 −2
Original line number Diff line number Diff line
@@ -66,7 +66,15 @@ typedef struct st_master_info 
  bool inited;

  

  st_master_info():inited(0),pending(0)

  { host[0] = 0; user[0] = 0; password[0] = 0;}

  {

    host[0] = 0; user[0] = 0; password[0] = 0;

    pthread_mutex_init(&lock, NULL);

  }



  ~st_master_info()

  {

    pthread_mutex_destroy(&lock);

  }

  

  inline void inc_pending(ulonglong val)

  {

sql/sql_repl.cc

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ void mysql_binlog_send(THD* thd, char* log_ident, ulong pos, ushort flags) 


  if(pos < 4)

    {

      errmsg = "Contratulations! You have hit the magic number and can win \

      errmsg = "Congratulations! You have hit the magic number and can win \

sweepstakes if you report the bug";

      goto err;

    }
@@ -616,7 +616,7 @@ int change_master(THD* thd) 
    {

      // if we change host or port, we must reset the postion

      glob_mi.log_file_name[0] = 0;

      glob_mi.pos = 0;

      glob_mi.pos = 4; // skip magic number

    }



  if(lex_mi->log_file_name)