Changeset: 0c63d5ba35b8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c63d5ba35b8 Modified Files: Branch: default Log Message:
Merge with Oct2010 branch.
diffs (50 lines):
diff -r 422bf650f172 -r 0c63d5ba35b8 clients/src/mapiclient/mclient.c
--- a/clients/src/mapiclient/mclient.c Tue Sep 28 10:24:53 2010 +0200
+++ b/clients/src/mapiclient/mclient.c Tue Sep 28 16:41:14 2010 +0200
@@ -1365,15 +1365,10 @@
do {
/* handle errors first */
if ((reply = mapi_result_error(hdl)) != NULL) {
- if (formatter == RAWformatter ||
- formatter == TESTformatter ||
- formatter == CSVformatter)
- mapi_explain_result(hdl, stderr);
- else
- mnstr_printf(toConsole, "%s", reply);
+ mapi_explain_result(hdl, stderr);
errseen = 1;
- /* don't need to print something like '0 tuples' if we
got
- * an error */
+ /* don't need to print something like '0
+ * tuples' if we got an error */
continue;
}
diff -r 422bf650f172 -r 0c63d5ba35b8
pathfinder/modules/pftijah/Tests/procs.stable.out
--- a/pathfinder/modules/pftijah/Tests/procs.stable.out Tue Sep 28 10:24:53
2010 +0200
+++ b/pathfinder/modules/pftijah/Tests/procs.stable.out Tue Sep 28 16:41:14
2010 +0200
@@ -631,8 +631,8 @@
[ "standoff_select_narrow(BAT[void,oid], BAT[oid,void], BAT[oid,oid],
BAT[oid,any], BAT[oid,any]) : BAT[void,oid]"
]
[ "standoff_select_wide(BAT[void,oid], BAT[oid,void], BAT[oid,oid],
BAT[oid,any], BAT[oid,any]) : BAT[void,oid]"
]
[ "step(int, int, BAT[void,oid], BAT[void,oid], BAT[void,oid], any,
BAT[void,BAT], int, chr, str, str, str) : BAT[void,BAT]" ]
-[ "mnstr_line(Stream) : str"
]
-[ "mnstr_strip(Stream, str) : str"
]
+[ "stream_line(Stream) : str"
]
+[ "stream_strip(Stream, str) : str"
]
[ "string(str, int) : str"
]
[ "string(str, int, int) : str"
]
[ "stringleft(str, int) : str"
]
diff -r 422bf650f172 -r 0c63d5ba35b8 pathfinder/runtime/Tests/procs.stable.out
--- a/pathfinder/runtime/Tests/procs.stable.out Tue Sep 28 10:24:53 2010 +0200
+++ b/pathfinder/runtime/Tests/procs.stable.out Tue Sep 28 16:41:14 2010 +0200
@@ -633,8 +633,8 @@
[ "standoff_select_narrow(BAT[void,oid], BAT[oid,void], BAT[oid,oid],
BAT[oid,any], BAT[oid,any]) : BAT[void,oid]"
]
[ "standoff_select_wide(BAT[void,oid], BAT[oid,void], BAT[oid,oid],
BAT[oid,any], BAT[oid,any]) : BAT[void,oid]"
]
[ "step(int, int, BAT[void,oid], BAT[void,oid], BAT[void,oid], any,
BAT[void,BAT], int, chr, str, str, str) : BAT[void,BAT]"
]
-[ "mnstr_line(Stream) : str"
]
-[ "mnstr_strip(Stream, str) : str"
]
+[ "stream_line(Stream) : str"
]
+[ "stream_strip(Stream, str) : str"
]
[ "string(str, int) : str"
]
[ "string(str, int, int) : str"
]
[ "stringleft(str, int) : str"
]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
