diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-07-03 16:17:59 +0200 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-07-03 16:17:59 +0200 |
| commit | 1bf863a91a8ad8cd6ba8e50db34b302120feaa29 (patch) | |
| tree | 260fe6971349157414354ef4c4c1caacbf01fbac /sql/sql_parse.cc | |
| parent | e6595a06d63fb40f81f6ec0313a37931cdf0e9c5 (diff) | |
| parent | 2b8b7394a129ab27225a1284bab253a6714aaf03 (diff) | |
| download | mariadb-git-10.4-MDEV-22222.tar.gz | |
Merge branch '10.4-MDEV-22222' of https://github.com/codership/mariadb-server into 10.4-MDEV-2222210.4-MDEV-22222
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 3e68bc1c25f..8fa7aa61386 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4990,6 +4990,12 @@ mysql_execute_command(THD *thd) if (res) goto error; +#ifdef WITH_WSREP + /* Clean up the previous transaction on implicit commit. */ + if (wsrep_on(thd) && !wsrep_not_committed(thd) && wsrep_after_statement(thd)) + goto error; +#endif + /* We can't have any kind of table locks while backup is active */ if (thd->current_backup_stage != BACKUP_FINISHED) { |