Changeset: 26fb95138fc7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26fb95138fc7
Modified Files:
        sql/storage/store.c
Branch: HTM
Log Message:

Fix the return code of sql_trans_commit
Beware, sql_trans_precommit/persistcommit return SQL_ codes, while 
rollforward_trans returns LOG_ codes


diffs (20 lines):

diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -3337,10 +3337,14 @@ sql_trans_commit(sql_trans *tr)
         /* It is save to rollforward the changes now. In case
          of failure, the log will be replayed. */
         result = rollforward_trans(tr, R_APPLY);
-       }
+    } else {
+        if (bs_debug)
+            fprintf(stderr, "#failed forwarding changes %d,%d\n", 
gtrans->stime, gtrans->wstime);
+        return result;
+    }
        if (bs_debug)
                fprintf(stderr, "#done forwarding changes %d,%d\n", 
gtrans->stime, gtrans->wstime);
-       return result;
+       return (result==LOG_OK)?SQL_OK:SQL_ERR;
 }
 
 int
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to