another windows fix

[plantuner.git] / plantuner.c

diff --git a/plantuner.c b/plantuner.c
index 050e3b7..0fa907a 100644 (file)
--- a/plantuner.c
+++ b/plantuner.c
@@ -32,6 +32,7 @@
 #include <fmgr.h>
 #include <miscadmin.h>
 #include <access/heapam.h>
+#include <access/xact.h>
 #include <catalog/namespace.h>
 #include <catalog/pg_class.h>
 #include <nodes/pg_list.h>
@@ -77,6 +78,22 @@ indexesAssign(const char * newval, bool doit, GucSource source, bool isDisable)
        if (!SplitIdentifierString(rawname, ',', &namelist))
                goto cleanup;
 
+       /*
+        * follow work could be done only in normal processing because of
+        * accsess to system catalog
+        */
+       if (MyBackendId == InvalidBackendId || !IsUnderPostmaster ||
+               !IsTransactionState())
+       {
+               /* reset init state */
+               if (isDisable)
+                       plantuner_disable_inited = false;
+               else
+                       plantuner_enable_inited = false;
+
+               return newval;
+       }
+
        if (doit)
        {
                nOids = list_length(namelist);
@@ -86,14 +103,6 @@ indexesAssign(const char * newval, bool doit, GucSource source, bool isDisable)
                                 (int)(sizeof(Oid) * (nOids+1)));
        }
 
-       /*
-        * follow work could be done only in normal processing because of
-        * accsess to system catalog
-        */
-       if (MyBackendId == InvalidBackendId || !IsUnderPostmaster ||
-               !IsNormalProcessingMode() || MyAuxProcType != NotAnAuxProcess)
-               return newval;
-
        if (isDisable)
                plantuner_disable_inited = true;
        else