Changeset: b7958ad83c15 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b7958ad83c15
Modified Files:
Branch: default
Log Message:
Merge with Oct2010 branch.
Fix for crash in e.g. coalesce.sql test.
After an error, pc can be negative. Check for that before using as index.
diffs (12 lines):
diff -r f2f9f8cdcdeb -r b7958ad83c15 MonetDB5/src/mal/mal_interpreter.mx
--- a/MonetDB5/src/mal/mal_interpreter.mx Fri Sep 10 17:12:18 2010 +0200
+++ b/MonetDB5/src/mal/mal_interpreter.mx Mon Sep 13 17:42:26 2010 +0200
@@ -1254,7 +1254,7 @@
/* search the statement that assigns a value to the
argument or target */
/* it should have been finished already */
for (l = i-1 ; l >= 0 && !blocked; l--)
- if ( fs[l].status != DFLOWwrapup){
+ if ( fs[l].status != DFLOWwrapup && fs[l].pc >= 0){
q= getInstrPtr(flow->mb, fs[l].pc);
for ( k=0; k < q->retc && !blocked; k++)
if ( getArg(q,k) == getArg(p,j) )
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
