Fix a few missed NOIND usages.

diff --git a/doc/src/sgml/pltcl.sgml b/doc/src/sgml/pltcl.sgml
index 4f57beb25f371e9b59368afde85e96f831c2fc1d..0683739f1a403c547f882a904859f98d473d5c9b 100644 (file)
--- a/doc/src/sgml/pltcl.sgml
+++ b/doc/src/sgml/pltcl.sgml
@@ -1,5 +1,5 @@
 
 
  
@@ -348,7 +348,7 @@ CREATE TRIGGER trig_mytab_modcount BEFORE INSERT OR UPDATE ON mytab
       
        
    Fire a log message. Possible levels are NOTICE, ERROR,
-   FATAL, DEBUG and NOIND
+   FATAL, and DEBUG
    as for the elog C function.
        
       

diff --git a/src/pl/plperl/SPI.xs b/src/pl/plperl/SPI.xs
index 3fffbc67f6f98fa9dbcdb86b53837f7b0cd446f1..451714ce0e85d80a42349ce43bac92dc1e04d0af 100644 (file)
--- a/src/pl/plperl/SPI.xs
+++ b/src/pl/plperl/SPI.xs
@@ -61,9 +61,6 @@ elog_elog(level, message)
        elog(level, message);
 
 
-int
-elog_NOIND()
-
 int
 elog_DEBUG()
 

diff --git a/src/pl/plperl/eloglvl.c b/src/pl/plperl/eloglvl.c
index 7fe2b0434009dea4893411e98201eb6ec1827872..03353a103e342bfb877473004264cec8def6170c 100644 (file)
--- a/src/pl/plperl/eloglvl.c
+++ b/src/pl/plperl/eloglvl.c
@@ -22,12 +22,6 @@ elog_ERROR(void)
    return ERROR;
 }
 
-int
-elog_NOIND(void)
-{
-   return NOIND;
-}
-
 int
 elog_NOTICE(void)
 {

diff --git a/src/pl/plperl/eloglvl.h b/src/pl/plperl/eloglvl.h
index e79f5530c12bf1aad325372fb98f0211f0d30c1e..c07cd5b5d494d02337f7f75d930fd05d97db1412 100644 (file)
--- a/src/pl/plperl/eloglvl.h
+++ b/src/pl/plperl/eloglvl.h
@@ -5,7 +5,4 @@ int
 int
            elog_ERROR(void);
 
-int
-           elog_NOIND(void);
-
 int            elog_NOTICE(void);

diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index bb9ab670ae626e38bd4fb828256e98429a9bf26d..cfd3a6c8c1eec1eeb43e8fa7bc65923754a98163 100644 (file)
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -33,7 +33,7 @@
  *   ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/pl/plperl/plperl.c,v 1.20 2001/06/01 18:17:44 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/pl/plperl/plperl.c,v 1.21 2001/06/09 02:19:07 tgl Exp $
  *
  **********************************************************************/
 
@@ -252,7 +252,7 @@ plperl_init_safe_interp(void)
         */
        "require Safe; SPI::bootstrap();"
        "sub ::mksafefunc { my $x = new Safe; $x->permit_only(':default');$x->permit(':base_math');"
-       "$x->share(qw[&elog &DEBUG &NOTICE &NOIND &ERROR]);"
+       "$x->share(qw[&elog &DEBUG &NOTICE &ERROR]);"
        " return $x->reval(qq[sub { $_[0] }]); }"
    };
 
@@ -1192,8 +1192,6 @@ plperl_elog(ClientData cdata, Tcl_Interp *interp,
        level = FATAL;
    else if (strcmp(argv[1], "DEBUG") == 0)
        level = DEBUG;
-   else if (strcmp(argv[1], "NOIND") == 0)
-       level = NOIND;
    else
    {
        Tcl_AppendResult(interp, "Unknown elog level '", argv[1],

diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index 30985a434c1a93be4b55f78a99506f4894b457b4..0f847a61bfed7dacf59122d3789ed433ee6148c4 100644 (file)
--- 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.36 2001/06/01 18:17:44 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.37 2001/06/09 02:19:07 tgl Exp $
  *
  **********************************************************************/
 
@@ -1295,8 +1295,6 @@ pltcl_elog(ClientData cdata, Tcl_Interp *interp,
        level = FATAL;
    else if (strcmp(argv[1], "DEBUG") == 0)
        level = DEBUG;
-   else if (strcmp(argv[1], "NOIND") == 0)
-       level = NOIND;
    else
    {
        Tcl_AppendResult(interp, "Unknown elog level '", argv[1],

diff --git a/src/pl/tcl/pltcl_guide.nr b/src/pl/tcl/pltcl_guide.nr
index 6fcd155a4035ecaa13866c837efee7d57a39bdc1..aa718d2776b9d85703aae8ce31189e58fdfb4485 100644 (file)
--- a/src/pl/tcl/pltcl_guide.nr
+++ b/src/pl/tcl/pltcl_guide.nr
@@ -268,7 +268,7 @@ the body of a PL/Tcl procedure:
 elog level msg
 .br
 Fire a log message. Possible levels are NOTICE, WARN, ERROR, 
-FATAL, DEBUG and NOIND
+FATAL, and DEBUG
 like for the elog() C function.
 
 .ti -4