Changeset: ffb18ee2b179 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ffb18ee2b179 Modified Files: clients/mapiclient/Tests/mclient--help.stable.err clients/mapiclient/Tests/mclient--help.stable.err.Windows common/utils/conversion.c Branch: protocol Log Message:
No year zero. diffs (41 lines): 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 @@ -20,7 +20,10 @@ Options are: -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} - -H | --history load/save cmdline history (default off) + -C version | --compression=type specify compression method {snappy,lz4} + -P version | --protocol=version specify protocol version {prot9,prot10,prot10compressed} + -B size | --blocksize=size specify protocol block size (>= 8190) + -c colcomp | --colcomp=type specify column compression type {none} -H | --history load/save cmdline history (default off) -i | --interactive[=tm] interpret `\' commands on stdin, use time formatting {ms,s,m} -l language | --language=lang {sql,mal} -L logfile | --log=logfile save client/server interaction diff --git a/clients/mapiclient/Tests/mclient--help.stable.err.Windows b/clients/mapiclient/Tests/mclient--help.stable.err.Windows --- a/clients/mapiclient/Tests/mclient--help.stable.err.Windows +++ b/clients/mapiclient/Tests/mclient--help.stable.err.Windows @@ -20,7 +20,10 @@ Options are: -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} - -H | --history load/save cmdline history (default off) + -C version | --compression=type specify compression method {snappy,lz4} + -P version | --protocol=version specify protocol version {prot9,prot10,prot10compressed} + -B size | --blocksize=size specify protocol block size (>= 8190) + -c colcomp | --colcomp=type specify column compression type {none} -H | --history load/save cmdline history (default off) -i | --interactive[=tm] interpret `\' commands on stdin, use time formatting {ms,s,m} -l language | --language=lang {sql,mal} -L logfile | --log=logfile save client/server interaction diff --git a/common/utils/conversion.c b/common/utils/conversion.c --- a/common/utils/conversion.c +++ b/common/utils/conversion.c @@ -255,6 +255,7 @@ conversion_date_to_string(char *dst, int } day -= CUMDAYS[month - 1]; } + year = (year <= 0) ? year - 1 : year; // hide year 0 // YYYY-MM-DD sprintf(dst, "%d-%02d-%02d", year, month, day); return (int) strlen(dst); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list