Changeset: 7f79e346f06d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f79e346f06d
Modified Files:
clients/mapiclient/mclient.c
sql/backends/monet5/sql_optimizer.c
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (39 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2027,7 +2027,6 @@ doFile(Mapi mid, const char *file, int u
/* test for special commands */
if (mode != MAL)
while (length > 0 &&
- (*line & ~0x7F) == 0 &&
isascii((int) *line) &&
isspace((int) *line)) {
line++;
diff --git a/sql/backends/monet5/sql_optimizer.c
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -261,8 +261,11 @@ addQueryToCache(Client c)
if (c->listing)
printFunction(c->fdout, mb, 0, c->listing);
- if (m->debug)
- runMALDebugger(c, c->curprg);
+ if (m->debug) {
+ msg = runMALDebugger(c, c->curprg);
+ if (msg != MAL_SUCCEED)
+ GDKfree(msg); /* ignore error */
+ }
return;
}
addOptimizers(c, mb, pipe);
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1794,6 +1794,7 @@ def RunTest(env, TST, BusyPorts, COND, o
#elif [ -f "${TST}_p00.java" ] ; then EXT="java" ; CALL="JavaXp
"+TST+" "+EXT
#elif [ -f "$TST.odmg" ] ; then EXT="odmg" ; CALL="odmg
"+TST+" "+EXT
else:
+ os.chdir(TSTTRGDIR)
i = TST.rfind('.')
if i > 0:
return RunTest(env, TST[:i], BusyPorts, COND, oktests, length)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
