diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | repl-tests/test-repl-ts/repl-timestamp.master.reject | 2 | ||||
| -rw-r--r-- | sql/slave.cc | 4 | ||||
| -rw-r--r-- | sql/sql_class.h | 12 | ||||
| -rw-r--r-- | sql/sql_repl.cc | 4 |
5 files changed, 16 insertions, 7 deletions
diff --git a/.bzrignore b/.bzrignore index df51ff83850..ba1c287dae1 100644 --- a/.bzrignore +++ b/.bzrignore @@ -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 diff --git a/repl-tests/test-repl-ts/repl-timestamp.master.reject b/repl-tests/test-repl-ts/repl-timestamp.master.reject new file mode 100644 index 00000000000..37a76e7f360 --- /dev/null +++ b/repl-tests/test-repl-ts/repl-timestamp.master.reject @@ -0,0 +1,2 @@ +unix_timestamp(t) +973302660 diff --git a/sql/slave.cc b/sql/slave.cc index 018aed585ac..99a64da87bd 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -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 @@ -353,7 +351,7 @@ int init_master_info(MASTER_INFO* mi) master_connect_retry); } - + mi->inited = 1; pthread_mutex_unlock(&mi->lock); diff --git a/sql/sql_class.h b/sql/sql_class.h index d1e83c4ed01..d72467aab5a 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -64,9 +64,17 @@ typedef struct st_master_info uint connect_retry; pthread_mutex_t lock; 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) { diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 5cd5d3a159e..b2c3999f92d 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -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) |