diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 19:17:05 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 19:17:05 +0100 |
| commit | 0e007344eae972b9be7d88ca43373cb33662ac1c (patch) | |
| tree | 7b3561cb3ea2ad24d013e847680ec165f406387e /sql/rpl_mi.cc | |
| parent | 3794110f0215f0631107c2694dc0f1675a4bb520 (diff) | |
| parent | 681476255147dacac7e3674b6cd2ae770fee2208 (diff) | |
| download | mariadb-git-0e007344eae972b9be7d88ca43373cb33662ac1c.tar.gz | |
mysql-5.5.18 merge
Diffstat (limited to 'sql/rpl_mi.cc')
| -rw-r--r-- | sql/rpl_mi.cc | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc index f491db25048..164173467f1 100644 --- a/sql/rpl_mi.cc +++ b/sql/rpl_mi.cc @@ -1,4 +1,5 @@ -/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. + Copyright (c) 2010, 2011, Monty Program Ab This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -11,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <my_global.h> // For HAVE_REPLICATION #include "sql_priv.h" @@ -24,6 +25,8 @@ #define DEFAULT_CONNECT_RETRY 60 +static void init_master_log_pos(Master_info* mi); + Master_info::Master_info(bool is_slave_recovery) :Slave_reporting_capability("I/O"), ssl(0), ssl_verify_server_cert(1), fd(-1), io_thd(0), @@ -96,6 +99,16 @@ bool Master_info::shall_ignore_server_id(ulong s_id) != NULL; } +void Master_info::clear_in_memory_info(bool all) +{ + init_master_log_pos(this); + if (all) + { + port= MYSQL_PORT; + host[0] = 0; user[0] = 0; password[0] = 0; + } +} + void init_master_log_pos(Master_info* mi) { DBUG_ENTER("init_master_log_pos"); @@ -230,7 +243,7 @@ file '%s')", fname); } mi->fd = fd; - init_master_log_pos(mi); + mi->clear_in_memory_info(false); } else // file exists |