diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-08-02 01:24:54 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-08-02 01:24:54 +0000 |
| commit | fbcf2cfb53513b9ade1c897e088aeb27252c43d7 (patch) | |
| tree | 7a560db8ec0a1079c25d4a836b710d89abbe4997 /src/backend | |
| parent | 67becf8d41a082eaaf6db6e0860d49409b79e32b (diff) | |
| download | postgresql-fbcf2cfb53513b9ade1c897e088aeb27252c43d7.tar.gz | |
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.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/utils/adt/datetime.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 65d2b875f0..713a87df3c 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; |