Changeset: ebcf8361248f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ebcf8361248f
Modified Files:
clients/Tests/mclient-uri.SQL.sh
clients/mapiclient/Tests/mclient--help.stable.err
clients/mapiclient/mclient.1
clients/mapiclient/mclient.c
Branch: default
Log Message:
Manual update
diffs (86 lines):
diff --git a/clients/Tests/mclient-uri.SQL.sh b/clients/Tests/mclient-uri.SQL.sh
--- a/clients/Tests/mclient-uri.SQL.sh
+++ b/clients/Tests/mclient-uri.SQL.sh
@@ -2,8 +2,8 @@
# test the URI parsing capabilities of the MAPI library
-Mlog "mclient -d
mapi:monetdb://$HOST:$MAPIPORT/$TSTDB?language=sql&user=monetdb -f test -E
utf-8 -s select 1"
+Mlog "mclient -d
mapi:monetdb://$HOST:$MAPIPORT/$TSTDB?language=sql&user=monetdb -f test -t
none-E utf-8 -s select 1"
mclient -d "mapi:monetdb://$HOST:$MAPIPORT/$TSTDB?language=sql&user=monetdb"
-f test -E utf-8 -s 'select 1'
-Mlog "mclient -d
mapi:monetdb://$MAPIHOST/.s.monetdb.$MAPIPORT?database=$TSTDB&language=sql&user=monetdb
-f test -E utf-8 -s select 1"
+Mlog "mclient -d
mapi:monetdb://$MAPIHOST/.s.monetdb.$MAPIPORT?database=$TSTDB&language=sql&user=monetdb
-f test -t none -E utf-8 -s select 1"
mclient -d
"mapi:monetdb://$MAPIHOST/.s.monetdb.$MAPIPORT?database=$TSTDB&language=sql&user=monetdb"
-f test -E utf-8 -s 'select 1'
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err
b/clients/mapiclient/Tests/mclient--help.stable.err
--- a/clients/mapiclient/Tests/mclient--help.stable.err
+++ b/clients/mapiclient/Tests/mclient--help.stable.err
@@ -19,9 +19,10 @@ Options are:
-d database | --database=database database to connect to (may be URI)
-e | --echo echo the query
-E charset | --encoding=charset specify encoding (character set) of the
terminal
- -f kind | --format=kind specify output format {csv,tab,raw,sql,xml}
+ -f kind | --format=kind specify output format
{csv,tab,raw,sql,xml,trash}
-H | --history load/save cmdline history (default off)
- -i | --interactive[=tm] interpret `\' commands on stdin, use time
formatting {ms,s,m}
+ -i | --interactive interpret `\' commands on stdin
+ -t | --timer=format use time formatting
{clock,minutes,seconds,milliseconds,microseconds,none}
-l language | --language=lang {sql,mal}
-L logfile | --log=logfile save client/server interaction
-s stmt | --statement=stmt run single statement
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -148,22 +148,20 @@ these are supported.
Specify the portnumber of the server (default:
.BR 50000 ).
.TP
-\fB\-\-interactive\fP[\fB=\fP\fItimermode\fP] (\fB\-i\fP[\fItimermode\fP])
+\fB\-\-interactive\fP
When reading from standard input, interpret lines starting with
.B \e
(backslash) specially.
See the section BACKSLASH COMMANDS below.
-This is the default if standard input is a terminal.
-The optional \fItimermode\fP argument controls the
+
+\fB\-\-timer\fP[\fB=\fP\fItimermode\fP]
+The \fItimer\fP command controls the
format of the time reported for queries.
-Note that no space is allowed between
-.B \-i
-and
-.IR timermode .
-The default mode is
-\fBhuman\fP which adjusts the time precision to the measured value.
-The modes \fBms\fP, \fBs\fP and \fBm\fP force millisecond, second and
-minute + second precision respectively.
+The default mode is \fBclock\fP which reports on the wall-clock time in a
human friendly way.
+The precision of the timing can be forced using any of
+[ \fBmicroseconds\fP, \fBmilliseconds\fP, \fBseconds\fP and \fBminutes\fP]
+The timer mode \fBnone\fP turns off timing reporting.
+The timer mode \fBperformance\fP shows the timing components in millisecond
resolution.
.TP
\fB\-\-user\fP\fB=\fP\fIuser\fP (\fB\-u\fP \fIuser\fP)
Specify the user to connect as.
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2859,7 +2859,7 @@ doFile(Mapi mid, stream *fp, int useinse
timermode = T_SECS;
} else if (strncmp(line, "milli", 5) ==
0 || strcmp(line,"milliseconds") == 0) {
timermode = T_MILLIS;
- } else if (strncmp(line, "min", 53 == 0
|| strcmp(line,"minutes") == 0) {
+ } else if (strncmp(line, "min", 3) == 0
|| strcmp(line,"minutes") == 0) {
timermode = T_MINUTES;
} else if (strncmp(line,"micro", 5) ==
0 || strcmp(line,"microseconds") == 0) {
timermode = T_MICRO;
@@ -3144,7 +3144,7 @@ main(int argc, char **argv)
#ifdef HAVE_ICONV
"E:"
#endif
- "f:h:i:t:L:l:n:"
+ "f:h:it:L:l:n:"
#ifdef HAVE_POPEN
"|:"
#endif
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
