database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge with 4.1

Browse Source
This commit is contained in:
monty@mishka.local
2004-12-22 13:54:39 +02:00
parent 198dc7a8ec 98f2a83539
commit 4f4bbfc279
395 changed files with 11807 additions and 25533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_repl.cc
View File

@ -18,7 +18,6 @@
#ifdef HAVE_REPLICATION
#include "sql_repl.h"
#include "sql_acl.h"
#include "log_event.h"
#include <my_dir.h>
@ -977,10 +976,10 @@ int reset_slave(THD *thd, MASTER_INFO* mi)
*/
init_master_info_with_options(mi);
/*
Reset errors, and master timestamp (the idea is that we forget about the
Reset errors (the idea is that we forget about the
old master).
*/
clear_slave_error_timestamp(&mi->rli);
clear_slave_error(&mi->rli);
clear_until_condition(&mi->rli);
// close master_info_file, relay_log_info_file, set mi->inited=rli->inited=0
@ -1240,8 +1239,8 @@ bool change_master(THD* thd, MASTER_INFO* mi)
pthread_mutex_lock(&mi->rli.data_lock);
mi->rli.abort_pos_wait++; /* for MASTER_POS_WAIT() to abort */
/* Clear the errors, for a clean start, and master timestamp */
clear_slave_error_timestamp(&mi->rli);
/* Clear the errors, for a clean start */
clear_slave_error(&mi->rli);
clear_until_condition(&mi->rli);
/*
If we don't write new coordinates to disk now, then old will remain in