database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Fixed ndbcluster_rollback

Browse Source
This commit is contained in:
mikael@dator6.(none)
2007-09-15 23:33:04 +02:00
parent 0f18ff3350
commit f09169670b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/ha_ndbcluster.cc
View File

@@ -4643,6 +4643,8 @@ static int ndbcluster_commit(handlerton *hton, THD *thd, bool all)
DBUG_ENTER("ndbcluster_commit"); DBUG_ENTER("ndbcluster_commit");
DBUG_ASSERT(ndb); DBUG_ASSERT(ndb);
PRINT_OPTION_FLAGS(thd);
DBUG_PRINT("enter", ("Commit %s", (all ? "all" : "stmt")));
thd_ndb->start_stmt_count= 0; thd_ndb->start_stmt_count= 0;
if (trans == NULL || (!all && if (trans == NULL || (!all &&
thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))
@@ -4714,8 +4716,11 @@ static int ndbcluster_rollback(handlerton *hton, THD *thd, bool all)
DBUG_ENTER("ndbcluster_rollback"); DBUG_ENTER("ndbcluster_rollback");
DBUG_ASSERT(ndb); DBUG_ASSERT(ndb);
thd_ndb->start_stmt_count= 0; thd_ndb->start_stmt_count= 0;
if (!trans) if (trans == NULL || (!all &&
thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))
{ {
/* Ignore end-of-statement until real rollback or commit is called */
DBUG_PRINT("info", ("Rollback before start or end-of-statement only"));
DBUG_RETURN(0); DBUG_RETURN(0);
} }