MonetDB: default - Also show the scalar values during traceing

[mk]

Changeset: 540a16e01306 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=540a16e01306
Modified Files:
        monetdb5/mal/mal_instruction.mx
Branch: default
Log Message:

Also show the scalar values during traceing


diffs (31 lines):

diff --git a/monetdb5/mal/mal_instruction.mx b/monetdb5/mal/mal_instruction.mx
--- a/monetdb5/mal/mal_instruction.mx
+++ b/monetdb5/mal/mal_instruction.mx
@@ -2525,6 +2525,7 @@
                        } else {
                                if( getTailType(getArgType(mb,p,i)) > TYPE_str )
                                { char *ct=cv;
+                                       strcat(t, "=");
                                        VALformat(&cv, &getVar(mb, getArg(p, 
i))->value);
                                        ct= (char*) GDKmalloc(1024+strlen(cv));
                                        if (isVarUDFtype(mb, getArg(p, i)) ) {
@@ -2543,7 +2544,7 @@
                                        VALformat(&cv, &getVar(mb, getArg(p, 
i))->value);
                        }
                        if ( cv && strlen(cv) > len - (t - s)) {
-                               char *ns = (char *) GDKmalloc(len = strlen(cv) 
+ len + 2);
+                               char *ns = (char *) GDKmalloc(len = strlen(cv) 
+ len + 5);
 
                                *t = 0;
                                strcpy(ns, s);
@@ -2551,8 +2552,9 @@
                                GDKfree(s);
                                s = ns;
                        }
-                       if ( cv )
+                       if ( cv ) 
                                strcat(t, cv);
+                       
                        advance(t,base,len);
                        if ( (cv && strlen(cv)==0) || isVarUDFtype(mb, 
getArg(p, i)) ||
                                isAmbiguousType(getArgType(mb,p,i)) ){
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list