Changeset: 0089ca7e4c50 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0089ca7e4c50
Modified Files:
monetdb5/modules/mal/Tests/inspect00.stable.out
monetdb5/optimizer/opt_oltp.c
Branch: oltp
Log Message:
Compilation issues
diffs (27 lines):
diff --git a/monetdb5/modules/mal/Tests/inspect00.stable.out
b/monetdb5/modules/mal/Tests/inspect00.stable.out
--- a/monetdb5/modules/mal/Tests/inspect00.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect00.stable.out
@@ -64,7 +64,6 @@ stack depth 2
[ 0@0, "tst", "0@0" ]
[ 1@0, "i", "nil" ]
[ 2@0, "X_0", "0@0" ]
-[ 3@0, "X_1", "nil" ]
# 09:13:25 >
# 09:13:25 > Done.
diff --git a/monetdb5/optimizer/opt_oltp.c b/monetdb5/optimizer/opt_oltp.c
--- a/monetdb5/optimizer/opt_oltp.c
+++ b/monetdb5/optimizer/opt_oltp.c
@@ -108,8 +108,10 @@ OPToltpImplementation(Client cntxt, MalB
p = old[i];
if( p->token == ENDsymbol){
// unlock all if there is an error
- q= newCatchStmt(mb,"ANYexception");
- q= newExitStmt(mb,"ANYexception");
+ q= newCatchStmt(mb,"MALexception");
+ q= newExitStmt(mb,"MALexception");
+ q= newCatchStmt(mb,"SQLexception");
+ q= newExitStmt(mb,"SQLexception");
q= copyInstruction(lcks);
setFunctionId(q, releaseRef);
pushInstruction(mb,q);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
