Make debug_ GUC varables output DEBUG1 rather than LOG, and mention in

docs that CLIENT/LOG_MIN_MESSAGES now controls debug_* output location.
Doc changes included.

4 files changed, 23 insertions, 23 deletions

diff --git a/contrib/intarray/_int.c b/contrib/intarray/_int.c
index 09c7960e15..eb42e41216 100644
--- a/contrib/intarray/_int.c
+++ b/contrib/intarray/_int.c
@@ -110,7 +110,7 @@ printarr(ArrayType *a, int num)
 	initStringInfo(&bbb);
 	for (l = 0; l < min(num, ARRNELEMS(a)); l++)
 		appendStringInfo(&bbb, "%d ", d[l]);
-	elog(DEBUG3, "\t\t%s", bbb.data);
+	elog(DEBUG4, "\t\t%s", bbb.data);
 	pfree(bbb.data);
 }
 static void
@@ -122,7 +122,7 @@ printbitvec(BITVEC bv)
 	str[SIGLENBIT] = '\0';
 	LOOPBIT(str[i] = (GETBIT(bv, i)) ? '1' : '0');
 
-	elog(DEBUG3, "BV: %s", str);
+	elog(DEBUG4, "BV: %s", str);
 }
 #endif
 
@@ -589,7 +589,7 @@ inner_int_contains(ArrayType *a, ArrayType *b)
 	db = ARRPTR(b);
 
 #ifdef GIST_DEBUG
-	elog(DEBUG3, "contains %d %d", na, nb);
+	elog(DEBUG4, "contains %d %d", na, nb);
 #endif
 
 	i = j = n = 0;
@@ -709,7 +709,7 @@ inner_int_overlap(ArrayType *a, ArrayType *b)
 	db = ARRPTR(b);
 
 #ifdef GIST_DEBUG
-	elog(DEBUG3, "g_int_overlap");
+	elog(DEBUG4, "g_int_overlap");
 #endif
 
 	i = j = 0;
@@ -1334,7 +1334,7 @@ _int_common_union(bytea *entryvec, int *sizep, formarray unionf)
 	ArrayType  *tmp;
 
 #ifdef GIST_DEBUG
-	elog(DEBUG3, "_int_common_union in");
+	elog(DEBUG4, "_int_common_union in");
 #endif
 
 	numranges = (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY);
@@ -1355,12 +1355,12 @@ _int_common_union(bytea *entryvec, int *sizep, formarray unionf)
 	{
 		pfree(out);
 #ifdef GIST_DEBUG
-		elog(DEBUG3, "_int_common_union out1");
+		elog(DEBUG4, "_int_common_union out1");
 #endif
 		return NULL;
 	}
 #ifdef GIST_DEBUG
-	elog(DEBUG3, "_int_common_union out");
+	elog(DEBUG4, "_int_common_union out");
 #endif
 	return (out);
 
@@ -1380,7 +1380,7 @@ _int_common_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result,
 				tmp2;
 
 #ifdef GIST_DEBUG
-	elog(DEBUG3, "penalty");
+	elog(DEBUG4, "penalty");
 #endif
 	ud = (*unionf) ((ArrayType *) DatumGetPointer(origentry->key),
 					(ArrayType *) DatumGetPointer(newentry->key));
@@ -1390,7 +1390,7 @@ _int_common_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result,
 	pfree(ud);
 
 #ifdef GIST_DEBUG
-	elog(DEBUG3, "--penalty\t%g", *result);
+	elog(DEBUG4, "--penalty\t%g", *result);
 #endif
 
 	return (result);
@@ -1451,7 +1451,7 @@ _int_common_picksplit(bytea *entryvec,
 	SPLITCOST  *costvector;
 
 #ifdef GIST_DEBUG
-	elog(DEBUG3, "--------picksplit %d", (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY));
+	elog(DEBUG4, "--------picksplit %d", (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY));
 #endif
 
 	maxoff = ((VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY)) - 2;
@@ -1609,7 +1609,7 @@ _int_common_picksplit(bytea *entryvec,
 	v->spl_rdatum = PointerGetDatum(datum_r);
 
 #ifdef GIST_DEBUG
-	elog(DEBUG3, "--------ENDpicksplit %d %d", v->spl_nleft, v->spl_nright);
+	elog(DEBUG4, "--------ENDpicksplit %d %d", v->spl_nleft, v->spl_nright);
 #endif
 	return v;
 }
@@ -1962,7 +1962,7 @@ static void
 findoprnd(ITEM * ptr, int4 *pos)
 {
 #ifdef BS_DEBUG
-	elog(DEBUG3, (ptr[*pos].type == OPR) ?
+	elog(DEBUG4, (ptr[*pos].type == OPR) ?
 		 "%d  %c" : "%d  %d ", *pos, ptr[*pos].val);
 #endif
 	if (ptr[*pos].type == VAL)
@@ -2045,7 +2045,7 @@ bqarr_in(PG_FUNCTION_ARGS)
 		else
 			appendStringInfo(&pbuf, "%d ", ptr[i].val);
 	}
-	elog(DEBUG3, "POR: %s", pbuf.data);
+	elog(DEBUG4, "POR: %s", pbuf.data);
 	pfree(pbuf.data);
 #endif
 
diff --git a/contrib/rserv/rserv.c b/contrib/rserv/rserv.c
index 635fcce64a..278be31f13 100644
--- a/contrib/rserv/rserv.c
+++ b/contrib/rserv/rserv.c
@@ -132,7 +132,7 @@ _rserv_log_()
 			 GetCurrentTransactionId(), deleted, rel->rd_id, okey);
 
 	if (debug)
-		elog(DEBUG3, "sql: %s", sql);
+		elog(DEBUG4, "sql: %s", sql);
 
 	ret = SPI_exec(sql, 0);
 
@@ -153,7 +153,7 @@ _rserv_log_()
 				 deleted, okey);
 
 		if (debug)
-			elog(DEBUG3, "sql: %s", sql);
+			elog(DEBUG4, "sql: %s", sql);
 
 		ret = SPI_exec(sql, 0);
 
@@ -177,7 +177,7 @@ _rserv_log_()
 				 rel->rd_id, GetCurrentTransactionId(), okey);
 
 		if (debug)
-			elog(DEBUG3, "sql: %s", sql);
+			elog(DEBUG4, "sql: %s", sql);
 
 		ret = SPI_exec(sql, 0);
 
diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c
index c3259e49b7..340f7be8a6 100644
--- a/contrib/spi/refint.c
+++ b/contrib/spi/refint.c
@@ -59,7 +59,7 @@ check_primary_key(PG_FUNCTION_ARGS)
 	int			i;
 
 #ifdef	DEBUG_QUERY
-	elog(DEBUG3, "Check_primary_key Enter Function");
+	elog(DEBUG4, "Check_primary_key Enter Function");
 #endif
 
 	/*
@@ -249,7 +249,7 @@ check_foreign_key(PG_FUNCTION_ARGS)
 				r;
 
 #ifdef DEBUG_QUERY
-	elog(DEBUG3, "Check_foreign_key Enter Function");
+	elog(DEBUG4, "Check_foreign_key Enter Function");
 #endif
 
 	/*
@@ -453,7 +453,7 @@ check_foreign_key(PG_FUNCTION_ARGS)
 							 strcmp(type, "date") && strcmp(type, "timestamp")) == 0)
 							is_char_type = 1;
 #ifdef	DEBUG_QUERY
-						elog(DEBUG3, "Check_foreign_key Debug value %s type %s %d",
+						elog(DEBUG4, "Check_foreign_key Debug value %s type %s %d",
 							 nv, type, is_char_type);
 #endif
 
@@ -521,7 +521,7 @@ check_foreign_key(PG_FUNCTION_ARGS)
 		}
 		plan->nplans = nrefs;
 #ifdef	DEBUG_QUERY
-		elog(DEBUG3, "Check_foreign_key Debug Query is :  %s ", sql);
+		elog(DEBUG4, "Check_foreign_key Debug Query is :  %s ", sql);
 #endif
 	}
 
diff --git a/contrib/tsearch/query.c b/contrib/tsearch/query.c
index 8253787320..a31bae428d 100644
--- a/contrib/tsearch/query.c
+++ b/contrib/tsearch/query.c
@@ -449,7 +449,7 @@ static void
 findoprnd(ITEM * ptr, int4 *pos)
 {
 #ifdef BS_DEBUG
-	elog(DEBUG3, (ptr[*pos].type == OPR) ?
+	elog(DEBUG4, (ptr[*pos].type == OPR) ?
 		 "%d  %c" : "%d  %d ", *pos, ptr[*pos].val);
 #endif
 	if (ptr[*pos].type == VAL || ptr[*pos].type == VALTRUE)
@@ -557,7 +557,7 @@ queryin(char *buf, void (*pushval) (QPRS_STATE *, int, char *, int))
 			sprintf(cur, "%d(%s) ", ptr[i].val, GETOPERAND(query) + ptr[i].distance);
 		cur = strchr(cur, '\0');
 	}
-	elog(DEBUG3, "POR: %s", pbuf);
+	elog(DEBUG4, "POR: %s", pbuf);
 #endif
 
 	return query;
@@ -610,7 +610,7 @@ mqtxt_in(PG_FUNCTION_ARGS)
 			sprintf(cur, "%d(%s) ", ptr[i].val, GETOPERAND(query) + ptr[i].distance);
 		cur = strchr(cur, '\0');
 	}
-	elog(DEBUG3, "POR: %s", pbuf);
+	elog(DEBUG4, "POR: %s", pbuf);
 #endif
 	pfree(res);
 	PG_RETURN_POINTER(query);