diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index b3836e0191d204410a653b2545918b22c1496203..444b544160ee5f4b60bd7f5018d4c35ef5ecb1c3 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.72 1999/05/03 19:09:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.73 1999/05/11 03:28:42 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -3715,10 +3715,10 @@ a_expr:  attr opt_indirection
 		| a_expr '>' a_expr
 				{	$$ = makeA_Expr(OP, ">", $1, $3); }
 
-		/* We allow this for standards-broken SQL products, like MS stuff */
   		| a_expr '=' NULL_P
   				{	$$ = makeA_Expr(ISNULL, NULL, $1, NULL); }
-  		| NULL_P '=' a_expr /* we need to fix the shift/reduce */
+		/* We allow this for standards-broken SQL products, like MS stuff */
+  		| NULL_P '=' a_expr
   				{	$$ = makeA_Expr(ISNULL, NULL, $3, NULL); }
 
 		| a_expr '=' a_expr
diff --git a/src/pl/plpgsql/src/mklang.sql.in b/src/pl/plpgsql/src/mklang.sql.in
index 1c4a70deb09d874457e7251a051a1726a0617efa..006f548337a6a5e68651533adaa22d9026652f95 100644
--- a/src/pl/plpgsql/src/mklang.sql.in
+++ b/src/pl/plpgsql/src/mklang.sql.in
@@ -1,11 +1,11 @@
 --
 -- PL/pgSQL language declaration
 --
--- $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/mklang.sql.in,v 1.1 1998/10/12 04:55:03 momjian Exp $
+-- $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/mklang.sql.in,v 1.2 1999/05/11 03:28:43 momjian Exp $
 --
 
 create function plpgsql_call_handler() returns opaque
-	as '@libdir@/plpgsql.so'
+	as @libdir@ '/plpgsql.so'
 	language 'C';
 
 create trusted procedural language 'plpgsql'