diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-02 22:21:14 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-02 22:21:14 +0300 |
| commit | abf1b80cf457702fd883c3a17b1d9eaed1c7c6b6 (patch) | |
| tree | bb7139d81768e839cbedc532114cc18a75af1e68 /sql | |
| parent | 777df00444ab02cc3b5b903ce2bb6a7245da1987 (diff) | |
| download | mariadb-git-abf1b80cf457702fd883c3a17b1d9eaed1c7c6b6.tar.gz | |
Fix for make dist
Made replication test portable
Fixed buffer overrun bug in replication
client/Makefile.am:
Fix for make dist
mysql-test/t/rpl000017-slave.sh:
Made replication test portable
sql/slave.cc:
Fixed buffer overrun bug
strings/strmake.c:
More documentation
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/slave.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 52cde738b9a..2e0861bbd56 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -299,7 +299,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; @@ -530,14 +530,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) || |