database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge branch 'mdev7818-4' into 10.1

Browse Source 
Conflicts:
	mysql-test/suite/perfschema/r/stage_mdl_global.result
	sql/rpl_rli.cc
	sql/sql_parse.cc
This commit is contained in:
Kristian Nielsen
2015-11-13 14:24:40 +01:00
parent 2828c2be55 ba02550166
commit 8f2e05f41c
11 changed files with 642 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_parse.cc
View File

@@ -4811,6 +4811,17 @@ end_with_restore_list:
}
#endif /* WITH_WSREP*/
if (lex->type & REFRESH_READ_LOCK)
{
/*
We need to pause any parallel replication slave workers during FLUSH
TABLES WITH READ LOCK. Otherwise we might cause a deadlock, as
worker threads eun run in arbitrary order but need to commit in a
specific given order.
*/
if (rpl_pause_for_ftwrl(thd))
goto error;
}
/*
reload_acl_and_cache() will tell us if we are allowed to write to the
binlog or not.
@@ -4841,6 +4852,8 @@ end_with_restore_list:
if (!res)
my_ok(thd);
}
if (lex->type & REFRESH_READ_LOCK)
rpl_unpause_after_ftwrl(thd);
break;
}