diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-11-13 15:30:48 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-11-13 15:30:48 +0100 |
| commit | 65986b8a0ac4743a5e597c1ca30b1261f1a0fce0 (patch) | |
| tree | 8da3d1903ab545362983e2afff051b6001e53173 | |
| parent | 6bf88cdd9d2b77a2e1ac3b11ab8e1d30658f4cb5 (diff) | |
| parent | d5d87c98c045138d1141f97eeeda265591bb7dca (diff) | |
| download | mariadb-git-bb-10.0-knielsen.tar.gz | |
Merge branch 'mdev7818-4' into bb-10.0-knielsenbb-10.0-knielsen
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a598030c5bd..23629ff3ec4 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4283,6 +4283,7 @@ end_with_restore_list: break; } +#ifdef HAVE_REPLICATION if (lex->type & REFRESH_READ_LOCK) { /* @@ -4294,6 +4295,7 @@ end_with_restore_list: 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 @@ end_with_restore_list: if (!res) my_ok(thd); } +#ifdef HAVE_REPLICATION if (lex->type & REFRESH_READ_LOCK) rpl_unpause_after_ftwrl(thd); +#endif break; } |