database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
monty@work.mysql.com
2001-10-02 21:33:47 +02:00
parent ce347166d2 db82d30bf0
commit 193ae61fc0
7 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/slave.cc
View File

@ -307,7 +307,7 @@ static int init_strvar_from_file(char* var, int max_size, IO_CACHE* f,
}
else if (default_val)
{
strmake(var, default_val, max_size);
strmake(var, default_val, max_size-1);
return 0;
}
return 1;
@ -548,14 +548,14 @@ int init_master_info(MASTER_INFO* mi)
}
mi->log_file_name[length-1]= 0; // kill \n
char buf[FN_REFLEN];
if(!my_b_gets(&mi->file, buf, sizeof(buf)))
/* Reuse fname buffer */
if(!my_b_gets(&mi->file, fname, sizeof(fname)))
{
msg="Error reading log file position from master info file";
goto error;
}
mi->pos = strtoull(fname,(char**) 0, 10);
mi->pos = strtoull(buf,(char**) 0, 10);
mi->fd = fd;
if(init_strvar_from_file(mi->host, sizeof(mi->host), &mi->file,
master_host) ||