diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 17:23:29 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 17:23:29 +0300 |
| commit | e5f8bec1c58a44cf37c0a309988a1cf12e1319bc (patch) | |
| tree | 4b7700039ea7b5f90e5c9a1e1ee22c3afdc6adcb | |
| parent | cd370e8be1bccfa12d184c18e988f2d7aea975e0 (diff) | |
| download | mariadb-git-bb-10.1-vicentiu-merge.tar.gz | |
Fix mergebb-10.1-vicentiu-merge
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 4cb648961b5..e103c3b390c 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -4383,6 +4383,7 @@ bool select_create::send_eof() */ if (!table->s->tmp_table) { +#ifdef WITH_WSREP if (WSREP_ON) { /* @@ -4412,6 +4413,7 @@ bool select_create::send_eof() /* If commit fails, we should be able to reset the OK status. */ thd->get_stmt_da()->set_overwrite_status(TRUE); } +#endif /* WITH_WSREP */ trans_commit_stmt(thd); if (!(thd->variables.option_bits & OPTION_GTID_BEGIN)) trans_commit_implicit(thd); |