Commit 65986b8a authored by Kristian Nielsen's avatar Kristian Nielsen

Merge branch 'mdev7818-4' into bb-10.0-knielsen

parents 6bf88cdd d5d87c98
......@@ -4283,6 +4283,7 @@ case SQLCOM_PREPARE:
break;
}
#ifdef HAVE_REPLICATION
if (lex->type & REFRESH_READ_LOCK)
{
/*
......@@ -4294,6 +4295,7 @@ case SQLCOM_PREPARE:
if (rpl_pause_for_ftwrl(thd))
goto error;
}
#endif
/*
reload_acl_and_cache() will tell us if we are allowed to write to the
binlog or not.
......@@ -4324,8 +4326,10 @@ case SQLCOM_PREPARE:
if (!res)
my_ok(thd);
}
#ifdef HAVE_REPLICATION
if (lex->type & REFRESH_READ_LOCK)
rpl_unpause_after_ftwrl(thd);
#endif
break;
}
......
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