List:Internals« Previous MessageNext Message »
From:sasha Date:March 3 2002 5:00am
Subject:bk commit into 4.0 tree
View as plain text  
Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated to 
the main repository and within 24 hours after the push to the public repository. 
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2002-03-02 22:00:37-07:00, sasha@stripped
  fixed the use of unitialized variable - code now works on the test system 
  of one of our users which replicates from a live server. So I now have a
  lot of confidence in it and will push. It passes all tests, so I if I broke
  somebody's code in 3.23 merge this is your fault - you should have had a good test
  case :-)

  sql/slave.h
    1.34 02/03/02 22:00:36 sasha@stripped +2 -0
    fixed cache initialization problem

  sql/slave.cc
    1.157 02/03/02 22:00:35 sasha@stripped +1 -1
    added DBUG_ASSERT() 

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql-4.0

--- 1.156/sql/slave.cc	Fri Mar  1 17:12:14 2002
+++ 1.157/sql/slave.cc	Sat Mar  2 22:00:35 2002
@@ -361,6 +361,7 @@
     abstime.tv_sec=tv.tv_sec+2;
     abstime.tv_nsec=tv.tv_usec*1000;
 #endif
+    DBUG_ASSERT(cond_lock->count > 0 && cond_lock->thread == pthread_self());
     pthread_cond_timedwait(term_cond, cond_lock, &abstime);
     if (*slave_running)
       KICK_SLAVE(thd);
@@ -947,7 +948,6 @@
   int info_fd;
   const char* msg = 0;
   int error = 0;
-  
   fn_format(fname, info_fname,
 	    mysql_data_home, "", 4+32);
   pthread_mutex_lock(&rli->data_lock);

--- 1.33/sql/slave.h	Thu Feb  7 15:29:44 2002
+++ 1.34/sql/slave.h	Sat Mar  2 22:00:36 2002
@@ -157,6 +157,7 @@
 		      log_pos_current(0)
     {
       relay_log_name[0] = master_log_name[0] = 0;
+      bzero(&info_file,sizeof(info_file));
       pthread_mutex_init(&run_lock, MY_MUTEX_INIT_FAST);
       pthread_mutex_init(&data_lock, MY_MUTEX_INIT_FAST);
       pthread_cond_init(&data_cond, NULL);
@@ -271,6 +272,7 @@
   st_master_info():fd(-1), io_thd(0), inited(0), old_format(0)
   {
     host[0] = 0; user[0] = 0; password[0] = 0;
+    bzero(&file,sizeof(file));
     pthread_mutex_init(&run_lock, MY_MUTEX_INIT_FAST);
     pthread_mutex_init(&data_lock, MY_MUTEX_INIT_FAST);
     pthread_cond_init(&data_cond, NULL);
Thread
bk commit into 4.0 treesasha3 Mar