summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorunknown <mskold@mysql.com>2004-06-24 12:04:22 +0200
committerunknown <mskold@mysql.com>2004-06-24 12:04:22 +0200
commit1045f2c3fdd0c5ae453d2146ff6d27c222a8dd88 (patch)
tree09d79331ce2d52885782ad4b9e077b53c1d28b63 /sql/handler.cc
parentff392bbeef15d181af0c561482c5c3e2ea932bd3 (diff)
downloadmariadb-git-1045f2c3fdd0c5ae453d2146ff6d27c222a8dd88.tar.gz
Modified index flags and added ndbcluster_print_error
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 0e1b2d62a4f..c780519e6e2 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -488,7 +488,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)
@@ -554,7 +557,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;