diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-11-13 10:17:53 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-11-13 10:17:53 +0000 |
| commit | d8ca6b9dd9111db8f303d872f279f374af68e80b (patch) | |
| tree | 5107afeb0f71e17a7fcdff3685ea606313d1aa3c /sql/sql_repl.cc | |
| parent | 0d46e5880e0bb00183b93dedfb8fb007f46dc36e (diff) | |
| parent | 7cf9ee96ae496654ac912080f9b7a64f2950e938 (diff) | |
| download | mariadb-git-d8ca6b9dd9111db8f303d872f279f374af68e80b.tar.gz | |
manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)
CONFLICTS
=========
Text conflict in sql/sql_yacc.yy
1 conflicts encountered.
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 60eebdbac48..829e89fd866 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1243,14 +1243,8 @@ int reset_slave(THD *thd, Master_info* mi) goto err; } - /* - Clear master's log coordinates and reset host/user/etc to the values - specified in mysqld's options (only for good display of SHOW SLAVE STATUS; - next init_master_info() (in start_slave() for example) would have set them - the same way; but here this is for the case where the user does SHOW SLAVE - STATUS; before doing START SLAVE; - */ - init_master_info_with_options(mi); + /* Clear master's log coordinates */ + init_master_log_pos(mi); /* Reset errors (the idea is that we forget about the old master). |