diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-04-28 16:54:16 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-04-28 16:54:16 +0000 |
| commit | 77acab75dfe2e4741c25c0cf550266caef1eebd2 (patch) | |
| tree | 1a5d86661c9394e2e79ae038775e874395f24f59 /contrib/pg_stat_statements/pg_stat_statements.c | |
| parent | 5f70a04c56b69fff0f356abae3091eaa54038a5b (diff) | |
| download | postgresql-77acab75dfe2e4741c25c0cf550266caef1eebd2.tar.gz postgresql-77acab75dfe2e4741c25c0cf550266caef1eebd2.zip | |
Modify ShmemInitStruct and ShmemInitHash to throw errors internally,
rather than returning NULL for some-but-not-all failures as they used to.
Remove now-redundant tests for NULL from call sites.
We had to do something about this because many call sites were failing to
check for NULL; and changing it like this seems a lot more useful and
mistake-proof than adding checks to the call sites without them.
Diffstat (limited to 'contrib/pg_stat_statements/pg_stat_statements.c')
| -rw-r--r-- | contrib/pg_stat_statements/pg_stat_statements.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index 8fa249e9b8b..eb89aeca801 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -14,7 +14,7 @@ * Copyright (c) 2008-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/pg_stat_statements/pg_stat_statements.c,v 1.13 2010/02/26 02:00:32 momjian Exp $ + * $PostgreSQL: pgsql/contrib/pg_stat_statements/pg_stat_statements.c,v 1.14 2010/04/28 16:54:15 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -321,8 +321,6 @@ pgss_shmem_startup(void) pgss = ShmemInitStruct("pg_stat_statements", sizeof(pgssSharedState), &found); - if (!pgss) - elog(ERROR, "out of shared memory"); if (!found) { @@ -343,8 +341,6 @@ pgss_shmem_startup(void) pgss_max, pgss_max, &info, HASH_ELEM | HASH_FUNCTION | HASH_COMPARE); - if (!pgss_hash) - elog(ERROR, "out of shared memory"); LWLockRelease(AddinShmemInitLock); |