Make analyze do vacuum/analyze in one step.

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index d4e4b89f6863ae00826ade9147163e5b15375939..4488e9881cb18f0c8bb04b16843dce63f0be6a40 100644 (file)
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.156 2000/05/29 17:06:14 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.157 2000/05/29 17:07:57 momjian Exp $
  *
 
  *-------------------------------------------------------------------------
@@ -244,12 +244,12 @@ vac_vacuum(NameData *VacRelP, bool analyze, List *anal_cols2)
 
        /* vacuum each heap relation */
        for (cur = vrl; cur != (VRelList) NULL; cur = cur->vrl_next)
+       {
                vacuum_rel(cur->vrl_relid, analyze);
-
-       /* analyze separately so locking is minimized */
-       if (analyze)
-               for (cur = vrl; cur != (VRelList) NULL; cur = cur->vrl_next)
+               /* analyze separately so locking is minimized */
+               if (analyze)
                        analyze_rel(cur->vrl_relid, anal_cols2);
+       }
 }
 
 static VRelList