diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-01-24 12:47:09 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-01-24 12:47:09 -0700 |
| commit | b302ee39bc8e5f26f3fe95b47a3f42ad11cc5f40 (patch) | |
| tree | 54c202a8cc62eff35c59e9d92f78316d8240b6da /sql/slave.cc | |
| parent | 0ee9e34a72c3206b0c57c7d555a54c8b4396f8fc (diff) | |
| download | mariadb-git-b302ee39bc8e5f26f3fe95b47a3f42ad11cc5f40.tar.gz | |
fixed improper read of log name from master.info which broke slave server restart
fixed sync bugs in three test cases
added offset argument to sync_with_master to mysqltest to be able to fix sync bugs
added a test case for slave startup with existing master.info
expanded mysql-test-run.sh to be able to run pre-start shell script initializations
client/mysqltest.c:
added offset argument to sync_with_master
mysql-test/mysql-test-run.sh:
added option to run master or slave initialization shell script
mysql-test/r/rpl000016.result:
fixed bug in test case
mysql-test/t/rpl000012.test:
fixed syncronization bug
mysql-test/t/rpl000013.test:
fixed sync bug
mysql-test/t/rpl000016.test:
fixed ambiguous show slave status.
sql/slave.cc:
fixed bug that broke slave server start with existing master.info,
Monty's optimization was not chopping off newline from logname.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index a798af7e0ed..58d1d173968 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -509,14 +509,14 @@ int init_master_info(MASTER_INFO* mi) return 1; } - if (!(length=my_b_gets(&mi->file, mi->log_file_name, - sizeof(mi->log_file_name)))) + if ((length=my_b_gets(&mi->file, mi->log_file_name, + sizeof(mi->log_file_name))) < 1) { msg="Error reading log file name from master info file "; goto error; } - mi->log_file_name[length]= 0; // kill \n + mi->log_file_name[length-1]= 0; // kill \n char buf[FN_REFLEN]; if(!my_b_gets(&mi->file, buf, sizeof(buf))) { |