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.

5 files changed, 14 insertions, 14 deletions

diff --git a/src/pl/plperl/eloglvl.c b/src/pl/plperl/eloglvl.c
index 61c18b1e54..bfa2e56e41 100644
--- a/src/pl/plperl/eloglvl.c
+++ b/src/pl/plperl/eloglvl.c
@@ -13,7 +13,7 @@
 int
 elog_DEBUG(void)
 {
-	return DEBUG1;
+	return DEBUG2;
 }
 
 int
diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
index ef7b934f25..107946c336 100644
--- a/src/pl/plpgsql/src/gram.y
+++ b/src/pl/plpgsql/src/gram.y
@@ -4,7 +4,7 @@
  *						  procedural language
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.43 2003/05/05 16:46:27 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.44 2003/05/27 17:49:47 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -1294,7 +1294,7 @@ raise_level		: K_EXCEPTION
 					}
 				| K_DEBUG
 					{
-						$$ = DEBUG1;
+						$$ = DEBUG2;
 					}
 				;
 
diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index 544b7e3db6..1dcf9dd70d 100644
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -29,7 +29,7 @@
  * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *	$Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.31 2003/03/10 22:28:22 tgl Exp $
+ *	$Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.32 2003/05/27 17:49:47 momjian Exp $
  *
  *********************************************************************
  */
@@ -2661,7 +2661,7 @@ static PyObject *PLy_output(int, PyObject *, PyObject *);
 PyObject *
 PLy_debug(PyObject * self, PyObject * args)
 {
-	return PLy_output(DEBUG1, self, args);
+	return PLy_output(DEBUG2, self, args);
 }
 
 PyObject *
diff --git a/src/pl/plpython/plpython.h b/src/pl/plpython/plpython.h
index c2f6bba6f4..5b5300c83d 100644
--- a/src/pl/plpython/plpython.h
+++ b/src/pl/plpython/plpython.h
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/pl/plpython/Attic/plpython.h,v 1.6 2002/03/06 06:10:48 momjian Exp $ */
+/* $Header: /cvsroot/pgsql/src/pl/plpython/Attic/plpython.h,v 1.7 2003/05/27 17:49:47 momjian Exp $ */
 
 #ifndef PLPYTHON_H
 #define PLPYTHON_H
@@ -43,8 +43,8 @@
 
 #if DEBUG_LEVEL
 #define CALL_LEVEL_INC() do { PLy_call_level += 1; \
-	elog(DEBUG3, "Level: %d", PLy_call_level); } while (0)
-#define CALL_LEVEL_DEC() do { elog(DEBUG3, "Level: %d", PLy_call_level); \
+	elog(DEBUG4, "Level: %d", PLy_call_level); } while (0)
+#define CALL_LEVEL_DEC() do { elog(DEBUG4, "Level: %d", PLy_call_level); \
 	PLy_call_level -= 1; } while (0)
 #else
 #define CALL_LEVEL_INC() do { PLy_call_level += 1; } while (0)
@@ -54,10 +54,10 @@
 /* temporary debugging macros
  */
 #if DEBUG_LEVEL
-#define enter() elog(DEBUG3, "Enter(%d): %s", func_enter_calls++,__FUNCTION__)
-#define leave() elog(DEBUG3, "Leave(%d): %s", func_leave_calls++,__FUNCTION__)
-#define mark() elog(DEBUG3, "Mark: %s:%d", __FUNCTION__, __LINE__);
-#define refc(O) elog(DEBUG3, "Ref<%p>:<%d>:%s:%d", (O), (((O) == NULL) ? -1 : (O)->ob_refcnt), __FUNCTION__, __LINE__)
+#define enter() elog(DEBUG4, "Enter(%d): %s", func_enter_calls++,__FUNCTION__)
+#define leave() elog(DEBUG4, "Leave(%d): %s", func_leave_calls++,__FUNCTION__)
+#define mark() elog(DEBUG4, "Mark: %s:%d", __FUNCTION__, __LINE__);
+#define refc(O) elog(DEBUG4, "Ref<%p>:<%d>:%s:%d", (O), (((O) == NULL) ? -1 : (O)->ob_refcnt), __FUNCTION__, __LINE__)
 #else
 #define enter()
 #define leave()
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index fb33e4241f..35414d7889 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -31,7 +31,7 @@
  *	  ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.70 2003/05/16 13:37:00 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.71 2003/05/27 17:49:47 momjian Exp $
  *
  **********************************************************************/
 
@@ -1272,7 +1272,7 @@ pltcl_elog(ClientData cdata, Tcl_Interp *interp,
 	}
 
 	if (strcmp(argv[1], "DEBUG") == 0)
-		level = DEBUG1;
+		level = DEBUG2;
 	else if (strcmp(argv[1], "LOG") == 0)
 		level = LOG;
 	else if (strcmp(argv[1], "INFO") == 0)