From fbcf2cfb53513b9ade1c897e088aeb27252c43d7 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 2 Aug 2010 01:24:54 +0000 Subject: Fix an ancient typo that prevented the detection of conflicting fields when interval input "invalid" was specified together with other fields. Spotted by Neil Conway with the help of a clang warning. Although this has been wrong since the interval code was written more than 10 years ago, it doesn't affect anything beyond which error message you get for a wrong input, so not worth back-patching very far. --- src/backend/utils/adt/datetime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/backend/utils/adt/datetime.c') diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 65d2b875f07..713a87df3c1 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.212 2010/05/09 02:15:59 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.213 2010/08/02 01:24:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -3098,7 +3098,7 @@ DecodeInterval(char **field, int *ftype, int nf, int range, break; case RESERV: - tmask = (DTK_DATE_M || DTK_TIME_M); + tmask = (DTK_DATE_M | DTK_TIME_M); *dtype = val; break; -- cgit v1.2.3