Changeset: ecadceeb8b8f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ecadceeb8b8f
Modified Files:
clients/mapiclient/mclient.c
clients/mapilib/mapi.c
sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:
Remove print statements and minor consistency changes.
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
@@ -1047,7 +1047,7 @@ mapi_escape_name(char *name) {
char *startbuffer = malloc(strlen(name) * 2 + 2);
char *buffer = startbuffer;
if (!startbuffer) return NULL;
- if (strchr(name, ',') || strchr(name, ' ') || strchr(name, '\t') ||
strchr(name, '#')) {
+ if (strchr(name, ',') || strchr(name, '\t') || strchr(name, '#')) {
*buffer++ = '"';
char *p;
for (p = name; *p; p++) {
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -4258,11 +4258,7 @@ read_into_cache(MapiHdl hdl, int lookahe
!mnstr_readInt(mid->from,
&result->fields[i].scale)) {
return mapi_setError(mid, "read error
from stream while reading result set", "read_into_cache", MERROR);
}
-
- if (strcasecmp(type_sql_name, "sec_interval")
== 0) {
- result->fields[i].scale = 3;
- }
-
+
if (!mnstr_readInt(mid->from, &null_len)) {
return mapi_setError(mid, "read error
from stream while reading result set", "read_into_cache", MERROR);
}
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -2019,7 +2019,6 @@ int mvc_export_resultset_prot10(mvc *m,
}
}
if (mnstr_flush(s) < 0) {
- fprintf(stderr, "Failed to flush.\n");
fres = -1;
goto cleanup;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
