diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-03 10:22:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-03 10:22:43 +0300 |
| commit | c3289d27eef39a47fed2ce1ff239013ed6870f39 (patch) | |
| tree | 2a6e2434287921eb6f5f7c7877e8da061803ed9e /sql/sql_plugin.cc | |
| parent | 358ae4b46dd52b329154cff901b58e96fd223773 (diff) | |
| parent | eaab98f7022732b26b4ea590e1bb44308e253be8 (diff) | |
| download | mariadb-git-c3289d27eef39a47fed2ce1ff239013ed6870f39.tar.gz | |
Merge mariadb-10.3.8 into 10.3
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index ac1524381c7..8c231d9b8f7 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -2156,8 +2156,7 @@ bool mysql_install_plugin(THD *thd, const LEX_CSTRING *name, tables.init_one_table(&MYSQL_SCHEMA_NAME, &MYSQL_PLUGIN_NAME, 0, TL_WRITE); if (!opt_noacl && check_table_access(thd, INSERT_ACL, &tables, FALSE, 1, FALSE)) DBUG_RETURN(TRUE); - - WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) + WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL); /* need to open before acquiring LOCK_plugin or it will deadlock */ if (! (table = open_ltable(thd, &tables, TL_WRITE, |