database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

sql/slave.cc

Browse Source 
fixed bug - mutex was not being released if master.info could not be read
This commit is contained in:
sasha@mysql.sashanet.com
2000-11-15 16:12:11 -07:00
parent f2b9a60ec4
commit 5faab668f7
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/slave.cc
View File

@ -358,7 +358,10 @@ int init_master_info(MASTER_INFO* mi)
{ {
file = my_fopen(fname, O_CREAT|O_RDWR|O_BINARY, MYF(MY_WME)); file = my_fopen(fname, O_CREAT|O_RDWR|O_BINARY, MYF(MY_WME));
if(!file) if(!file)
return 1; {
pthread_mutex_unlock(&mi->lock);
return 1;
}
mi->log_file_name[0] = 0; mi->log_file_name[0] = 0;
mi->pos = 4; // skip magic number mi->pos = 4; // skip magic number
mi->file = file; mi->file = file;
@ -373,18 +376,25 @@ int init_master_info(MASTER_INFO* mi)
mi->connect_retry = master_connect_retry; mi->connect_retry = master_connect_retry;
if(flush_master_info(mi)) if(flush_master_info(mi))
return 1; {
pthread_mutex_unlock(&mi->lock);
return 1;
}
} }
else else
{ {
file = my_fopen(fname, O_RDWR|O_BINARY, MYF(MY_WME)); file = my_fopen(fname, O_RDWR|O_BINARY, MYF(MY_WME));
if(!file) if(!file)
return 1; {
pthread_mutex_unlock(&mi->lock);
return 1;
}
if(!fgets(mi->log_file_name, sizeof(mi->log_file_name), file)) if(!fgets(mi->log_file_name, sizeof(mi->log_file_name), file))
{ {
sql_print_error("Error reading log file name from master info file "); sql_print_error("Error reading log file name from master info file ");
return 1; pthread_mutex_unlock(&mi->lock);
return 1;
} }
*(strend(mi->log_file_name) - 1) = 0; // kill \n *(strend(mi->log_file_name) - 1) = 0; // kill \n
@ -392,6 +402,7 @@ int init_master_info(MASTER_INFO* mi)
if(!fgets(buf, sizeof(buf), file)) if(!fgets(buf, sizeof(buf), file))
{ {
sql_print_error("Error reading log file position from master info file"); sql_print_error("Error reading log file position from master info file");
pthread_mutex_unlock(&mi->lock);
return 1; return 1;
} }