Log Message:
-----------
Fixed malformed query resulting from subscribing to empty set.


Jan

Tags:
----
REL_1_1_STABLE

Modified Files:
--------------
    slony1-engine/src/slon:
        remote_worker.c (r1.86.2.3 -> r1.86.2.4)

-------------- next part --------------
Index: remote_worker.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/remote_worker.c,v
retrieving revision 1.86.2.3
retrieving revision 1.86.2.4
diff -Lsrc/slon/remote_worker.c -Lsrc/slon/remote_worker.c -u -w -r1.86.2.3 -r1.86.2.4
--- src/slon/remote_worker.c
+++ src/slon/remote_worker.c
@@ -3760,6 +3760,7 @@
 		PGresult   *res2;
 		int			ntuples2;
 		int			tupno2;
+		int			ntables_total = 0;
 		int			added_or_to_provider = 0;
 
 		provider_qual = &(provider->helper_qualification);
@@ -3854,8 +3855,16 @@
 			if (ntuples2 == 0)
 			{
 				PQclear(res2);
+
+				if (!added_or_to_provider)
+				{
+					slon_appendquery(provider_qual, " ( false ) ");
+					added_or_to_provider = 1;
+				}
+
 				continue;
 			}
+			ntables_total += ntuples2;
 
 			/*
 			 * ... and build up a query qualification that is