Commit 8493c111 authored by Sven Sandberg's avatar Sven Sandberg

BUG#59084: rpl_do_grant started to fail on FreeBSD (presumably after BUG#49978)

Problem: master executed a statement that would fail on slave
(namely, DROP USER 'create_rout_db'@'localhost').
Then the test did:
  --let $rpl_only_running_threads= 1
  --source include/rpl_reset.inc
rpl_reset.inc calls rpl_sync.inc, which first checks which of
the threads are running and then syncs those threads that are
running. If the SQL thread fails after the check, the sync will
fail. So there was a race in the test and it failed on some
slow hosts.
Fix: Don't replicate the failing statement.
parent d5bf6b8a
...@@ -162,7 +162,9 @@ USE bug42217_db; ...@@ -162,7 +162,9 @@ USE bug42217_db;
DROP FUNCTION upgrade_del_func; DROP FUNCTION upgrade_del_func;
DROP FUNCTION upgrade_alter_func; DROP FUNCTION upgrade_alter_func;
DROP DATABASE bug42217_db; DROP DATABASE bug42217_db;
SET SQL_LOG_BIN= 0;
DROP USER 'create_rout_db'@'localhost'; DROP USER 'create_rout_db'@'localhost';
SET SQL_LOG_BIN= 1;
include/rpl_reset.inc include/rpl_reset.inc
USE test; USE test;
######## BUG#49119 ####### ######## BUG#49119 #######
......
...@@ -216,10 +216,10 @@ DROP DATABASE bug42217_db; ...@@ -216,10 +216,10 @@ DROP DATABASE bug42217_db;
-- connection master -- connection master
# user was already dropped in the slave before # user was already dropped in the slave before
# so no need to wait for the slave to replicate # so we should not replicate this statement.
# this statement (if it did and we later synced SET SQL_LOG_BIN= 0;
# the slave it would end up in an error anyway)
DROP USER 'create_rout_db'@'localhost'; DROP USER 'create_rout_db'@'localhost';
SET SQL_LOG_BIN= 1;
# finish entire clean up (remove binlogs) # finish entire clean up (remove binlogs)
# so that we leave a pristine environment for the # so that we leave a pristine environment for the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment