diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-05-05 02:55:11 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-05-05 02:55:11 +0000 |
| commit | 923b447063e5c72d731c0c814cce189e6487c52e (patch) | |
| tree | e91026db48c80df5e63f9ccba7a51205f535f4d8 /src/backend | |
| parent | 8073cd2e6cda64a67cfe851091146c8ea5e6cc83 (diff) | |
| download | postgresql-923b447063e5c72d731c0c814cce189e6487c52e.tar.gz postgresql-923b447063e5c72d731c0c814cce189e6487c52e.zip | |
Fix backpatching error in recent patch for ALTER USER f RESET ALL behavior.
The argument list for array_set() changed in 8.2 (in connection with allowing
nulls in arrays) but the newer argument list was used in the patches applied
to 8.1 and 8.0 branches. The patch for 7.4 was OK though. Per compiler
warnings.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 034f469b05b..92005b30a67 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.252.4.10 2010/03/25 14:45:51 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.252.4.11 2010/05/05 02:55:11 tgl Exp $ * *-------------------------------------------------------------------- */ @@ -5327,13 +5327,14 @@ GUCArrayDelete(ArrayType *array, const char *name) /* else add it to the output array */ if (newarray) { + isnull = false; newarray = array_set(newarray, 1, &index, d, - false, -1 /* varlenarray */ , -1 /* TEXT's typlen */ , false /* TEXT's typbyval */ , - 'i' /* TEXT's typalign */ ); + 'i' /* TEXT's typalign */ , + &isnull); } else newarray = construct_array(&d, 1, |