diff --git a/doc/TODO b/doc/TODO
index 83fd3525be7b955891410069806cd33e674df88c..f4845bce71b798a75698790b7a8fae3739b0d0ef 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,6 +1,6 @@
 TODO list for PostgreSQL
 ========================
-Last updated:		Fri Sep 17 21:33:48 EDT 1999
+Last updated:		Sat Sep 18 16:37:37 EDT 1999
 
 Current maintainer:	Bruce Momjian (maillist@candle.pha.pa.us)
 
@@ -180,7 +180,7 @@ MISC
 * Do autocommit so always in a transaction block
 * Show location of syntax error in query
 * Redesign the function call interface to handle NULLs better(Jan)
-* Document/trigger/rule so changes to pg_shadow create pg_pwd
+* Document/trigger/rule so changes to pg_shadow recreate pg_pwd
 * Missing optimizer selectivities for date, r-tree, etc.
 * Overhaul mdmgr/smgr to fix double unlinking and double opens, cleanup
 * Overhaul bufmgr/lockmgr/transaction manager
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 75aad7a8218c6d7ea975ee9e857ad310aa3b1a17..ae6bf326c52caeaabd0bf280897d13f3e96a536c 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -3,7 +3,7 @@
  *			  procedural language
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.8 1999/07/15 15:21:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.9 1999/09/20 02:12:31 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -67,9 +67,11 @@
  * ----------
  */
 extern PLPGSQL_YYSTYPE plpgsql_yylval;
-extern int	plpgsql_yylineno;
 extern char plpgsql_yytext[];
 
+/* We have to define this as non-extern somewhere for bsdi  bjm  1999/09/19 */
+int	plpgsql_yylineno;
+
 void		plpgsql_yyerror(const char *s);
 
 /* ----------