On Jan 26, 2011, at 15:15 , Fabian Groffen wrote:
> Changeset: c0f31d71a78e for MonetDB
> URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c0f31d71a78e
> Modified Files:
> clients/mapiclient/mclient.c
> Branch: default
> Log Message:
>
> mclient: warn when -t is used without xquery language
is it really necessary to give a warning? mclient also gives some timing info.
(the total query exec. time?) for the sql language, although not as extended
as for xquery.
>
> the option -t is ignored for non-XQuery languages, unify warning
> messages, since the client continues, don't mention the process name.
>
>
> diffs (26 lines):
>
> diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
> --- a/clients/mapiclient/mclient.c
> +++ b/clients/mapiclient/mclient.c
> @@ -2852,7 +2852,7 @@
> if (encoding != NULL) {
> toConsole = iconv_wstream(toConsole, encoding, "stdout");
> if (toConsole == NULL || mnstr_errnr(toConsole)) {
> - fprintf(stderr, "%s: warning: cannot convert local
> character set %s to UTF-8\n", argv[0], encoding);
> + fprintf(stderr, "warning: cannot convert local
> character set %s to UTF-8\n", encoding);
> if (toConsole != NULL) {
> mnstr_close(toConsole);
> mnstr_destroy(toConsole);
> @@ -2861,9 +2861,12 @@
> }
> stdout_stream = toConsole;
> if ((cd_in = iconv_open("utf-8", encoding)) == (iconv_t) -1)
> - fprintf(stderr, "%s: warning: cannot convert UTF-8 to
> local character set %s\n", argv[0], encoding);
> + fprintf(stderr, "warning: cannot convert UTF-8 to local
> character set %s\n", encoding);
> }
> #endif /* HAVE_ICONV */
> + if (mark != NULL && mode != XQUERY) {
> + fprintf(stderr, "warning: --timer (-t) option only available
> with XQuery\n");
> + }
>
> /* when config file would provide defaults */
> if (user_set_as_flag)
> _______________________________________________
> Checkin-list mailing list
> [email protected]
> http://mail.monetdb.org/mailman/listinfo/checkin-list
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
