diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/c.h | 8 | ||||
| -rw-r--r-- | src/include/parser/parse_coerce.h | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/include/c.h b/src/include/c.h index fb51e5011c3..ea96d87b911 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.65 2000/03/19 22:08:51 tgl Exp $ + * $Id: c.h,v 1.66 2000/03/20 04:02:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -673,8 +673,10 @@ extern int assertTest(int val); * overhead. * * We got the 64 number by testing this against the stock memset() on - * BSD/OS 3.0. Larger values were slower. (I think the crossover point - * could be a good deal higher for most platforms, actually --- tgl) + * BSD/OS 3.0. Larger values were slower. bjm 1997/09/11 + * + * I think the crossover point could be a good deal higher for + * most platforms, actually. tgl 2000-03-19 */ #define MemSet(start, val, len) \ do \ diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index d0acd944e11..0549386a397 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_coerce.h,v 1.19 2000/03/14 23:06:48 thomas Exp $ + * $Id: parse_coerce.h,v 1.20 2000/03/20 04:02:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,6 +45,7 @@ typedef enum CATEGORY || ((t) == BPCHAROID) \ || ((t) == VARCHAROID) \ || ((t) == TEXTOID) \ + || ((t) == BYTEAOID) \ || ((t) == INT4OID) \ || ((t) == INT8OID) \ || ((t) == FLOAT8OID) \ @@ -81,10 +82,16 @@ typedef enum CATEGORY #define IS_BINARY_COMPATIBLE(a,b) \ (((a) == BPCHAROID && (b) == TEXTOID) \ || ((a) == BPCHAROID && (b) == VARCHAROID) \ + || ((a) == BPCHAROID && (b) == BYTEAOID) \ || ((a) == VARCHAROID && (b) == TEXTOID) \ || ((a) == VARCHAROID && (b) == BPCHAROID) \ + || ((a) == VARCHAROID && (b) == BYTEAOID) \ || ((a) == TEXTOID && (b) == BPCHAROID) \ || ((a) == TEXTOID && (b) == VARCHAROID) \ + || ((a) == TEXTOID && (b) == BYTEAOID) \ + || ((a) == BYTEAOID && (b) == BPCHAROID) \ + || ((a) == BYTEAOID && (b) == VARCHAROID) \ + || ((a) == BYTEAOID && (b) == TEXTOID) \ || ((a) == OIDOID && (b) == INT4OID) \ || ((a) == OIDOID && (b) == REGPROCOID) \ || ((a) == INT4OID && (b) == OIDOID) \ |