diff options
| author | Tom Lane | 2010-08-02 01:24:54 +0000 |
|---|---|---|
| committer | Tom Lane | 2010-08-02 01:24:54 +0000 |
| commit | fbcf2cfb53513b9ade1c897e088aeb27252c43d7 (patch) | |
| tree | 7a560db8ec0a1079c25d4a836b710d89abbe4997 | |
| parent | 67becf8d41a082eaaf6db6e0860d49409b79e32b (diff) | |
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.
| -rw-r--r-- | src/backend/utils/adt/datetime.c | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/pgtypeslib/interval.c | 4 |
2 files changed, 4 insertions, 4 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; diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c index b9894d7ffc..47fb936a18 100644 --- a/src/interfaces/ecpg/pgtypeslib/interval.c +++ b/src/interfaces/ecpg/pgtypeslib/interval.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/interval.c,v 1.42 2009/09/03 09:59:20 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/interval.c,v 1.43 2010/08/02 01:24:54 tgl Exp $ */ #include "postgres_fe.h" #include <time.h> @@ -606,7 +606,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; |