mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Scrum task 845. Thi is a behaviour change :
now by default, FLUSH, OPTIMIZE, ANALYZE, REPAIR commands are written to the binlog, unless the new NO_WRITE_TO_BINLOG keyword was used : OPTIMIZE NO_WRITE_TO_BINLOG table t; Previously these commands were never written to the binlog, but there are 2 reasons to change this : - the RENAME TABLE in MERGE table bug (#175) on slave - the possible "differently optimised queries may lead to different updates on the master and slave" bug, until we have automatic ORDER BY. FLUSH LOGS/SLAVE/MASTER/TABLES WITH READ LOCK are never written to the binlog. New test for the new logging behaviour. Other small change : reload_acl_and_cache() and reset_slave() don't send their errors themselves, this is more usual.
This commit is contained in:
@@ -746,16 +746,9 @@ int stop_slave(THD* thd, MASTER_INFO* mi, bool net_report )
|
||||
thd Thread handler
|
||||
mi Master info for the slave
|
||||
|
||||
|
||||
NOTES
|
||||
We don't send ok in this functions as this is called from
|
||||
reload_acl_and_cache() which may have done other tasks, which may
|
||||
have failed for which we want to send and error.
|
||||
|
||||
RETURN
|
||||
0 ok
|
||||
1 error
|
||||
In this case error is sent to the client with send_error()
|
||||
*/
|
||||
|
||||
|
||||
@@ -804,8 +797,8 @@ int reset_slave(THD *thd, MASTER_INFO* mi)
|
||||
|
||||
err:
|
||||
unlock_slave_threads(mi);
|
||||
if (thd && error)
|
||||
send_error(thd, sql_errno, errmsg);
|
||||
if (error)
|
||||
my_error(sql_errno, MYF(0), errmsg);
|
||||
DBUG_RETURN(error);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user