Changeset: dedbc3ab1160 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/dedbc3ab1160
Modified Files:
clients/mapiclient/mclient.c
clients/mapilib/mapi.c
Branch: simplify_scenario
Log Message:
set sizeheader field somewhat earlier
diffs (46 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3544,6 +3544,14 @@ main(int argc, char **argv)
if (mode == SQL && !settz)
mapi_set_time_zone(mid, 0);
+ if (mode == SQL) {
+ if (output) {
+ mapi_set_size_header(mid, strcmp(output, "raw") == 0);
+ } else {
+ mapi_set_size_header(mid, false);
+ }
+ }
+
if (mapi_error(mid) == MOK)
mapi_reconnect(mid); /* actually, initial connect */
@@ -3573,15 +3581,12 @@ main(int argc, char **argv)
mapi_trace(mid, trace);
if (output) {
setFormatter(output);
- mapi_set_size_header(mid, strcmp(output, "raw") == 0);
free(output);
} else {
if (mode == SQL) {
setFormatter("sql");
- mapi_set_size_header(mid, false);
} else {
setFormatter("raw");
- mapi_set_size_header(mid, true);
}
}
/* give the user a welcome message with some general info */
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -3814,6 +3814,8 @@ mapi_set_size_header(Mapi mid, bool valu
mapi_setError(mid, "size header only supported in SQL",
__func__, MERROR);
return MERROR;
}
+ if (mid->sizeheader == value)
+ return MOK;
mid->sizeheader = value;
if (!mid->connected)
return MOK;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
