1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix embedded server build

Browse Source
This commit is contained in:
Kristian Nielsen 2015-08-04 15:35:04 +02:00
parent 9b9c5e890c
commit 5ca061e65f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/handler.cc
View File

@ -1582,6 +1582,7 @@ int ha_rollback_trans(THD *thd, bool all)
DBUG_ASSERT(thd->transaction.stmt.ha_list == NULL || DBUG_ASSERT(thd->transaction.stmt.ha_list == NULL ||
trans == &thd->transaction.stmt); trans == &thd->transaction.stmt);
#ifdef HAVE_REPLICATION
if (is_real_trans) if (is_real_trans)
{ {
/* /*
@ -1599,6 +1600,7 @@ int ha_rollback_trans(THD *thd, bool all)
if (thd->rgi_slave && thd->rgi_slave->did_mark_start_commit) if (thd->rgi_slave && thd->rgi_slave->did_mark_start_commit)
thd->rgi_slave->unmark_start_commit(); thd->rgi_slave->unmark_start_commit();
} }
#endif
if (thd->in_sub_stmt) if (thd->in_sub_stmt)
{ {