diff options
| author | Shigeru Hanada | 2011-03-15 04:19:24 +0000 |
|---|---|---|
| committer | Shigeru Hanada | 2011-03-15 04:19:24 +0000 |
| commit | 47c559a335be1769c6aad97f6d9a2b35a969a1df (patch) | |
| tree | 92c0288b682eec3de81d5a9c876b31de2c2d3d05 | |
| parent | ef05d6c1e238f5d211201539e1908e1f75edaec4 (diff) | |
| parent | 2d68a329e3a2739012e6dca0327ab006276e93b0 (diff) | |
Merge branch 'postgresql_fdw' into parallelparallel
| -rw-r--r-- | src/bin/initdb/initdb.c | 1 | ||||
| -rw-r--r-- | src/include/utils/timestamp.h | 2 | ||||
| -rw-r--r-- | src/test/regress/expected/polymorphism.out | 3 | ||||
| -rw-r--r-- | src/test/regress/sql/polymorphism.sql | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index acd251415d..f6cf377282 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -2635,7 +2635,6 @@ main(int argc, char *argv[]) if (strcmp(authmethod, "md5") && strcmp(authmethod, "ident") && - strncmp(authmethod, "ident ", 6) && /* ident with space = param */ strcmp(authmethod, "trust") && #ifdef USE_PAM strcmp(authmethod, "pam") && diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index e14285f8a4..9e51b58dde 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -81,8 +81,6 @@ typedef struct */ #define DAYS_PER_MONTH 30 /* assumes exactly 30 days per month */ #define HOURS_PER_DAY 24 /* assume no daylight savings time changes */ -#define MINS_PER_HOUR 60 /* assume no daylight savings time changes */ -#define SECS_PER_MINUTE 60 /* assume no daylight savings time changes */ /* * This doesn't adjust for uneven daylight savings time intervals or leap diff --git a/src/test/regress/expected/polymorphism.out b/src/test/regress/expected/polymorphism.out index bae04a2719..4d1fc2beb0 100644 --- a/src/test/regress/expected/polymorphism.out +++ b/src/test/regress/expected/polymorphism.out @@ -623,7 +623,8 @@ where histogram_bounds is not null; (1 row) -- such functions must protect themselves if varying element type isn't OK -select max(histogram_bounds) from pg_stats; +-- (WHERE clause here is to avoid possibly getting a collation error instead) +select max(histogram_bounds) from pg_stats where tablename = 'pg_am'; ERROR: cannot compare arrays of different element types -- test variadic polymorphic functions create function myleast(variadic anyarray) returns anyelement as $$ diff --git a/src/test/regress/sql/polymorphism.sql b/src/test/regress/sql/polymorphism.sql index 2baebe9323..50e6905d4c 100644 --- a/src/test/regress/sql/polymorphism.sql +++ b/src/test/regress/sql/polymorphism.sql @@ -433,7 +433,8 @@ select distinct array_ndims(histogram_bounds) from pg_stats where histogram_bounds is not null; -- such functions must protect themselves if varying element type isn't OK -select max(histogram_bounds) from pg_stats; +-- (WHERE clause here is to avoid possibly getting a collation error instead) +select max(histogram_bounds) from pg_stats where tablename = 'pg_am'; -- test variadic polymorphic functions |