diff options
| author | dlenev@mysql.com <> | 2003-09-14 01:57:09 +0400 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2003-09-14 01:57:09 +0400 |
| commit | 2c24b2e9b4237ec4e67b82981cfe154c33977086 (patch) | |
| tree | 9b95250006febf53e90b41329026267482bcd75e /sql/repl_failsafe.cc | |
| parent | cde0c3696206956fa9d28da995bd5a388c971588 (diff) | |
| parent | c0cfae1c8d87d166e631d79d724d294a9f694e92 (diff) | |
| download | mariadb-git-2c24b2e9b4237ec4e67b82981cfe154c33977086.tar.gz | |
Manual merge after commiting START SLAVE UNTIL
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 8f0e18999b3..5e040d26dc3 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -929,6 +929,12 @@ int load_master_data(THD* thd) strmake(active_mi->rli.group_master_log_name,active_mi->master_log_name, sizeof(active_mi->rli.group_master_log_name)-1); /* + Cancel the previous START SLAVE UNTIL, as the fact to download + a new copy logically makes UNTIL irrelevant. + */ + clear_until_condition(&active_mi->rli); + + /* No need to update rli.event* coordinates, they will be when the slave threads start ; only rli.group* coordinates are necessary here. */ |