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.

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 8f0cba970868920919fc6107b549fa0938ef8952..b31689b9eb87e0fd5585750b86c22e80204a0285 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <[email protected]>.
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.299.2.9 2010/03/25 14:45:36 alvherre Exp $
+ *   $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.299.2.10 2010/05/05 02:55:04 tgl Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -5579,13 +5579,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,