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

manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)

Browse Source 
CONFLICTS
=========

Text conflict in sql/sql_yacc.yy
1 conflicts encountered.
This commit is contained in:
Luis Soares
2009-11-13 10:17:53 +00:00
parent 0d46e5880e 7cf9ee96ae
commit d8ca6b9dd9
81 changed files with 267 additions and 2351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_repl.cc
View File

@ -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).