diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-04-05 17:56:40 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-04-05 17:56:40 +0300 |
| commit | d4cc076109d13e10be3327472eb7ef559df8a4c1 (patch) | |
| tree | 12604acb600beff79feb812f4208a1ebaa4f3b0c /sql/handler.cc | |
| parent | 5a28f962e3282725c19d230ced7ad4bb48d74b46 (diff) | |
| download | mariadb-git-d4cc076109d13e10be3327472eb7ef559df8a4c1.tar.gz | |
handler.cc, ha_innodb.cc:
Fix Bug #8650 : InnoDB does not rollback SQL statement at an error
sql/ha_innodb.cc:
Fix Bug #8650 : InnoDB does not rollback SQL statement at an error
sql/handler.cc:
Fix Bug #8650 : InnoDB does not rollback SQL statement at an error
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 3eead37482b..7cd2fd303f0 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -520,14 +520,14 @@ void trans_register_ha(THD *thd, bool all, handlerton *ht_arg) else trans= &thd->transaction.stmt; -#ifndef DBUG_OFF handlerton **ht=trans->ht; while (*ht) { - DBUG_ASSERT(*ht != ht_arg); + if (*ht == ht_arg) + DBUG_VOID_RETURN; /* already registered, return */ ht++; } -#endif + trans->ht[trans->nht++]=ht_arg; trans->no_2pc|=(ht_arg->prepare==0); if (thd->transaction.xid.is_null()) |