diff options
| author | unknown <serg@serg.mylan> | 2005-03-17 10:06:49 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-17 10:06:49 +0100 |
| commit | 03a20be33adc17726b329d1dfd0fd9712a131176 (patch) | |
| tree | af6eee1ab10e8aea29e95a3ea22725ea39a31152 /sql/handler.cc | |
| parent | 8d55ca327b74ce03492447be6af76eb5eef61f29 (diff) | |
| parent | b9bd4c104c88c05acada6db5d596ab7dd51a082a (diff) | |
| download | mariadb-git-03a20be33adc17726b329d1dfd0fd9712a131176.tar.gz | |
Automerge
sql/sql_parse.cc:
Auto merged
sql/handler.cc:
SCCS merged
sql/mysql_priv.h:
SCCS merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index df0d7704163..1ef73a9136f 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -526,7 +526,6 @@ void trans_register_ha(THD *thd, bool all, handlerton *ht_arg) /* RETURN - -1 - cannot prepare 0 - ok 1 - error, transaction was rolled back */ @@ -539,8 +538,6 @@ int ha_prepare(THD *thd) #ifdef USING_TRANSACTIONS if (trans->nht) { - if (trans->no_2pc) - DBUG_RETURN(-1); for (; *ht; ht++) { int err; |