|
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.488 2009/01/03 20:03:08 tgl Exp $ |
| 13 | + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.489 2009/01/05 13:23:33 tgl Exp $ |
14 | 14 | *
|
15 | 15 | *--------------------------------------------------------------------
|
16 | 16 | */
|
@@ -5747,9 +5747,17 @@ define_custom_variable(struct config_generic * variable)
|
5747 | 5747 | value=*pHolder->variable;
|
5748 | 5748 |
|
5749 | 5749 | if (value)
|
5750 |
| -set_config_option(name,value, |
5751 |
| -phcontext,pHolder->gen.source, |
5752 |
| -GUC_ACTION_SET, true); |
| 5750 | +{ |
| 5751 | +if (set_config_option(name,value, |
| 5752 | +phcontext,pHolder->gen.source, |
| 5753 | +GUC_ACTION_SET, true)) |
| 5754 | +{ |
| 5755 | +/* Also copy over any saved source-location information */ |
| 5756 | +if (pHolder->gen.sourcefile) |
| 5757 | +set_config_sourcefile(name,pHolder->gen.sourcefile, |
| 5758 | +pHolder->gen.sourceline); |
| 5759 | +} |
| 5760 | +} |
5753 | 5761 |
|
5754 | 5762 | /*
|
5755 | 5763 | * Free up as much as we conveniently can of the placeholder structure
|
|