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


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

1 files changed, 10 insertions, 2 deletions

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)
   {