diff options
| author | unknown <mskold@mysql.com> | 2004-06-24 15:32:33 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2004-06-24 15:32:33 +0200 |
| commit | 9293805a03b44d5452ecc4fc0be9cb1b7143571e (patch) | |
| tree | 165196e1922ed8ffaa6ab2e1310ec19b11940295 /sql/handler.cc | |
| parent | 5b1b5f63a07d27c18bccb1596c67017ce901f9c4 (diff) | |
| parent | 4c450c52357ef468d707eecd544e4d3fac0b160f (diff) | |
| download | mariadb-git-9293805a03b44d5452ecc4fc0be9cb1b7143571e.tar.gz | |
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
sql/handler.cc:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index f11c7d5eac3..e76bda1a6cc 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -496,7 +496,10 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans) { if ((error=ndbcluster_commit(thd,trans->ndb_tid))) { - my_error(ER_ERROR_DURING_COMMIT, MYF(0), error); + if (error == -1) + my_error(ER_ERROR_DURING_COMMIT, MYF(0), error); + else + ndbcluster_print_error(error); error=1; } if (trans == &thd->transaction.all) @@ -562,7 +565,10 @@ int ha_rollback_trans(THD *thd, THD_TRANS *trans) { if ((error=ndbcluster_rollback(thd, trans->ndb_tid))) { - my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), error); + if (error == -1) + my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), error); + else + ndbcluster_print_error(error); error=1; } trans->ndb_tid = 0; |