1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sql/slave.cc

Browse Source 
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''


BitKeeper/etc/ignore:
  Added repl-tests/test-repl-ts/repl-timestamp.master.reject to the ignore list
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
This commit is contained in:
unknown 2000-11-03 19:31:22 -07:00
parent a1b03526fc
commit 745f1197f6
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -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.frm
mysql-test/var/lib/test/elt_ck2.MYD mysql-test/var/lib/test/elt_ck2.MYD
mysql-test/var/lib/test/elt_ck2.MYI mysql-test/var/lib/test/elt_ck2.MYI
repl-tests/test-repl-ts/repl-timestamp.master.reject

2
repl-tests/test-repl-ts/repl-timestamp.master.reject Normal file
View File

@ -0,0 +1,2 @@
unix_timestamp(t)
973302660

4
sql/slave.cc
View File

@ -290,8 +290,6 @@ int init_master_info(MASTER_INFO* mi)
char fname[FN_REFLEN+128]; char fname[FN_REFLEN+128];
fn_format(fname, master_info_file, mysql_data_home, "", 4+16+32); 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 // we need a mutex while we are changing master info parameters to
// keep other threads from reading bogus info // keep other threads from reading bogus info
@ -353,7 +351,7 @@ int init_master_info(MASTER_INFO* mi)
master_connect_retry); master_connect_retry);
} }
mi->inited = 1; mi->inited = 1;
pthread_mutex_unlock(&mi->lock); pthread_mutex_unlock(&mi->lock);

12
sql/sql_class.h
View File

@ -64,9 +64,17 @@ typedef struct st_master_info
uint connect_retry; uint connect_retry;
pthread_mutex_t lock; pthread_mutex_t lock;
bool inited; bool inited;
st_master_info():inited(0),pending(0) 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) inline void inc_pending(ulonglong val)
{ {

4
sql/sql_repl.cc
View File

@ -228,7 +228,7 @@ void mysql_binlog_send(THD* thd, char* log_ident, ulong pos, ushort flags)
if(pos < 4) 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"; sweepstakes if you report the bug";
goto err; goto err;
} }
@ -616,7 +616,7 @@ int change_master(THD* thd)
{ {
// if we change host or port, we must reset the postion // if we change host or port, we must reset the postion
glob_mi.log_file_name[0] = 0; glob_mi.log_file_name[0] = 0;
glob_mi.pos = 0; glob_mi.pos = 4; // skip magic number
} }
if(lex_mi->log_file_name) if(lex_mi->log_file_name)