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

fixed the use of unitialized variable - code now works on the test system

Browse Source 
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 :-)
This commit is contained in:
sasha@mysql.sashanet.com 2002-03-02 22:00:37 -07:00
parent f59809c85a
commit a664ca007d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/slave.cc
View File

@ -361,6 +361,7 @@ int terminate_slave_thread(THD* thd, pthread_mutex_t* term_lock,
abstime.tv_sec=tv.tv_sec+2; abstime.tv_sec=tv.tv_sec+2;
abstime.tv_nsec=tv.tv_usec*1000; abstime.tv_nsec=tv.tv_usec*1000;
#endif #endif
DBUG_ASSERT(cond_lock->count > 0 && cond_lock->thread == pthread_self());
pthread_cond_timedwait(term_cond, cond_lock, &abstime); pthread_cond_timedwait(term_cond, cond_lock, &abstime);
if (*slave_running) if (*slave_running)
KICK_SLAVE(thd); KICK_SLAVE(thd);
@ -947,7 +948,6 @@ int init_relay_log_info(RELAY_LOG_INFO* rli, const char* info_fname)
int info_fd; int info_fd;
const char* msg = 0; const char* msg = 0;
int error = 0; int error = 0;
fn_format(fname, info_fname, fn_format(fname, info_fname,
mysql_data_home, "", 4+32); mysql_data_home, "", 4+32);
pthread_mutex_lock(&rli->data_lock); pthread_mutex_lock(&rli->data_lock);

2
sql/slave.h
View File

@ -157,6 +157,7 @@ typedef struct st_relay_log_info
log_pos_current(0) log_pos_current(0)
{ {
relay_log_name[0] = master_log_name[0] = 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(&run_lock, MY_MUTEX_INIT_FAST);
pthread_mutex_init(&data_lock, MY_MUTEX_INIT_FAST); pthread_mutex_init(&data_lock, MY_MUTEX_INIT_FAST);
pthread_cond_init(&data_cond, NULL); pthread_cond_init(&data_cond, NULL);
@ -271,6 +272,7 @@ typedef struct st_master_info
st_master_info():fd(-1), io_thd(0), inited(0), old_format(0) st_master_info():fd(-1), io_thd(0), inited(0), old_format(0)
{ {
host[0] = 0; user[0] = 0; password[0] = 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(&run_lock, MY_MUTEX_INIT_FAST);
pthread_mutex_init(&data_lock, MY_MUTEX_INIT_FAST); pthread_mutex_init(&data_lock, MY_MUTEX_INIT_FAST);
pthread_cond_init(&data_cond, NULL); pthread_cond_init(&data_cond, NULL);