diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-20 01:28:59 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-20 01:28:59 +0300 |
| commit | 04c47454781533408deb10bf770744327415aa59 (patch) | |
| tree | 4a3219ae1d1af3f7a8d17418dce27aea67317c8b /sql/sql_plugin.cc | |
| parent | f5b128dfad1f46bf73916bc9c803a7152fdd6809 (diff) | |
| download | mariadb-git-04c47454781533408deb10bf770744327415aa59.tar.gz | |
Fix double WSREP_ISOLATION_BEGIN merge error
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 7e4be9aed16..270466fa0f7 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -2122,8 +2122,6 @@ bool mysql_install_plugin(THD *thd, const LEX_STRING *name, 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, MYSQL_LOCK_IGNORE_TIMEOUT))) |