mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	sql/sql_parse.cc
This commit is contained in:
Kristian Nielsen 2015-11-13 15:32:55 +01:00
commit e46c8bbf62
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sql/sql_parse.cc
View file

@ -4811,6 +4811,7 @@ end_with_restore_list:
} }
#endif /* WITH_WSREP*/ #endif /* WITH_WSREP*/
#ifdef HAVE_REPLICATION
if (lex->type & REFRESH_READ_LOCK) if (lex->type & REFRESH_READ_LOCK)
{ {
/* /*
@ -4822,6 +4823,7 @@ end_with_restore_list:
if (rpl_pause_for_ftwrl(thd)) if (rpl_pause_for_ftwrl(thd))
goto error; goto error;
} }
#endif
/* /*
reload_acl_and_cache() will tell us if we are allowed to write to the reload_acl_and_cache() will tell us if we are allowed to write to the
binlog or not. binlog or not.
@ -4852,8 +4854,10 @@ end_with_restore_list:
if (!res) if (!res)
my_ok(thd); my_ok(thd);
} }
#ifdef HAVE_REPLICATION
if (lex->type & REFRESH_READ_LOCK) if (lex->type & REFRESH_READ_LOCK)
rpl_unpause_after_ftwrl(thd); rpl_unpause_after_ftwrl(thd);
#endif
break; break;
} }