Changeset: e9eab6fa6103 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e9eab6fa6103
Modified Files:
monetdb5/mal/mal_debugger.c
tools/merovingian/client/monetdb.c
Branch: Jul2015
Log Message:
merge
diffs (33 lines):
diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -823,16 +823,7 @@ retryRead:
i = findVariable(mb, b);
}
if (i < 0) {
- i = BBPindex(b);
- if (i != 0) {
- printBATelm(out, i, size, first);
- } else {
- i = atoi(b);
- if (i>-0 || *b == '0')
- printStackElm(out, mb, stk->stk
+ i, i, size, first);
- else
- mnstr_printf(out, "#%s Symbol
not found\n", "#mdb ");
- }
+ mnstr_printf(out, "#%s Symbol not found\n", b);
continue;
}
if (isaBatType(getVarType(mb, i)) && upper == 'p') {
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -790,7 +790,7 @@ command_status(int argc, char *argv[])
dbwidth = t;
if (stats->uri != NULL && (t = strlen(stats->uri)) >
uriwidth)
uriwidth = t;
- if (stats->locked && uriwidth < 32)
+ if (uriwidth < 32)
uriwidth = 32;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
