|
10 | 10 | * Written by Peter Eisentraut <peter_e@gmx.net>.
|
11 | 11 | *
|
12 | 12 | * IDENTIFICATION
|
13 |
| - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.520 2009/10/0318:04:57 tgl Exp $ |
| 13 | + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.521 2009/10/13 14:18:40 alvherre Exp $ |
14 | 14 | *
|
15 | 15 | *--------------------------------------------------------------------
|
16 | 16 | */
|
@@ -460,6 +460,7 @@ const char *const GucSource_Names[] =
|
460 | 460 | /* PGC_S_ARGV */"command line",
|
461 | 461 | /* PGC_S_DATABASE */"database",
|
462 | 462 | /* PGC_S_USER */"user",
|
| 463 | +/* PGC_S_DATABASE_USER */"database user", |
463 | 464 | /* PGC_S_CLIENT */"client",
|
464 | 465 | /* PGC_S_OVERRIDE */"override",
|
465 | 466 | /* PGC_S_INTERACTIVE */"interactive",
|
@@ -4556,7 +4557,8 @@ set_config_option(const char *name, const char *value,
|
4556 | 4557 | */
|
4557 | 4558 | elevel=IsUnderPostmaster ?DEBUG3 :LOG;
|
4558 | 4559 | }
|
4559 |
| -elseif (source==PGC_S_DATABASE||source==PGC_S_USER) |
| 4560 | +elseif (source==PGC_S_DATABASE||source==PGC_S_USER|| |
| 4561 | +source==PGC_S_DATABASE_USER) |
4560 | 4562 | elevel=WARNING;
|
4561 | 4563 | else
|
4562 | 4564 | elevel=ERROR;
|
@@ -5762,6 +5764,7 @@ define_custom_variable(struct config_generic * variable)
|
5762 | 5764 | break;
|
5763 | 5765 | casePGC_S_DATABASE:
|
5764 | 5766 | casePGC_S_USER:
|
| 5767 | +casePGC_S_DATABASE_USER: |
5765 | 5768 | casePGC_S_CLIENT:
|
5766 | 5769 | casePGC_S_SESSION:
|
5767 | 5770 | default:
|
|