radar10567575.patch   [plain text]


--- postgresql-9.1.2/contrib/cube/cubeparse.c	2011-12-01 14:10:00.000000000 -0800
+++ postgresql/contrib/cube/cubeparse.c	2012-01-06 14:51:57.000000000 -0800
@@ -1,23 +1,24 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
+
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -28,7 +29,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -46,7 +47,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -54,28 +55,45 @@
 /* Pure parsers.  */
 #define YYPURE 0
 
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
-#define yyparse         cube_yyparse
-#define yylex           cube_yylex
-#define yyerror         cube_yyerror
-#define yylval          cube_yylval
-#define yychar          cube_yychar
-#define yydebug         cube_yydebug
-#define yynerrs         cube_yynerrs
+#define yyparse cube_yyparse
+#define yylex   cube_yylex
+#define yyerror cube_yyerror
+#define yylval  cube_yylval
+#define yychar  cube_yychar
+#define yydebug cube_yydebug
+#define yynerrs cube_yynerrs
 
 
-/* Copy the first part of user declarations.  */
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     CUBEFLOAT = 258,
+     O_PAREN = 259,
+     C_PAREN = 260,
+     O_BRACKET = 261,
+     C_BRACKET = 262,
+     COMMA = 263
+   };
+#endif
+/* Tokens.  */
+#define CUBEFLOAT 258
+#define O_PAREN 259
+#define C_PAREN 260
+#define O_BRACKET 261
+#define C_BRACKET 262
+#define COMMA 263
+
 
-/* Line 189 of yacc.c  */
+
+
+/* Copy the first part of user declarations.  */
 #line 1 "cubeparse.y"
 
 /* NdBox = [(lowerleft),(upperright)] */
@@ -116,9 +134,6 @@
 
 
 
-/* Line 189 of yacc.c  */
-#line 121 "cubeparse.c"
-
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -137,37 +152,20 @@
 # define YYTOKEN_TABLE 0
 #endif
 
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     CUBEFLOAT = 258,
-     O_PAREN = 259,
-     C_PAREN = 260,
-     O_BRACKET = 261,
-     C_BRACKET = 262,
-     COMMA = 263
-   };
-#endif
-
-
-
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
+
 /* Copy the second part of user declarations.  */
 
 
-/* Line 264 of yacc.c  */
-#line 171 "cubeparse.c"
+/* Line 216 of yacc.c.  */
+#line 169 "cubeparse.tab.c"
 
 #ifdef short
 # undef short
@@ -217,7 +215,7 @@
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -242,14 +240,14 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int yyi)
+YYID (int i)
 #else
 static int
-YYID (yyi)
-    int yyi;
+YYID (i)
+    int i;
 #endif
 {
-  return yyi;
+  return i;
 }
 #endif
 
@@ -330,9 +328,9 @@
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-};
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -366,12 +364,12 @@
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+# define YYSTACK_RELOCATE(Stack)					\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -613,7 +611,7 @@
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -724,20 +722,17 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
 
@@ -771,11 +766,11 @@
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       		       );
-      YYFPRINTF (stderr, "\n");
+      fprintf (stderr, "\n");
     }
 }
 
@@ -1055,8 +1050,10 @@
 	break;
     }
 }
+
 
 /* Prevent warnings from -Wmissing-prototypes.  */
+
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
@@ -1072,10 +1069,11 @@
 #endif /* ! YYPARSE_PARAM */
 
 
-/* The lookahead symbol.  */
+
+/* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -1083,9 +1081,9 @@
 
 
 
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+/*----------.
+| yyparse.  |
+`----------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1109,39 +1107,14 @@
 #endif
 #endif
 {
-
-
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-
-       Refer to the stacks thru separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    YYSIZE_T yystacksize;
-
+  
+  int yystate;
   int yyn;
   int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
@@ -1149,28 +1122,51 @@
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
+
   yyssp = yyss;
   yyvsp = yyvs;
 
@@ -1200,6 +1196,7 @@
 	YYSTYPE *yyvs1 = yyvs;
 	yytype_int16 *yyss1 = yyss;
 
+
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
@@ -1207,6 +1204,7 @@
 	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
+
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -1229,8 +1227,9 @@
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -1241,6 +1240,7 @@
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
+
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -1250,9 +1250,6 @@
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
   goto yybackup;
 
 /*-----------.
@@ -1261,16 +1258,16 @@
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
+     look-ahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1302,16 +1299,20 @@
       goto yyreduce;
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the lookahead token.  */
+  /* Shift the look-ahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
 
   yystate = yyn;
   *++yyvsp = yylval;
@@ -1351,8 +1352,6 @@
   switch (yyn)
     {
         case 2:
-
-/* Line 1455 of yacc.c  */
 #line 51 "cubeparse.y"
     {
 
@@ -1382,8 +1381,6 @@
     break;
 
   case 3:
-
-/* Line 1455 of yacc.c  */
 #line 77 "cubeparse.y"
     {
 	    int dim;
@@ -1412,8 +1409,6 @@
     break;
 
   case 4:
-
-/* Line 1455 of yacc.c  */
 #line 103 "cubeparse.y"
     {
             int dim;
@@ -1433,8 +1428,6 @@
     break;
 
   case 5:
-
-/* Line 1455 of yacc.c  */
 #line 121 "cubeparse.y"
     {
             int dim;
@@ -1453,8 +1446,6 @@
     break;
 
   case 6:
-
-/* Line 1455 of yacc.c  */
 #line 138 "cubeparse.y"
     {
              (yyval) = (yyvsp[(2) - (3)]);
@@ -1462,8 +1453,6 @@
     break;
 
   case 7:
-
-/* Line 1455 of yacc.c  */
 #line 144 "cubeparse.y"
     {
 			 /* alloc enough space to be sure whole list will fit */
@@ -1473,8 +1462,6 @@
     break;
 
   case 8:
-
-/* Line 1455 of yacc.c  */
 #line 150 "cubeparse.y"
     {
              (yyval) = (yyvsp[(1) - (3)]);
@@ -1484,9 +1471,8 @@
     break;
 
 
-
-/* Line 1455 of yacc.c  */
-#line 1490 "cubeparse.c"
+/* Line 1267 of yacc.c.  */
+#line 1476 "cubeparse.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1497,6 +1483,7 @@
 
   *++yyvsp = yyval;
 
+
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -1561,7 +1548,7 @@
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
@@ -1578,7 +1565,7 @@
 	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -1635,6 +1622,9 @@
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   *++yyvsp = yylval;
 
 
@@ -1659,7 +1649,7 @@
   yyresult = 1;
   goto yyreturn;
 
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -1670,7 +1660,7 @@
 #endif
 
 yyreturn:
-  if (yychar != YYEMPTY)
+  if (yychar != YYEOF && yychar != YYEMPTY)
      yydestruct ("Cleanup: discarding lookahead",
 		 yytoken, &yylval);
   /* Do not reclaim the symbols of the rule which action triggered
@@ -1696,8 +1686,6 @@
 }
 
 
-
-/* Line 1675 of yacc.c  */
 #line 157 "cubeparse.y"
 
 
--- postgresql-9.1.2/contrib/seg/segparse.c	2011-12-01 14:10:01.000000000 -0800
+++ postgresql/contrib/seg/segparse.c	2012-01-06 14:54:12.000000000 -0800
@@ -1,23 +1,24 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
+
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -28,7 +29,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -46,7 +47,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -54,28 +55,41 @@
 /* Pure parsers.  */
 #define YYPURE 0
 
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
-#define yyparse         seg_yyparse
-#define yylex           seg_yylex
-#define yyerror         seg_yyerror
-#define yylval          seg_yylval
-#define yychar          seg_yychar
-#define yydebug         seg_yydebug
-#define yynerrs         seg_yynerrs
+#define yyparse seg_yyparse
+#define yylex   seg_yylex
+#define yyerror seg_yyerror
+#define yylval  seg_yylval
+#define yychar  seg_yychar
+#define yydebug seg_yydebug
+#define yynerrs seg_yynerrs
 
 
-/* Copy the first part of user declarations.  */
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     SEGFLOAT = 258,
+     RANGE = 259,
+     PLUMIN = 260,
+     EXTENSION = 261
+   };
+#endif
+/* Tokens.  */
+#define SEGFLOAT 258
+#define RANGE 259
+#define PLUMIN 260
+#define EXTENSION 261
+
 
-/* Line 189 of yacc.c  */
+
+
+/* Copy the first part of user declarations.  */
 #line 1 "segparse.y"
 
 #define YYPARSE_PARAM result  /* need this to pass a pointer (void *) to yyparse */
@@ -118,9 +132,6 @@
 
 
 
-/* Line 189 of yacc.c  */
-#line 123 "segparse.c"
-
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -139,52 +150,32 @@
 # define YYTOKEN_TABLE 0
 #endif
 
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     SEGFLOAT = 258,
-     RANGE = 259,
-     PLUMIN = 260,
-     EXTENSION = 261
-   };
-#endif
-
-
-
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-{
-
-/* Line 214 of yacc.c  */
 #line 46 "segparse.y"
-
+{
   struct BND {
     float val;
     char  ext;
     char  sigd;
   } bnd;
   char * text;
-
-
-
-/* Line 214 of yacc.c  */
-#line 176 "segparse.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 193 of yacc.c.  */
+#line 166 "segparse.tab.c"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
+
 /* Copy the second part of user declarations.  */
 
 
-/* Line 264 of yacc.c  */
-#line 188 "segparse.c"
+/* Line 216 of yacc.c.  */
+#line 179 "segparse.tab.c"
 
 #ifdef short
 # undef short
@@ -234,7 +225,7 @@
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -259,14 +250,14 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int yyi)
+YYID (int i)
 #else
 static int
-YYID (yyi)
-    int yyi;
+YYID (i)
+    int i;
 #endif
 {
-  return yyi;
+  return i;
 }
 #endif
 
@@ -347,9 +338,9 @@
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-};
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -383,12 +374,12 @@
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+# define YYSTACK_RELOCATE(Stack)					\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -629,7 +620,7 @@
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -740,20 +731,17 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
 
@@ -787,11 +775,11 @@
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       		       );
-      YYFPRINTF (stderr, "\n");
+      fprintf (stderr, "\n");
     }
 }
 
@@ -1071,8 +1059,10 @@
 	break;
     }
 }
+
 
 /* Prevent warnings from -Wmissing-prototypes.  */
+
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
@@ -1088,10 +1078,11 @@
 #endif /* ! YYPARSE_PARAM */
 
 
-/* The lookahead symbol.  */
+
+/* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -1099,9 +1090,9 @@
 
 
 
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+/*----------.
+| yyparse.  |
+`----------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1125,39 +1116,14 @@
 #endif
 #endif
 {
-
-
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-
-       Refer to the stacks thru separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    YYSIZE_T yystacksize;
-
+  
+  int yystate;
   int yyn;
   int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
@@ -1165,28 +1131,51 @@
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
+
   yyssp = yyss;
   yyvsp = yyvs;
 
@@ -1216,6 +1205,7 @@
 	YYSTYPE *yyvs1 = yyvs;
 	yytype_int16 *yyss1 = yyss;
 
+
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
@@ -1223,6 +1213,7 @@
 	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
+
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -1245,8 +1236,9 @@
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -1257,6 +1249,7 @@
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
+
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -1266,9 +1259,6 @@
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
   goto yybackup;
 
 /*-----------.
@@ -1277,16 +1267,16 @@
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
+     look-ahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1318,16 +1308,20 @@
       goto yyreduce;
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the lookahead token.  */
+  /* Shift the look-ahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
 
   yystate = yyn;
   *++yyvsp = yylval;
@@ -1367,8 +1361,6 @@
   switch (yyn)
     {
         case 2:
-
-/* Line 1455 of yacc.c  */
 #line 67 "segparse.y"
     {
 	    ((SEG *)result)->lower = (yyvsp[(1) - (3)].bnd).val - (yyvsp[(3) - (3)].bnd).val;
@@ -1383,8 +1375,6 @@
     break;
 
   case 3:
-
-/* Line 1455 of yacc.c  */
 #line 78 "segparse.y"
     {
 	    ((SEG *)result)->lower = (yyvsp[(1) - (3)].bnd).val;
@@ -1405,8 +1395,6 @@
     break;
 
   case 4:
-
-/* Line 1455 of yacc.c  */
 #line 95 "segparse.y"
     {
 	    ((SEG *)result)->lower = (yyvsp[(1) - (2)].bnd).val;
@@ -1419,8 +1407,6 @@
     break;
 
   case 5:
-
-/* Line 1455 of yacc.c  */
 #line 104 "segparse.y"
     {
 	    ((SEG *)result)->lower = -HUGE_VAL;
@@ -1433,8 +1419,6 @@
     break;
 
   case 6:
-
-/* Line 1455 of yacc.c  */
 #line 113 "segparse.y"
     {
 	    ((SEG *)result)->lower = ((SEG *)result)->upper = (yyvsp[(1) - (1)].bnd).val;
@@ -1444,8 +1428,6 @@
     break;
 
   case 7:
-
-/* Line 1455 of yacc.c  */
 #line 121 "segparse.y"
     {
 			/* temp variable avoids a gcc 3.3.x bug on Sparc64 */
@@ -1458,8 +1440,6 @@
     break;
 
   case 8:
-
-/* Line 1455 of yacc.c  */
 #line 130 "segparse.y"
     {
 			/* temp variable avoids a gcc 3.3.x bug on Sparc64 */
@@ -1472,8 +1452,6 @@
     break;
 
   case 9:
-
-/* Line 1455 of yacc.c  */
 #line 141 "segparse.y"
     {
 			/* temp variable avoids a gcc 3.3.x bug on Sparc64 */
@@ -1486,9 +1464,8 @@
     break;
 
 
-
-/* Line 1455 of yacc.c  */
-#line 1492 "segparse.c"
+/* Line 1267 of yacc.c.  */
+#line 1469 "segparse.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1499,6 +1476,7 @@
 
   *++yyvsp = yyval;
 
+
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -1563,7 +1541,7 @@
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
@@ -1580,7 +1558,7 @@
 	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -1637,6 +1615,9 @@
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   *++yyvsp = yylval;
 
 
@@ -1661,7 +1642,7 @@
   yyresult = 1;
   goto yyreturn;
 
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -1672,7 +1653,7 @@
 #endif
 
 yyreturn:
-  if (yychar != YYEMPTY)
+  if (yychar != YYEOF && yychar != YYEMPTY)
      yydestruct ("Cleanup: discarding lookahead",
 		 yytoken, &yylval);
   /* Do not reclaim the symbols of the rule which action triggered
@@ -1698,8 +1679,6 @@
 }
 
 
-
-/* Line 1675 of yacc.c  */
 #line 151 "segparse.y"
 
 
--- postgresql-9.1.2/src/backend/bootstrap/bootparse.c	2011-12-01 14:09:58.000000000 -0800
+++ postgresql/src/backend/bootstrap/bootparse.c	2012-01-06 14:57:38.000000000 -0800
@@ -1,23 +1,24 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
+
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -28,7 +29,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -46,7 +47,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -54,28 +55,85 @@
 /* Pure parsers.  */
 #define YYPURE 0
 
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
-#define yyparse         boot_yyparse
-#define yylex           boot_yylex
-#define yyerror         boot_yyerror
-#define yylval          boot_yylval
-#define yychar          boot_yychar
-#define yydebug         boot_yydebug
-#define yynerrs         boot_yynerrs
+#define yyparse boot_yyparse
+#define yylex   boot_yylex
+#define yyerror boot_yyerror
+#define yylval  boot_yylval
+#define yychar  boot_yychar
+#define yydebug boot_yydebug
+#define yynerrs boot_yynerrs
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     CONST_P = 258,
+     ID = 259,
+     OPEN = 260,
+     XCLOSE = 261,
+     XCREATE = 262,
+     INSERT_TUPLE = 263,
+     XDECLARE = 264,
+     INDEX = 265,
+     ON = 266,
+     USING = 267,
+     XBUILD = 268,
+     INDICES = 269,
+     UNIQUE = 270,
+     XTOAST = 271,
+     COMMA = 272,
+     EQUALS = 273,
+     LPAREN = 274,
+     RPAREN = 275,
+     OBJ_ID = 276,
+     XBOOTSTRAP = 277,
+     XSHARED_RELATION = 278,
+     XWITHOUT_OIDS = 279,
+     XROWTYPE_OID = 280,
+     NULLVAL = 281,
+     low = 282,
+     high = 283
+   };
+#endif
+/* Tokens.  */
+#define CONST_P 258
+#define ID 259
+#define OPEN 260
+#define XCLOSE 261
+#define XCREATE 262
+#define INSERT_TUPLE 263
+#define XDECLARE 264
+#define INDEX 265
+#define ON 266
+#define USING 267
+#define XBUILD 268
+#define INDICES 269
+#define UNIQUE 270
+#define XTOAST 271
+#define COMMA 272
+#define EQUALS 273
+#define LPAREN 274
+#define RPAREN 275
+#define OBJ_ID 276
+#define XBOOTSTRAP 277
+#define XSHARED_RELATION 278
+#define XWITHOUT_OIDS 279
+#define XROWTYPE_OID 280
+#define NULLVAL 281
+#define low 282
+#define high 283
 
 
-/* Copy the first part of user declarations.  */
 
-/* Line 189 of yacc.c  */
+
+/* Copy the first part of user declarations.  */
 #line 1 "bootparse.y"
 
 /*-------------------------------------------------------------------------
@@ -170,9 +228,6 @@
 
 
 
-/* Line 189 of yacc.c  */
-#line 175 "bootparse.c"
-
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -191,73 +246,31 @@
 # define YYTOKEN_TABLE 0
 #endif
 
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     CONST_P = 258,
-     ID = 259,
-     OPEN = 260,
-     XCLOSE = 261,
-     XCREATE = 262,
-     INSERT_TUPLE = 263,
-     XDECLARE = 264,
-     INDEX = 265,
-     ON = 266,
-     USING = 267,
-     XBUILD = 268,
-     INDICES = 269,
-     UNIQUE = 270,
-     XTOAST = 271,
-     COMMA = 272,
-     EQUALS = 273,
-     LPAREN = 274,
-     RPAREN = 275,
-     OBJ_ID = 276,
-     XBOOTSTRAP = 277,
-     XSHARED_RELATION = 278,
-     XWITHOUT_OIDS = 279,
-     XROWTYPE_OID = 280,
-     NULLVAL = 281,
-     low = 282,
-     high = 283
-   };
-#endif
-
-
-
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-{
-
-/* Line 214 of yacc.c  */
 #line 98 "bootparse.y"
-
+{
 	List		*list;
 	IndexElem	*ielem;
 	char		*str;
 	int			ival;
 	Oid			oidval;
-
-
-
-/* Line 214 of yacc.c  */
-#line 249 "bootparse.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 193 of yacc.c.  */
+#line 261 "bootparse.c"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
+
 /* Copy the second part of user declarations.  */
 
 
-/* Line 264 of yacc.c  */
-#line 261 "bootparse.c"
+/* Line 216 of yacc.c.  */
+#line 274 "bootparse.c"
 
 #ifdef short
 # undef short
@@ -307,7 +320,7 @@
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -332,14 +345,14 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int yyi)
+YYID (int i)
 #else
 static int
-YYID (yyi)
-    int yyi;
+YYID (i)
+    int i;
 #endif
 {
-  return yyi;
+  return i;
 }
 #endif
 
@@ -420,9 +433,9 @@
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-};
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -456,12 +469,12 @@
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+# define YYSTACK_RELOCATE(Stack)					\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -581,7 +594,7 @@
   "OBJ_ID", "XBOOTSTRAP", "XSHARED_RELATION", "XWITHOUT_OIDS",
   "XROWTYPE_OID", "NULLVAL", "low", "high", "$accept", "TopLevel",
   "Boot_Queries", "Boot_Query", "Boot_OpenStmt", "Boot_CloseStmt",
-  "Boot_CreateStmt", "$@1", "$@2", "Boot_InsertStmt", "$@3",
+  "Boot_CreateStmt", "@1", "@2", "Boot_InsertStmt", "@3",
   "Boot_DeclareIndexStmt", "Boot_DeclareUniqueIndexStmt",
   "Boot_DeclareToastStmt", "Boot_BuildIndsStmt", "boot_index_params",
   "boot_index_param", "optbootstrap", "optsharedrelation",
@@ -792,7 +805,7 @@
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -903,20 +916,17 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
 
@@ -950,11 +960,11 @@
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       		       );
-      YYFPRINTF (stderr, "\n");
+      fprintf (stderr, "\n");
     }
 }
 
@@ -1234,8 +1244,10 @@
 	break;
     }
 }
+
 
 /* Prevent warnings from -Wmissing-prototypes.  */
+
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
@@ -1251,10 +1263,11 @@
 #endif /* ! YYPARSE_PARAM */
 
 
-/* The lookahead symbol.  */
+
+/* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -1262,9 +1275,9 @@
 
 
 
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+/*----------.
+| yyparse.  |
+`----------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1288,39 +1301,14 @@
 #endif
 #endif
 {
-
-
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-
-       Refer to the stacks thru separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    YYSIZE_T yystacksize;
-
+  
+  int yystate;
   int yyn;
   int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
@@ -1328,28 +1316,51 @@
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
+
   yyssp = yyss;
   yyvsp = yyvs;
 
@@ -1379,6 +1390,7 @@
 	YYSTYPE *yyvs1 = yyvs;
 	yytype_int16 *yyss1 = yyss;
 
+
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
@@ -1386,6 +1398,7 @@
 	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
+
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -1408,8 +1421,9 @@
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -1420,6 +1434,7 @@
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
+
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -1429,9 +1444,6 @@
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
   goto yybackup;
 
 /*-----------.
@@ -1440,16 +1452,16 @@
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
+     look-ahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1481,16 +1493,20 @@
       goto yyreduce;
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the lookahead token.  */
+  /* Shift the look-ahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
 
   yystate = yyn;
   *++yyvsp = yylval;
@@ -1530,8 +1546,6 @@
   switch (yyn)
     {
         case 14:
-
-/* Line 1455 of yacc.c  */
 #line 148 "bootparse.y"
     {
 					do_start();
@@ -1541,8 +1555,6 @@
     break;
 
   case 15:
-
-/* Line 1455 of yacc.c  */
 #line 157 "bootparse.y"
     {
 					do_start();
@@ -1552,8 +1564,6 @@
     break;
 
   case 16:
-
-/* Line 1455 of yacc.c  */
 #line 163 "bootparse.y"
     {
 					do_start();
@@ -1563,8 +1573,6 @@
     break;
 
   case 17:
-
-/* Line 1455 of yacc.c  */
 #line 172 "bootparse.y"
     {
 					do_start();
@@ -1578,8 +1586,6 @@
     break;
 
   case 18:
-
-/* Line 1455 of yacc.c  */
 #line 182 "bootparse.y"
     {
 					do_end();
@@ -1587,8 +1593,6 @@
     break;
 
   case 19:
-
-/* Line 1455 of yacc.c  */
 #line 186 "bootparse.y"
     {
 					TupleDesc tupdesc;
@@ -1662,8 +1666,6 @@
     break;
 
   case 20:
-
-/* Line 1455 of yacc.c  */
 #line 259 "bootparse.y"
     {
 					do_start();
@@ -1676,8 +1678,6 @@
     break;
 
   case 21:
-
-/* Line 1455 of yacc.c  */
 #line 268 "bootparse.y"
     {
 					if (num_columns_read != numattr)
@@ -1691,8 +1691,6 @@
     break;
 
   case 22:
-
-/* Line 1455 of yacc.c  */
 #line 281 "bootparse.y"
     {
 					do_start();
@@ -1711,8 +1709,6 @@
     break;
 
   case 23:
-
-/* Line 1455 of yacc.c  */
 #line 299 "bootparse.y"
     {
 					do_start();
@@ -1731,8 +1727,6 @@
     break;
 
   case 24:
-
-/* Line 1455 of yacc.c  */
 #line 317 "bootparse.y"
     {
 					do_start();
@@ -1743,8 +1737,6 @@
     break;
 
   case 25:
-
-/* Line 1455 of yacc.c  */
 #line 327 "bootparse.y"
     {
 					do_start();
@@ -1754,22 +1746,16 @@
     break;
 
   case 26:
-
-/* Line 1455 of yacc.c  */
 #line 336 "bootparse.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].ielem)); ;}
     break;
 
   case 27:
-
-/* Line 1455 of yacc.c  */
 #line 337 "bootparse.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].ielem)); ;}
     break;
 
   case 28:
-
-/* Line 1455 of yacc.c  */
 #line 342 "bootparse.y"
     {
 					IndexElem *n = makeNode(IndexElem);
@@ -1785,64 +1771,46 @@
     break;
 
   case 29:
-
-/* Line 1455 of yacc.c  */
 #line 356 "bootparse.y"
     { (yyval.ival) = 1; ;}
     break;
 
   case 30:
-
-/* Line 1455 of yacc.c  */
 #line 357 "bootparse.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 31:
-
-/* Line 1455 of yacc.c  */
 #line 361 "bootparse.y"
     { (yyval.ival) = 1; ;}
     break;
 
   case 32:
-
-/* Line 1455 of yacc.c  */
 #line 362 "bootparse.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 33:
-
-/* Line 1455 of yacc.c  */
 #line 366 "bootparse.y"
     { (yyval.ival) = 1; ;}
     break;
 
   case 34:
-
-/* Line 1455 of yacc.c  */
 #line 367 "bootparse.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 35:
-
-/* Line 1455 of yacc.c  */
 #line 371 "bootparse.y"
     { (yyval.oidval) = (yyvsp[(2) - (2)].oidval); ;}
     break;
 
   case 36:
-
-/* Line 1455 of yacc.c  */
 #line 372 "bootparse.y"
     { (yyval.oidval) = InvalidOid; ;}
     break;
 
   case 39:
-
-/* Line 1455 of yacc.c  */
 #line 382 "bootparse.y"
     {
 				   if (++numattr > MAXATTR)
@@ -1852,65 +1820,48 @@
     break;
 
   case 40:
-
-/* Line 1455 of yacc.c  */
 #line 390 "bootparse.y"
     { (yyval.oidval) = atooid((yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 41:
-
-/* Line 1455 of yacc.c  */
 #line 394 "bootparse.y"
     { (yyval.oidval) = (yyvsp[(3) - (3)].oidval); ;}
     break;
 
   case 42:
-
-/* Line 1455 of yacc.c  */
 #line 395 "bootparse.y"
     { (yyval.oidval) = InvalidOid; ;}
     break;
 
   case 46:
-
-/* Line 1455 of yacc.c  */
 #line 406 "bootparse.y"
     { InsertOneValue((yyvsp[(1) - (1)].str), num_columns_read++); ;}
     break;
 
   case 47:
-
-/* Line 1455 of yacc.c  */
 #line 408 "bootparse.y"
     { InsertOneValue((yyvsp[(1) - (1)].str), num_columns_read++); ;}
     break;
 
   case 48:
-
-/* Line 1455 of yacc.c  */
 #line 410 "bootparse.y"
     { InsertOneNull(num_columns_read++); ;}
     break;
 
   case 49:
-
-/* Line 1455 of yacc.c  */
 #line 414 "bootparse.y"
     { (yyval.str) = yylval.str; ;}
     break;
 
   case 50:
-
-/* Line 1455 of yacc.c  */
 #line 418 "bootparse.y"
     { (yyval.str) = yylval.str; ;}
     break;
 
 
-
-/* Line 1455 of yacc.c  */
-#line 1914 "bootparse.c"
+/* Line 1267 of yacc.c.  */
+#line 1865 "bootparse.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1921,6 +1872,7 @@
 
   *++yyvsp = yyval;
 
+
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -1985,7 +1937,7 @@
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
@@ -2002,7 +1954,7 @@
 	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -2059,6 +2011,9 @@
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   *++yyvsp = yylval;
 
 
@@ -2083,7 +2038,7 @@
   yyresult = 1;
   goto yyreturn;
 
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -2094,7 +2049,7 @@
 #endif
 
 yyreturn:
-  if (yychar != YYEMPTY)
+  if (yychar != YYEOF && yychar != YYEMPTY)
      yydestruct ("Cleanup: discarding lookahead",
 		 yytoken, &yylval);
   /* Do not reclaim the symbols of the rule which action triggered
@@ -2120,8 +2075,6 @@
 }
 
 
-
-/* Line 1675 of yacc.c  */
 #line 420 "bootparse.y"
 
 
--- postgresql-9.1.2/src/backend/parser/gram.c	2011-12-01 14:09:58.000000000 -0800
+++ postgresql/src/backend/parser/gram.c	2012-01-06 14:58:40.000000000 -0800
@@ -1,23 +1,24 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
+
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -28,7 +29,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -46,7 +47,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -54,200 +55,18 @@
 /* Pure parsers.  */
 #define YYPURE 1
 
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
 /* Substitute the variable and function names.  */
-#define yyparse         base_yyparse
-#define yylex           base_yylex
-#define yyerror         base_yyerror
-#define yylval          base_yylval
-#define yychar          base_yychar
-#define yydebug         base_yydebug
-#define yynerrs         base_yynerrs
-#define yylloc          base_yylloc
-
-/* Copy the first part of user declarations.  */
-
-/* Line 189 of yacc.c  */
-#line 1 "gram.y"
-
-
-/*#define YYDEBUG 1*/
-/*-------------------------------------------------------------------------
- *
- * gram.y
- *	  POSTGRESQL BISON rules/actions
- *
- * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- *
- * IDENTIFICATION
- *	  src/backend/parser/gram.y
- *
- * HISTORY
- *	  AUTHOR			DATE			MAJOR EVENT
- *	  Andrew Yu			Sept, 1994		POSTQUEL to SQL conversion
- *	  Andrew Yu			Oct, 1994		lispy code conversion
- *
- * NOTES
- *	  CAPITALS are used to represent terminal symbols.
- *	  non-capitals are used to represent non-terminals.
- *	  SQL92-specific syntax is separated from plain SQL/Postgres syntax
- *	  to help isolate the non-extensible portions of the parser.
- *
- *	  In general, nothing in this file should initiate database accesses
- *	  nor depend on changeable state (such as SET variables).  If you do
- *	  database accesses, your code will fail when we have aborted the
- *	  current transaction and are just parsing commands to find the next
- *	  ROLLBACK or COMMIT.  If you make use of SET variables, then you
- *	  will do the wrong thing in multi-query strings like this:
- *			SET SQL_inheritance TO off; SELECT * FROM foo;
- *	  because the entire string is parsed by gram.y before the SET gets
- *	  executed.  Anything that depends on the database or changeable state
- *	  should be handled during parse analysis so that it happens at the
- *	  right time not the wrong time.  The handling of SQL_inheritance is
- *	  a good example.
- *
- * WARNINGS
- *	  If you use a list, make sure the datum is a node so that the printing
- *	  routines work.
- *
- *	  Sometimes we assign constants to makeStrings. Make sure we don't free
- *	  those.
- *
- *-------------------------------------------------------------------------
- */
-#include "postgres.h"
-
-#include <ctype.h>
-#include <limits.h>
-
-#include "catalog/index.h"
-#include "catalog/namespace.h"
-#include "catalog/pg_trigger.h"
-#include "commands/defrem.h"
-#include "nodes/makefuncs.h"
-#include "nodes/nodeFuncs.h"
-#include "parser/gramparse.h"
-#include "parser/parser.h"
-#include "storage/lmgr.h"
-#include "utils/date.h"
-#include "utils/datetime.h"
-#include "utils/numeric.h"
-#include "utils/xml.h"
-
-
-/* Location tracking support --- simpler than bison's default */
-#define YYLLOC_DEFAULT(Current, Rhs, N) \
-	do { \
-		if (N) \
-			(Current) = (Rhs)[1]; \
-		else \
-			(Current) = (Rhs)[0]; \
-	} while (0)
-
-/*
- * Bison doesn't allocate anything that needs to live across parser calls,
- * so we can easily have it use palloc instead of malloc.  This prevents
- * memory leaks if we error out during parsing.  Note this only works with
- * bison >= 2.0.  However, in bison 1.875 the default is to use alloca()
- * if possible, so there's not really much problem anyhow, at least if
- * you're building with gcc.
- */
-#define YYMALLOC palloc
-#define YYFREE   pfree
-
-/* Private struct for the result of privilege_target production */
-typedef struct PrivTarget
-{
-	GrantTargetType targtype;
-	GrantObjectType objtype;
-	List	   *objs;
-} PrivTarget;
-
-/* ConstraintAttributeSpec yields an integer bitmask of these flags: */
-#define CAS_NOT_DEFERRABLE			0x01
-#define CAS_DEFERRABLE				0x02
-#define CAS_INITIALLY_IMMEDIATE		0x04
-#define CAS_INITIALLY_DEFERRED		0x08
-#define CAS_NOT_VALID				0x10
-
-
-#define parser_yyerror(msg)  scanner_yyerror(msg, yyscanner)
-#define parser_errposition(pos)  scanner_errposition(pos, yyscanner)
-
-static void base_yyerror(YYLTYPE *yylloc, core_yyscan_t yyscanner,
-						 const char *msg);
-static Node *makeColumnRef(char *colname, List *indirection,
-						   int location, core_yyscan_t yyscanner);
-static Node *makeTypeCast(Node *arg, TypeName *typename, int location);
-static Node *makeStringConst(char *str, int location);
-static Node *makeStringConstCast(char *str, int location, TypeName *typename);
-static Node *makeIntConst(int val, int location);
-static Node *makeFloatConst(char *str, int location);
-static Node *makeBitStringConst(char *str, int location);
-static Node *makeNullAConst(int location);
-static Node *makeAConst(Value *v, int location);
-static Node *makeBoolAConst(bool state, int location);
-static FuncCall *makeOverlaps(List *largs, List *rargs,
-							  int location, core_yyscan_t yyscanner);
-static void check_qualified_name(List *names, core_yyscan_t yyscanner);
-static List *check_func_name(List *names, core_yyscan_t yyscanner);
-static List *check_indirection(List *indirection, core_yyscan_t yyscanner);
-static List *extractArgTypes(List *parameters);
-static SelectStmt *findLeftmostSelect(SelectStmt *node);
-static void insertSelectOptions(SelectStmt *stmt,
-								List *sortClause, List *lockingClause,
-								Node *limitOffset, Node *limitCount,
-								WithClause *withClause,
-								core_yyscan_t yyscanner);
-static Node *makeSetOp(SetOperation op, bool all, Node *larg, Node *rarg);
-static Node *doNegate(Node *n, int location);
-static void doNegateFloat(Value *v);
-static Node *makeAArrayExpr(List *elements, int location);
-static Node *makeXmlExpr(XmlExprOp op, char *name, List *named_args,
-						 List *args, int location);
-static List *mergeTableFuncParameters(List *func_args, List *columns);
-static TypeName *TableFuncTypeName(List *columns);
-static RangeVar *makeRangeVarFromAnyName(List *names, int position, core_yyscan_t yyscanner);
-static void SplitColQualList(List *qualList,
-							 List **constraintList, CollateClause **collClause,
-							 core_yyscan_t yyscanner);
-static void processCASbits(int cas_bits, int location, const char *constrType,
-			   bool *deferrable, bool *initdeferred, bool *not_valid,
-			   core_yyscan_t yyscanner);
-
-
-
-/* Line 189 of yacc.c  */
-#line 232 "gram.c"
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
+#define yyparse base_yyparse
+#define yylex   base_yylex
+#define yyerror base_yyerror
+#define yylval  base_yylval
+#define yychar  base_yychar
+#define yydebug base_yydebug
+#define yynerrs base_yynerrs
+#define yylloc base_yylloc
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -666,16 +485,594 @@
      UMINUS = 666
    };
 #endif
+/* Tokens.  */
+#define IDENT 258
+#define FCONST 259
+#define SCONST 260
+#define BCONST 261
+#define XCONST 262
+#define Op 263
+#define ICONST 264
+#define PARAM 265
+#define TYPECAST 266
+#define DOT_DOT 267
+#define COLON_EQUALS 268
+#define ABORT_P 269
+#define ABSOLUTE_P 270
+#define ACCESS 271
+#define ACTION 272
+#define ADD_P 273
+#define ADMIN 274
+#define AFTER 275
+#define AGGREGATE 276
+#define ALL 277
+#define ALSO 278
+#define ALTER 279
+#define ALWAYS 280
+#define ANALYSE 281
+#define ANALYZE 282
+#define AND 283
+#define ANY 284
+#define ARRAY 285
+#define AS 286
+#define ASC 287
+#define ASSERTION 288
+#define ASSIGNMENT 289
+#define ASYMMETRIC 290
+#define AT 291
+#define ATTRIBUTE 292
+#define AUTHORIZATION 293
+#define BACKWARD 294
+#define BEFORE 295
+#define BEGIN_P 296
+#define BETWEEN 297
+#define BIGINT 298
+#define BINARY 299
+#define BIT 300
+#define BOOLEAN_P 301
+#define BOTH 302
+#define BY 303
+#define CACHE 304
+#define CALLED 305
+#define CASCADE 306
+#define CASCADED 307
+#define CASE 308
+#define CAST 309
+#define CATALOG_P 310
+#define CHAIN 311
+#define CHAR_P 312
+#define CHARACTER 313
+#define CHARACTERISTICS 314
+#define CHECK 315
+#define CHECKPOINT 316
+#define CLASS 317
+#define CLOSE 318
+#define CLUSTER 319
+#define COALESCE 320
+#define COLLATE 321
+#define COLLATION 322
+#define COLUMN 323
+#define COMMENT 324
+#define COMMENTS 325
+#define COMMIT 326
+#define COMMITTED 327
+#define CONCURRENTLY 328
+#define CONFIGURATION 329
+#define CONNECTION 330
+#define CONSTRAINT 331
+#define CONSTRAINTS 332
+#define CONTENT_P 333
+#define CONTINUE_P 334
+#define CONVERSION_P 335
+#define COPY 336
+#define COST 337
+#define CREATE 338
+#define CROSS 339
+#define CSV 340
+#define CURRENT_P 341
+#define CURRENT_CATALOG 342
+#define CURRENT_DATE 343
+#define CURRENT_ROLE 344
+#define CURRENT_SCHEMA 345
+#define CURRENT_TIME 346
+#define CURRENT_TIMESTAMP 347
+#define CURRENT_USER 348
+#define CURSOR 349
+#define CYCLE 350
+#define DATA_P 351
+#define DATABASE 352
+#define DAY_P 353
+#define DEALLOCATE 354
+#define DEC 355
+#define DECIMAL_P 356
+#define DECLARE 357
+#define DEFAULT 358
+#define DEFAULTS 359
+#define DEFERRABLE 360
+#define DEFERRED 361
+#define DEFINER 362
+#define DELETE_P 363
+#define DELIMITER 364
+#define DELIMITERS 365
+#define DESC 366
+#define DICTIONARY 367
+#define DISABLE_P 368
+#define DISCARD 369
+#define DISTINCT 370
+#define DO 371
+#define DOCUMENT_P 372
+#define DOMAIN_P 373
+#define DOUBLE_P 374
+#define DROP 375
+#define EACH 376
+#define ELSE 377
+#define ENABLE_P 378
+#define ENCODING 379
+#define ENCRYPTED 380
+#define END_P 381
+#define ENUM_P 382
+#define ESCAPE 383
+#define EXCEPT 384
+#define EXCLUDE 385
+#define EXCLUDING 386
+#define EXCLUSIVE 387
+#define EXECUTE 388
+#define EXISTS 389
+#define EXPLAIN 390
+#define EXTENSION 391
+#define EXTERNAL 392
+#define EXTRACT 393
+#define FALSE_P 394
+#define FAMILY 395
+#define FETCH 396
+#define FIRST_P 397
+#define FLOAT_P 398
+#define FOLLOWING 399
+#define FOR 400
+#define FORCE 401
+#define FOREIGN 402
+#define FORWARD 403
+#define FREEZE 404
+#define FROM 405
+#define FULL 406
+#define FUNCTION 407
+#define FUNCTIONS 408
+#define GLOBAL 409
+#define GRANT 410
+#define GRANTED 411
+#define GREATEST 412
+#define GROUP_P 413
+#define HANDLER 414
+#define HAVING 415
+#define HEADER_P 416
+#define HOLD 417
+#define HOUR_P 418
+#define IDENTITY_P 419
+#define IF_P 420
+#define ILIKE 421
+#define IMMEDIATE 422
+#define IMMUTABLE 423
+#define IMPLICIT_P 424
+#define IN_P 425
+#define INCLUDING 426
+#define INCREMENT 427
+#define INDEX 428
+#define INDEXES 429
+#define INHERIT 430
+#define INHERITS 431
+#define INITIALLY 432
+#define INLINE_P 433
+#define INNER_P 434
+#define INOUT 435
+#define INPUT_P 436
+#define INSENSITIVE 437
+#define INSERT 438
+#define INSTEAD 439
+#define INT_P 440
+#define INTEGER 441
+#define INTERSECT 442
+#define INTERVAL 443
+#define INTO 444
+#define INVOKER 445
+#define IS 446
+#define ISNULL 447
+#define ISOLATION 448
+#define JOIN 449
+#define KEY 450
+#define LABEL 451
+#define LANGUAGE 452
+#define LARGE_P 453
+#define LAST_P 454
+#define LC_COLLATE_P 455
+#define LC_CTYPE_P 456
+#define LEADING 457
+#define LEAST 458
+#define LEFT 459
+#define LEVEL 460
+#define LIKE 461
+#define LIMIT 462
+#define LISTEN 463
+#define LOAD 464
+#define LOCAL 465
+#define LOCALTIME 466
+#define LOCALTIMESTAMP 467
+#define LOCATION 468
+#define LOCK_P 469
+#define MAPPING 470
+#define MATCH 471
+#define MAXVALUE 472
+#define MINUTE_P 473
+#define MINVALUE 474
+#define MODE 475
+#define MONTH_P 476
+#define MOVE 477
+#define NAME_P 478
+#define NAMES 479
+#define NATIONAL 480
+#define NATURAL 481
+#define NCHAR 482
+#define NEXT 483
+#define NO 484
+#define NONE 485
+#define NOT 486
+#define NOTHING 487
+#define NOTIFY 488
+#define NOTNULL 489
+#define NOWAIT 490
+#define NULL_P 491
+#define NULLIF 492
+#define NULLS_P 493
+#define NUMERIC 494
+#define OBJECT_P 495
+#define OF 496
+#define OFF 497
+#define OFFSET 498
+#define OIDS 499
+#define ON 500
+#define ONLY 501
+#define OPERATOR 502
+#define OPTION 503
+#define OPTIONS 504
+#define OR 505
+#define ORDER 506
+#define OUT_P 507
+#define OUTER_P 508
+#define OVER 509
+#define OVERLAPS 510
+#define OVERLAY 511
+#define OWNED 512
+#define OWNER 513
+#define PARSER 514
+#define PARTIAL 515
+#define PARTITION 516
+#define PASSING 517
+#define PASSWORD 518
+#define PLACING 519
+#define PLANS 520
+#define POSITION 521
+#define PRECEDING 522
+#define PRECISION 523
+#define PRESERVE 524
+#define PREPARE 525
+#define PREPARED 526
+#define PRIMARY 527
+#define PRIOR 528
+#define PRIVILEGES 529
+#define PROCEDURAL 530
+#define PROCEDURE 531
+#define QUOTE 532
+#define RANGE 533
+#define READ 534
+#define REAL 535
+#define REASSIGN 536
+#define RECHECK 537
+#define RECURSIVE 538
+#define REF 539
+#define REFERENCES 540
+#define REINDEX 541
+#define RELATIVE_P 542
+#define RELEASE 543
+#define RENAME 544
+#define REPEATABLE 545
+#define REPLACE 546
+#define REPLICA 547
+#define RESET 548
+#define RESTART 549
+#define RESTRICT 550
+#define RETURNING 551
+#define RETURNS 552
+#define REVOKE 553
+#define RIGHT 554
+#define ROLE 555
+#define ROLLBACK 556
+#define ROW 557
+#define ROWS 558
+#define RULE 559
+#define SAVEPOINT 560
+#define SCHEMA 561
+#define SCROLL 562
+#define SEARCH 563
+#define SECOND_P 564
+#define SECURITY 565
+#define SELECT 566
+#define SEQUENCE 567
+#define SEQUENCES 568
+#define SERIALIZABLE 569
+#define SERVER 570
+#define SESSION 571
+#define SESSION_USER 572
+#define SET 573
+#define SETOF 574
+#define SHARE 575
+#define SHOW 576
+#define SIMILAR 577
+#define SIMPLE 578
+#define SMALLINT 579
+#define SOME 580
+#define STABLE 581
+#define STANDALONE_P 582
+#define START 583
+#define STATEMENT 584
+#define STATISTICS 585
+#define STDIN 586
+#define STDOUT 587
+#define STORAGE 588
+#define STRICT_P 589
+#define STRIP_P 590
+#define SUBSTRING 591
+#define SYMMETRIC 592
+#define SYSID 593
+#define SYSTEM_P 594
+#define TABLE 595
+#define TABLES 596
+#define TABLESPACE 597
+#define TEMP 598
+#define TEMPLATE 599
+#define TEMPORARY 600
+#define TEXT_P 601
+#define THEN 602
+#define TIME 603
+#define TIMESTAMP 604
+#define TO 605
+#define TRAILING 606
+#define TRANSACTION 607
+#define TREAT 608
+#define TRIGGER 609
+#define TRIM 610
+#define TRUE_P 611
+#define TRUNCATE 612
+#define TRUSTED 613
+#define TYPE_P 614
+#define UNBOUNDED 615
+#define UNCOMMITTED 616
+#define UNENCRYPTED 617
+#define UNION 618
+#define UNIQUE 619
+#define UNKNOWN 620
+#define UNLISTEN 621
+#define UNLOGGED 622
+#define UNTIL 623
+#define UPDATE 624
+#define USER 625
+#define USING 626
+#define VACUUM 627
+#define VALID 628
+#define VALIDATE 629
+#define VALIDATOR 630
+#define VALUE_P 631
+#define VALUES 632
+#define VARCHAR 633
+#define VARIADIC 634
+#define VARYING 635
+#define VERBOSE 636
+#define VERSION_P 637
+#define VIEW 638
+#define VOLATILE 639
+#define WHEN 640
+#define WHERE 641
+#define WHITESPACE_P 642
+#define WINDOW 643
+#define WITH 644
+#define WITHOUT 645
+#define WORK 646
+#define WRAPPER 647
+#define WRITE 648
+#define XML_P 649
+#define XMLATTRIBUTES 650
+#define XMLCONCAT 651
+#define XMLELEMENT 652
+#define XMLEXISTS 653
+#define XMLFOREST 654
+#define XMLPARSE 655
+#define XMLPI 656
+#define XMLROOT 657
+#define XMLSERIALIZE 658
+#define YEAR_P 659
+#define YES_P 660
+#define ZONE 661
+#define NULLS_FIRST 662
+#define NULLS_LAST 663
+#define WITH_TIME 664
+#define POSTFIXOP 665
+#define UMINUS 666
 
 
 
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+
+/* Copy the first part of user declarations.  */
+#line 1 "gram.y"
+
+
+/*#define YYDEBUG 1*/
+/*-------------------------------------------------------------------------
+ *
+ * gram.y
+ *	  POSTGRESQL BISON rules/actions
+ *
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/backend/parser/gram.y
+ *
+ * HISTORY
+ *	  AUTHOR			DATE			MAJOR EVENT
+ *	  Andrew Yu			Sept, 1994		POSTQUEL to SQL conversion
+ *	  Andrew Yu			Oct, 1994		lispy code conversion
+ *
+ * NOTES
+ *	  CAPITALS are used to represent terminal symbols.
+ *	  non-capitals are used to represent non-terminals.
+ *	  SQL92-specific syntax is separated from plain SQL/Postgres syntax
+ *	  to help isolate the non-extensible portions of the parser.
+ *
+ *	  In general, nothing in this file should initiate database accesses
+ *	  nor depend on changeable state (such as SET variables).  If you do
+ *	  database accesses, your code will fail when we have aborted the
+ *	  current transaction and are just parsing commands to find the next
+ *	  ROLLBACK or COMMIT.  If you make use of SET variables, then you
+ *	  will do the wrong thing in multi-query strings like this:
+ *			SET SQL_inheritance TO off; SELECT * FROM foo;
+ *	  because the entire string is parsed by gram.y before the SET gets
+ *	  executed.  Anything that depends on the database or changeable state
+ *	  should be handled during parse analysis so that it happens at the
+ *	  right time not the wrong time.  The handling of SQL_inheritance is
+ *	  a good example.
+ *
+ * WARNINGS
+ *	  If you use a list, make sure the datum is a node so that the printing
+ *	  routines work.
+ *
+ *	  Sometimes we assign constants to makeStrings. Make sure we don't free
+ *	  those.
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include <ctype.h>
+#include <limits.h>
+
+#include "catalog/index.h"
+#include "catalog/namespace.h"
+#include "catalog/pg_trigger.h"
+#include "commands/defrem.h"
+#include "nodes/makefuncs.h"
+#include "nodes/nodeFuncs.h"
+#include "parser/gramparse.h"
+#include "parser/parser.h"
+#include "storage/lmgr.h"
+#include "utils/date.h"
+#include "utils/datetime.h"
+#include "utils/numeric.h"
+#include "utils/xml.h"
+
+
+/* Location tracking support --- simpler than bison's default */
+#define YYLLOC_DEFAULT(Current, Rhs, N) \
+	do { \
+		if (N) \
+			(Current) = (Rhs)[1]; \
+		else \
+			(Current) = (Rhs)[0]; \
+	} while (0)
+
+/*
+ * Bison doesn't allocate anything that needs to live across parser calls,
+ * so we can easily have it use palloc instead of malloc.  This prevents
+ * memory leaks if we error out during parsing.  Note this only works with
+ * bison >= 2.0.  However, in bison 1.875 the default is to use alloca()
+ * if possible, so there's not really much problem anyhow, at least if
+ * you're building with gcc.
+ */
+#define YYMALLOC palloc
+#define YYFREE   pfree
+
+/* Private struct for the result of privilege_target production */
+typedef struct PrivTarget
 {
+	GrantTargetType targtype;
+	GrantObjectType objtype;
+	List	   *objs;
+} PrivTarget;
 
-/* Line 214 of yacc.c  */
-#line 160 "gram.y"
+/* ConstraintAttributeSpec yields an integer bitmask of these flags: */
+#define CAS_NOT_DEFERRABLE			0x01
+#define CAS_DEFERRABLE				0x02
+#define CAS_INITIALLY_IMMEDIATE		0x04
+#define CAS_INITIALLY_DEFERRED		0x08
+#define CAS_NOT_VALID				0x10
+
+
+#define parser_yyerror(msg)  scanner_yyerror(msg, yyscanner)
+#define parser_errposition(pos)  scanner_errposition(pos, yyscanner)
+
+static void base_yyerror(YYLTYPE *yylloc, core_yyscan_t yyscanner,
+						 const char *msg);
+static Node *makeColumnRef(char *colname, List *indirection,
+						   int location, core_yyscan_t yyscanner);
+static Node *makeTypeCast(Node *arg, TypeName *typename, int location);
+static Node *makeStringConst(char *str, int location);
+static Node *makeStringConstCast(char *str, int location, TypeName *typename);
+static Node *makeIntConst(int val, int location);
+static Node *makeFloatConst(char *str, int location);
+static Node *makeBitStringConst(char *str, int location);
+static Node *makeNullAConst(int location);
+static Node *makeAConst(Value *v, int location);
+static Node *makeBoolAConst(bool state, int location);
+static FuncCall *makeOverlaps(List *largs, List *rargs,
+							  int location, core_yyscan_t yyscanner);
+static void check_qualified_name(List *names, core_yyscan_t yyscanner);
+static List *check_func_name(List *names, core_yyscan_t yyscanner);
+static List *check_indirection(List *indirection, core_yyscan_t yyscanner);
+static List *extractArgTypes(List *parameters);
+static SelectStmt *findLeftmostSelect(SelectStmt *node);
+static void insertSelectOptions(SelectStmt *stmt,
+								List *sortClause, List *lockingClause,
+								Node *limitOffset, Node *limitCount,
+								WithClause *withClause,
+								core_yyscan_t yyscanner);
+static Node *makeSetOp(SetOperation op, bool all, Node *larg, Node *rarg);
+static Node *doNegate(Node *n, int location);
+static void doNegateFloat(Value *v);
+static Node *makeAArrayExpr(List *elements, int location);
+static Node *makeXmlExpr(XmlExprOp op, char *name, List *named_args,
+						 List *args, int location);
+static List *mergeTableFuncParameters(List *func_args, List *columns);
+static TypeName *TableFuncTypeName(List *columns);
+static RangeVar *makeRangeVarFromAnyName(List *names, int position, core_yyscan_t yyscanner);
+static void SplitColQualList(List *qualList,
+							 List **constraintList, CollateClause **collClause,
+							 core_yyscan_t yyscanner);
+static void processCASbits(int cas_bits, int location, const char *constrType,
+			   bool *deferrable, bool *initdeferred, bool *not_valid,
+			   core_yyscan_t yyscanner);
+
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
 
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 160 "gram.y"
+{
 	core_YYSTYPE		core_yystype;
 	/* these fields must match core_YYSTYPE: */
 	int					ival;
@@ -710,15 +1107,13 @@
 	AccessPriv			*accesspriv;
 	InsertStmt			*istmt;
 	VariableSetStmt		*vsetstmt;
-
-
-
-/* Line 214 of yacc.c  */
-#line 718 "gram.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 193 of yacc.c.  */
+#line 1113 "gram.tab.c"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
@@ -738,8 +1133,8 @@
 /* Copy the second part of user declarations.  */
 
 
-/* Line 264 of yacc.c  */
-#line 743 "gram.c"
+/* Line 216 of yacc.c.  */
+#line 1138 "gram.tab.c"
 
 #ifdef short
 # undef short
@@ -789,7 +1184,7 @@
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -814,14 +1209,14 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int yyi)
+YYID (int i)
 #else
 static int
-YYID (yyi)
-    int yyi;
+YYID (i)
+    int i;
 #endif
 {
-  return yyi;
+  return i;
 }
 #endif
 
@@ -903,9 +1298,9 @@
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-  YYLTYPE yyls_alloc;
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+    YYLTYPE yyls;
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
@@ -940,12 +1335,12 @@
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+# define YYSTACK_RELOCATE(Stack)					\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -17890,7 +18285,7 @@
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -18009,20 +18404,17 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
 
@@ -18058,11 +18450,11 @@
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       , &(yylsp[(yyi + 1) - (yynrhs)])		       , yyscanner);
-      YYFPRINTF (stderr, "\n");
+      fprintf (stderr, "\n");
     }
 }
 
@@ -18346,8 +18738,10 @@
 	break;
     }
 }
+
 
 /* Prevent warnings from -Wmissing-prototypes.  */
+
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
@@ -18366,9 +18760,10 @@
 
 
 
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+
+/*----------.
+| yyparse.  |
+`----------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -18392,59 +18787,24 @@
 #endif
 #endif
 {
-/* The lookahead symbol.  */
+  /* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
-/* Location data for the lookahead symbol.  */
+/* Number of syntax errors so far.  */
+int yynerrs;
+/* Location data for the look-ahead symbol.  */
 YYLTYPE yylloc;
 
-    /* Number of syntax errors so far.  */
-    int yynerrs;
-
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-       `yyls': related to locations.
-
-       Refer to the stacks thru separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    /* The location stack.  */
-    YYLTYPE yylsa[YYINITDEPTH];
-    YYLTYPE *yyls;
-    YYLTYPE *yylsp;
-
-    /* The locations where the error started and ended.  */
-    YYLTYPE yyerror_range[2];
-
-    YYSIZE_T yystacksize;
-
+  int yystate;
   int yyn;
   int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-  YYLTYPE yyloc;
-
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
@@ -18452,37 +18812,63 @@
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+  /* The location stack.  */
+  YYLTYPE yylsa[YYINITDEPTH];
+  YYLTYPE *yyls = yylsa;
+  YYLTYPE *yylsp;
+  /* The locations where the error started and ended.  */
+  YYLTYPE yyerror_range[2];
+
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
 
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+  YYLTYPE yyloc;
+
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
-  yyls = yylsa;
-  yystacksize = YYINITDEPTH;
-
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
+
   yyssp = yyss;
   yyvsp = yyvs;
   yylsp = yyls;
-
-#if YYLTYPE_IS_TRIVIAL
+#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
   /* Initialize the default location before parsing starts.  */
   yylloc.first_line   = yylloc.last_line   = 1;
-  yylloc.first_column = yylloc.last_column = 1;
+  yylloc.first_column = yylloc.last_column = 0;
 #endif
 
   goto yysetstate;
@@ -18521,7 +18907,6 @@
 		    &yyvs1, yysize * sizeof (*yyvsp),
 		    &yyls1, yysize * sizeof (*yylsp),
 		    &yystacksize);
-
 	yyls = yyls1;
 	yyss = yyss1;
 	yyvs = yyvs1;
@@ -18543,9 +18928,9 @@
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-	YYSTACK_RELOCATE (yyls_alloc, yyls);
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+	YYSTACK_RELOCATE (yyls);
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -18566,9 +18951,6 @@
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
   goto yybackup;
 
 /*-----------.
@@ -18577,16 +18959,16 @@
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
+     look-ahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -18618,16 +19000,20 @@
       goto yyreduce;
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the lookahead token.  */
+  /* Shift the look-ahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
 
   yystate = yyn;
   *++yyvsp = yylval;
@@ -18668,8 +19054,6 @@
   switch (yyn)
     {
         case 2:
-
-/* Line 1455 of yacc.c  */
 #line 656 "gram.y"
     {
 				pg_yyget_extra(yyscanner)->parsetree = (yyvsp[(1) - (1)].list);
@@ -18677,8 +19061,6 @@
     break;
 
   case 3:
-
-/* Line 1455 of yacc.c  */
 #line 663 "gram.y"
     {
 					if ((yyvsp[(3) - (3)].node) != NULL)
@@ -18689,8 +19071,6 @@
     break;
 
   case 4:
-
-/* Line 1455 of yacc.c  */
 #line 670 "gram.y"
     {
 					if ((yyvsp[(1) - (1)].node) != NULL)
@@ -18701,15 +19081,11 @@
     break;
 
   case 115:
-
-/* Line 1455 of yacc.c  */
 #line 790 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 116:
-
-/* Line 1455 of yacc.c  */
 #line 801 "gram.y"
     {
 					CreateRoleStmt *n = makeNode(CreateRoleStmt);
@@ -18721,50 +19097,36 @@
     break;
 
   case 117:
-
-/* Line 1455 of yacc.c  */
 #line 811 "gram.y"
     {;}
     break;
 
   case 118:
-
-/* Line 1455 of yacc.c  */
 #line 812 "gram.y"
     {;}
     break;
 
   case 119:
-
-/* Line 1455 of yacc.c  */
 #line 821 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 120:
-
-/* Line 1455 of yacc.c  */
 #line 822 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 121:
-
-/* Line 1455 of yacc.c  */
 #line 826 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 122:
-
-/* Line 1455 of yacc.c  */
 #line 827 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 123:
-
-/* Line 1455 of yacc.c  */
 #line 832 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("password",
@@ -18773,8 +19135,6 @@
     break;
 
   case 124:
-
-/* Line 1455 of yacc.c  */
 #line 837 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("password", NULL);
@@ -18782,8 +19142,6 @@
     break;
 
   case 125:
-
-/* Line 1455 of yacc.c  */
 #line 841 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("encryptedPassword",
@@ -18792,8 +19150,6 @@
     break;
 
   case 126:
-
-/* Line 1455 of yacc.c  */
 #line 846 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("unencryptedPassword",
@@ -18802,8 +19158,6 @@
     break;
 
   case 127:
-
-/* Line 1455 of yacc.c  */
 #line 851 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("inherit", (Node *)makeInteger(TRUE));
@@ -18811,8 +19165,6 @@
     break;
 
   case 128:
-
-/* Line 1455 of yacc.c  */
 #line 855 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("connectionlimit", (Node *)makeInteger((yyvsp[(3) - (3)].ival)));
@@ -18820,8 +19172,6 @@
     break;
 
   case 129:
-
-/* Line 1455 of yacc.c  */
 #line 859 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("validUntil", (Node *)makeString((yyvsp[(3) - (3)].str)));
@@ -18829,8 +19179,6 @@
     break;
 
   case 130:
-
-/* Line 1455 of yacc.c  */
 #line 864 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("rolemembers", (Node *)(yyvsp[(2) - (2)].list));
@@ -18838,8 +19186,6 @@
     break;
 
   case 131:
-
-/* Line 1455 of yacc.c  */
 #line 868 "gram.y"
     {
 					/*
@@ -18894,15 +19240,11 @@
     break;
 
   case 132:
-
-/* Line 1455 of yacc.c  */
 #line 921 "gram.y"
     { (yyval.defelt) = (yyvsp[(1) - (1)].defelt); ;}
     break;
 
   case 133:
-
-/* Line 1455 of yacc.c  */
 #line 924 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("sysid", (Node *)makeInteger((yyvsp[(2) - (2)].ival)));
@@ -18910,8 +19252,6 @@
     break;
 
   case 134:
-
-/* Line 1455 of yacc.c  */
 #line 928 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("adminmembers", (Node *)(yyvsp[(2) - (2)].list));
@@ -18919,8 +19259,6 @@
     break;
 
   case 135:
-
-/* Line 1455 of yacc.c  */
 #line 932 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("rolemembers", (Node *)(yyvsp[(2) - (2)].list));
@@ -18928,8 +19266,6 @@
     break;
 
   case 136:
-
-/* Line 1455 of yacc.c  */
 #line 936 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("addroleto", (Node *)(yyvsp[(3) - (3)].list));
@@ -18937,8 +19273,6 @@
     break;
 
   case 137:
-
-/* Line 1455 of yacc.c  */
 #line 940 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("addroleto", (Node *)(yyvsp[(3) - (3)].list));
@@ -18946,8 +19280,6 @@
     break;
 
   case 138:
-
-/* Line 1455 of yacc.c  */
 #line 954 "gram.y"
     {
 					CreateRoleStmt *n = makeNode(CreateRoleStmt);
@@ -18959,8 +19291,6 @@
     break;
 
   case 139:
-
-/* Line 1455 of yacc.c  */
 #line 972 "gram.y"
     {
 					AlterRoleStmt *n = makeNode(AlterRoleStmt);
@@ -18972,22 +19302,16 @@
     break;
 
   case 140:
-
-/* Line 1455 of yacc.c  */
 #line 982 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 141:
-
-/* Line 1455 of yacc.c  */
 #line 983 "gram.y"
     { (yyval.str) = (yyvsp[(3) - (3)].str); ;}
     break;
 
   case 142:
-
-/* Line 1455 of yacc.c  */
 #line 988 "gram.y"
     {
 					AlterRoleSetStmt *n = makeNode(AlterRoleSetStmt);
@@ -18999,8 +19323,6 @@
     break;
 
   case 143:
-
-/* Line 1455 of yacc.c  */
 #line 1006 "gram.y"
     {
 					AlterRoleStmt *n = makeNode(AlterRoleStmt);
@@ -19012,8 +19334,6 @@
     break;
 
   case 144:
-
-/* Line 1455 of yacc.c  */
 #line 1018 "gram.y"
     {
 					AlterRoleSetStmt *n = makeNode(AlterRoleSetStmt);
@@ -19025,8 +19345,6 @@
     break;
 
   case 145:
-
-/* Line 1455 of yacc.c  */
 #line 1039 "gram.y"
     {
 					DropRoleStmt *n = makeNode(DropRoleStmt);
@@ -19037,8 +19355,6 @@
     break;
 
   case 146:
-
-/* Line 1455 of yacc.c  */
 #line 1046 "gram.y"
     {
 					DropRoleStmt *n = makeNode(DropRoleStmt);
@@ -19049,8 +19365,6 @@
     break;
 
   case 147:
-
-/* Line 1455 of yacc.c  */
 #line 1065 "gram.y"
     {
 					DropRoleStmt *n = makeNode(DropRoleStmt);
@@ -19061,8 +19375,6 @@
     break;
 
   case 148:
-
-/* Line 1455 of yacc.c  */
 #line 1072 "gram.y"
     {
 					DropRoleStmt *n = makeNode(DropRoleStmt);
@@ -19073,8 +19385,6 @@
     break;
 
   case 149:
-
-/* Line 1455 of yacc.c  */
 #line 1089 "gram.y"
     {
 					CreateRoleStmt *n = makeNode(CreateRoleStmt);
@@ -19086,8 +19396,6 @@
     break;
 
   case 150:
-
-/* Line 1455 of yacc.c  */
 #line 1107 "gram.y"
     {
 					AlterRoleStmt *n = makeNode(AlterRoleStmt);
@@ -19100,22 +19408,16 @@
     break;
 
   case 151:
-
-/* Line 1455 of yacc.c  */
 #line 1117 "gram.y"
     { (yyval.ival) = +1; ;}
     break;
 
   case 152:
-
-/* Line 1455 of yacc.c  */
 #line 1118 "gram.y"
     { (yyval.ival) = -1; ;}
     break;
 
   case 153:
-
-/* Line 1455 of yacc.c  */
 #line 1131 "gram.y"
     {
 					DropRoleStmt *n = makeNode(DropRoleStmt);
@@ -19126,8 +19428,6 @@
     break;
 
   case 154:
-
-/* Line 1455 of yacc.c  */
 #line 1138 "gram.y"
     {
 					DropRoleStmt *n = makeNode(DropRoleStmt);
@@ -19138,8 +19438,6 @@
     break;
 
   case 155:
-
-/* Line 1455 of yacc.c  */
 #line 1155 "gram.y"
     {
 					CreateSchemaStmt *n = makeNode(CreateSchemaStmt);
@@ -19155,8 +19453,6 @@
     break;
 
   case 156:
-
-/* Line 1455 of yacc.c  */
 #line 1167 "gram.y"
     {
 					CreateSchemaStmt *n = makeNode(CreateSchemaStmt);
@@ -19169,36 +19465,26 @@
     break;
 
   case 157:
-
-/* Line 1455 of yacc.c  */
 #line 1178 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 158:
-
-/* Line 1455 of yacc.c  */
 #line 1179 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 159:
-
-/* Line 1455 of yacc.c  */
 #line 1183 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].node)); ;}
     break;
 
   case 160:
-
-/* Line 1455 of yacc.c  */
 #line 1184 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 167:
-
-/* Line 1455 of yacc.c  */
 #line 1212 "gram.y"
     {
 					VariableSetStmt *n = (yyvsp[(2) - (2)].vsetstmt);
@@ -19208,8 +19494,6 @@
     break;
 
   case 168:
-
-/* Line 1455 of yacc.c  */
 #line 1218 "gram.y"
     {
 					VariableSetStmt *n = (yyvsp[(3) - (3)].vsetstmt);
@@ -19219,8 +19503,6 @@
     break;
 
   case 169:
-
-/* Line 1455 of yacc.c  */
 #line 1224 "gram.y"
     {
 					VariableSetStmt *n = (yyvsp[(3) - (3)].vsetstmt);
@@ -19230,8 +19512,6 @@
     break;
 
   case 170:
-
-/* Line 1455 of yacc.c  */
 #line 1233 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19243,8 +19523,6 @@
     break;
 
   case 171:
-
-/* Line 1455 of yacc.c  */
 #line 1241 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19256,8 +19534,6 @@
     break;
 
   case 172:
-
-/* Line 1455 of yacc.c  */
 #line 1249 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19268,8 +19544,6 @@
     break;
 
   case 173:
-
-/* Line 1455 of yacc.c  */
 #line 1256 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19280,8 +19554,6 @@
     break;
 
   case 174:
-
-/* Line 1455 of yacc.c  */
 #line 1263 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19292,8 +19564,6 @@
     break;
 
   case 175:
-
-/* Line 1455 of yacc.c  */
 #line 1271 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19308,8 +19578,6 @@
     break;
 
   case 176:
-
-/* Line 1455 of yacc.c  */
 #line 1282 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19321,8 +19589,6 @@
     break;
 
   case 177:
-
-/* Line 1455 of yacc.c  */
 #line 1290 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19334,8 +19600,6 @@
     break;
 
   case 178:
-
-/* Line 1455 of yacc.c  */
 #line 1298 "gram.y"
     {
 					ereport(ERROR,
@@ -19347,8 +19611,6 @@
     break;
 
   case 179:
-
-/* Line 1455 of yacc.c  */
 #line 1306 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19360,8 +19622,6 @@
     break;
 
   case 180:
-
-/* Line 1455 of yacc.c  */
 #line 1314 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19376,8 +19636,6 @@
     break;
 
   case 181:
-
-/* Line 1455 of yacc.c  */
 #line 1325 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19389,8 +19647,6 @@
     break;
 
   case 182:
-
-/* Line 1455 of yacc.c  */
 #line 1333 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19402,8 +19658,6 @@
     break;
 
   case 183:
-
-/* Line 1455 of yacc.c  */
 #line 1341 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19414,8 +19668,6 @@
     break;
 
   case 184:
-
-/* Line 1455 of yacc.c  */
 #line 1348 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19427,15 +19679,11 @@
     break;
 
   case 185:
-
-/* Line 1455 of yacc.c  */
 #line 1357 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 186:
-
-/* Line 1455 of yacc.c  */
 #line 1359 "gram.y"
     {
 					(yyval.str) = palloc(strlen((yyvsp[(1) - (3)].str)) + strlen((yyvsp[(3) - (3)].str)) + 2);
@@ -19444,92 +19692,66 @@
     break;
 
   case 187:
-
-/* Line 1455 of yacc.c  */
 #line 1365 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 188:
-
-/* Line 1455 of yacc.c  */
 #line 1366 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 189:
-
-/* Line 1455 of yacc.c  */
 #line 1370 "gram.y"
     { (yyval.node) = makeStringConst((yyvsp[(1) - (1)].str), (yylsp[(1) - (1)])); ;}
     break;
 
   case 190:
-
-/* Line 1455 of yacc.c  */
 #line 1372 "gram.y"
     { (yyval.node) = makeAConst((yyvsp[(1) - (1)].value), (yylsp[(1) - (1)])); ;}
     break;
 
   case 191:
-
-/* Line 1455 of yacc.c  */
 #line 1375 "gram.y"
     { (yyval.str) = "read uncommitted"; ;}
     break;
 
   case 192:
-
-/* Line 1455 of yacc.c  */
 #line 1376 "gram.y"
     { (yyval.str) = "read committed"; ;}
     break;
 
   case 193:
-
-/* Line 1455 of yacc.c  */
 #line 1377 "gram.y"
     { (yyval.str) = "repeatable read"; ;}
     break;
 
   case 194:
-
-/* Line 1455 of yacc.c  */
 #line 1378 "gram.y"
     { (yyval.str) = "serializable"; ;}
     break;
 
   case 195:
-
-/* Line 1455 of yacc.c  */
 #line 1382 "gram.y"
     { (yyval.str) = "true"; ;}
     break;
 
   case 196:
-
-/* Line 1455 of yacc.c  */
 #line 1383 "gram.y"
     { (yyval.str) = "false"; ;}
     break;
 
   case 197:
-
-/* Line 1455 of yacc.c  */
 #line 1384 "gram.y"
     { (yyval.str) = "on"; ;}
     break;
 
   case 198:
-
-/* Line 1455 of yacc.c  */
 #line 1390 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 199:
-
-/* Line 1455 of yacc.c  */
 #line 1403 "gram.y"
     {
 					(yyval.node) = makeStringConst((yyvsp[(1) - (1)].str), (yylsp[(1) - (1)]));
@@ -19537,8 +19759,6 @@
     break;
 
   case 200:
-
-/* Line 1455 of yacc.c  */
 #line 1407 "gram.y"
     {
 					(yyval.node) = makeStringConst((yyvsp[(1) - (1)].str), (yylsp[(1) - (1)]));
@@ -19546,8 +19766,6 @@
     break;
 
   case 201:
-
-/* Line 1455 of yacc.c  */
 #line 1411 "gram.y"
     {
 					TypeName *t = (yyvsp[(1) - (3)].typnam);
@@ -19566,8 +19784,6 @@
     break;
 
   case 202:
-
-/* Line 1455 of yacc.c  */
 #line 1426 "gram.y"
     {
 					TypeName *t = (yyvsp[(1) - (6)].typnam);
@@ -19594,64 +19810,46 @@
     break;
 
   case 203:
-
-/* Line 1455 of yacc.c  */
 #line 1448 "gram.y"
     { (yyval.node) = makeAConst((yyvsp[(1) - (1)].value), (yylsp[(1) - (1)])); ;}
     break;
 
   case 204:
-
-/* Line 1455 of yacc.c  */
 #line 1449 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 205:
-
-/* Line 1455 of yacc.c  */
 #line 1450 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 206:
-
-/* Line 1455 of yacc.c  */
 #line 1454 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 207:
-
-/* Line 1455 of yacc.c  */
 #line 1455 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 208:
-
-/* Line 1455 of yacc.c  */
 #line 1456 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 209:
-
-/* Line 1455 of yacc.c  */
 #line 1460 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 210:
-
-/* Line 1455 of yacc.c  */
 #line 1461 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 211:
-
-/* Line 1455 of yacc.c  */
 #line 1466 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19662,8 +19860,6 @@
     break;
 
   case 212:
-
-/* Line 1455 of yacc.c  */
 #line 1473 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19674,8 +19870,6 @@
     break;
 
   case 213:
-
-/* Line 1455 of yacc.c  */
 #line 1480 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19686,8 +19880,6 @@
     break;
 
   case 214:
-
-/* Line 1455 of yacc.c  */
 #line 1487 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19698,8 +19890,6 @@
     break;
 
   case 215:
-
-/* Line 1455 of yacc.c  */
 #line 1494 "gram.y"
     {
 					VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -19709,22 +19899,16 @@
     break;
 
   case 216:
-
-/* Line 1455 of yacc.c  */
 #line 1503 "gram.y"
     { (yyval.vsetstmt) = (yyvsp[(2) - (2)].vsetstmt); ;}
     break;
 
   case 217:
-
-/* Line 1455 of yacc.c  */
 #line 1504 "gram.y"
     { (yyval.vsetstmt) = (VariableSetStmt *) (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 218:
-
-/* Line 1455 of yacc.c  */
 #line 1510 "gram.y"
     {
 					VariableShowStmt *n = makeNode(VariableShowStmt);
@@ -19734,8 +19918,6 @@
     break;
 
   case 219:
-
-/* Line 1455 of yacc.c  */
 #line 1516 "gram.y"
     {
 					VariableShowStmt *n = makeNode(VariableShowStmt);
@@ -19745,8 +19927,6 @@
     break;
 
   case 220:
-
-/* Line 1455 of yacc.c  */
 #line 1522 "gram.y"
     {
 					VariableShowStmt *n = makeNode(VariableShowStmt);
@@ -19756,8 +19936,6 @@
     break;
 
   case 221:
-
-/* Line 1455 of yacc.c  */
 #line 1528 "gram.y"
     {
 					VariableShowStmt *n = makeNode(VariableShowStmt);
@@ -19767,8 +19945,6 @@
     break;
 
   case 222:
-
-/* Line 1455 of yacc.c  */
 #line 1534 "gram.y"
     {
 					VariableShowStmt *n = makeNode(VariableShowStmt);
@@ -19778,8 +19954,6 @@
     break;
 
   case 223:
-
-/* Line 1455 of yacc.c  */
 #line 1544 "gram.y"
     {
 					ConstraintsSetStmt *n = makeNode(ConstraintsSetStmt);
@@ -19790,36 +19964,26 @@
     break;
 
   case 224:
-
-/* Line 1455 of yacc.c  */
 #line 1553 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 225:
-
-/* Line 1455 of yacc.c  */
 #line 1554 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 226:
-
-/* Line 1455 of yacc.c  */
 #line 1558 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 227:
-
-/* Line 1455 of yacc.c  */
 #line 1559 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 228:
-
-/* Line 1455 of yacc.c  */
 #line 1568 "gram.y"
     {
 					CheckPointStmt *n = makeNode(CheckPointStmt);
@@ -19828,8 +19992,6 @@
     break;
 
   case 229:
-
-/* Line 1455 of yacc.c  */
 #line 1583 "gram.y"
     {
 					DiscardStmt *n = makeNode(DiscardStmt);
@@ -19839,8 +20001,6 @@
     break;
 
   case 230:
-
-/* Line 1455 of yacc.c  */
 #line 1589 "gram.y"
     {
 					DiscardStmt *n = makeNode(DiscardStmt);
@@ -19850,8 +20010,6 @@
     break;
 
   case 231:
-
-/* Line 1455 of yacc.c  */
 #line 1595 "gram.y"
     {
 					DiscardStmt *n = makeNode(DiscardStmt);
@@ -19861,8 +20019,6 @@
     break;
 
   case 232:
-
-/* Line 1455 of yacc.c  */
 #line 1601 "gram.y"
     {
 					DiscardStmt *n = makeNode(DiscardStmt);
@@ -19872,8 +20028,6 @@
     break;
 
   case 233:
-
-/* Line 1455 of yacc.c  */
 #line 1619 "gram.y"
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
@@ -19885,8 +20039,6 @@
     break;
 
   case 234:
-
-/* Line 1455 of yacc.c  */
 #line 1627 "gram.y"
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
@@ -19898,8 +20050,6 @@
     break;
 
   case 235:
-
-/* Line 1455 of yacc.c  */
 #line 1635 "gram.y"
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
@@ -19911,8 +20061,6 @@
     break;
 
   case 236:
-
-/* Line 1455 of yacc.c  */
 #line 1643 "gram.y"
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
@@ -19924,22 +20072,16 @@
     break;
 
   case 237:
-
-/* Line 1455 of yacc.c  */
 #line 1653 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 238:
-
-/* Line 1455 of yacc.c  */
 #line 1654 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 239:
-
-/* Line 1455 of yacc.c  */
 #line 1660 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -19950,8 +20092,6 @@
     break;
 
   case 240:
-
-/* Line 1455 of yacc.c  */
 #line 1668 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -19962,8 +20102,6 @@
     break;
 
   case 241:
-
-/* Line 1455 of yacc.c  */
 #line 1676 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -19975,8 +20113,6 @@
     break;
 
   case 242:
-
-/* Line 1455 of yacc.c  */
 #line 1685 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -19987,8 +20123,6 @@
     break;
 
   case 243:
-
-/* Line 1455 of yacc.c  */
 #line 1693 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -19999,8 +20133,6 @@
     break;
 
   case 244:
-
-/* Line 1455 of yacc.c  */
 #line 1701 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20012,8 +20144,6 @@
     break;
 
   case 245:
-
-/* Line 1455 of yacc.c  */
 #line 1710 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20025,8 +20155,6 @@
     break;
 
   case 246:
-
-/* Line 1455 of yacc.c  */
 #line 1719 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20038,8 +20166,6 @@
     break;
 
   case 247:
-
-/* Line 1455 of yacc.c  */
 #line 1728 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20051,8 +20177,6 @@
     break;
 
   case 248:
-
-/* Line 1455 of yacc.c  */
 #line 1737 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20065,8 +20189,6 @@
     break;
 
   case 249:
-
-/* Line 1455 of yacc.c  */
 #line 1747 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20079,8 +20201,6 @@
     break;
 
   case 250:
-
-/* Line 1455 of yacc.c  */
 #line 1760 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20097,8 +20217,6 @@
     break;
 
   case 251:
-
-/* Line 1455 of yacc.c  */
 #line 1774 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20109,8 +20227,6 @@
     break;
 
   case 252:
-
-/* Line 1455 of yacc.c  */
 #line 1782 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20121,8 +20237,6 @@
     break;
 
   case 253:
-
-/* Line 1455 of yacc.c  */
 #line 1790 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20135,8 +20249,6 @@
     break;
 
   case 254:
-
-/* Line 1455 of yacc.c  */
 #line 1800 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20149,8 +20261,6 @@
     break;
 
   case 255:
-
-/* Line 1455 of yacc.c  */
 #line 1810 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20160,8 +20270,6 @@
     break;
 
   case 256:
-
-/* Line 1455 of yacc.c  */
 #line 1817 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20171,8 +20279,6 @@
     break;
 
   case 257:
-
-/* Line 1455 of yacc.c  */
 #line 1824 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20183,8 +20289,6 @@
     break;
 
   case 258:
-
-/* Line 1455 of yacc.c  */
 #line 1832 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20195,8 +20299,6 @@
     break;
 
   case 259:
-
-/* Line 1455 of yacc.c  */
 #line 1840 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20207,8 +20309,6 @@
     break;
 
   case 260:
-
-/* Line 1455 of yacc.c  */
 #line 1848 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20219,8 +20319,6 @@
     break;
 
   case 261:
-
-/* Line 1455 of yacc.c  */
 #line 1856 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20231,8 +20329,6 @@
     break;
 
   case 262:
-
-/* Line 1455 of yacc.c  */
 #line 1864 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20242,8 +20338,6 @@
     break;
 
   case 263:
-
-/* Line 1455 of yacc.c  */
 #line 1871 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20253,8 +20347,6 @@
     break;
 
   case 264:
-
-/* Line 1455 of yacc.c  */
 #line 1878 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20265,8 +20357,6 @@
     break;
 
   case 265:
-
-/* Line 1455 of yacc.c  */
 #line 1886 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20276,8 +20366,6 @@
     break;
 
   case 266:
-
-/* Line 1455 of yacc.c  */
 #line 1893 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20287,8 +20375,6 @@
     break;
 
   case 267:
-
-/* Line 1455 of yacc.c  */
 #line 1900 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20299,8 +20385,6 @@
     break;
 
   case 268:
-
-/* Line 1455 of yacc.c  */
 #line 1908 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20311,8 +20395,6 @@
     break;
 
   case 269:
-
-/* Line 1455 of yacc.c  */
 #line 1916 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20323,8 +20405,6 @@
     break;
 
   case 270:
-
-/* Line 1455 of yacc.c  */
 #line 1924 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20335,8 +20415,6 @@
     break;
 
   case 271:
-
-/* Line 1455 of yacc.c  */
 #line 1932 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20347,8 +20425,6 @@
     break;
 
   case 272:
-
-/* Line 1455 of yacc.c  */
 #line 1940 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20359,8 +20435,6 @@
     break;
 
   case 273:
-
-/* Line 1455 of yacc.c  */
 #line 1948 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20373,8 +20447,6 @@
     break;
 
   case 274:
-
-/* Line 1455 of yacc.c  */
 #line 1958 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20384,8 +20456,6 @@
     break;
 
   case 275:
-
-/* Line 1455 of yacc.c  */
 #line 1965 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20396,8 +20466,6 @@
     break;
 
   case 276:
-
-/* Line 1455 of yacc.c  */
 #line 1973 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20408,8 +20476,6 @@
     break;
 
   case 277:
-
-/* Line 1455 of yacc.c  */
 #line 1981 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20420,8 +20486,6 @@
     break;
 
   case 278:
-
-/* Line 1455 of yacc.c  */
 #line 1989 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20432,8 +20496,6 @@
     break;
 
   case 279:
-
-/* Line 1455 of yacc.c  */
 #line 1996 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20444,43 +20506,31 @@
     break;
 
   case 280:
-
-/* Line 1455 of yacc.c  */
 #line 2005 "gram.y"
     { (yyval.node) = (yyvsp[(3) - (3)].node); ;}
     break;
 
   case 281:
-
-/* Line 1455 of yacc.c  */
 #line 2006 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 282:
-
-/* Line 1455 of yacc.c  */
 #line 2010 "gram.y"
     { (yyval.dbehavior) = DROP_CASCADE; ;}
     break;
 
   case 283:
-
-/* Line 1455 of yacc.c  */
 #line 2011 "gram.y"
     { (yyval.dbehavior) = DROP_RESTRICT; ;}
     break;
 
   case 284:
-
-/* Line 1455 of yacc.c  */
 #line 2012 "gram.y"
     { (yyval.dbehavior) = DROP_RESTRICT; /* default */ ;}
     break;
 
   case 285:
-
-/* Line 1455 of yacc.c  */
 #line 2017 "gram.y"
     {
 					CollateClause *n = makeNode(CollateClause);
@@ -20492,64 +20542,46 @@
     break;
 
   case 286:
-
-/* Line 1455 of yacc.c  */
 #line 2024 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 287:
-
-/* Line 1455 of yacc.c  */
 #line 2028 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (2)].node); ;}
     break;
 
   case 288:
-
-/* Line 1455 of yacc.c  */
 #line 2029 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 289:
-
-/* Line 1455 of yacc.c  */
 #line 2033 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 290:
-
-/* Line 1455 of yacc.c  */
 #line 2036 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 291:
-
-/* Line 1455 of yacc.c  */
 #line 2037 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 292:
-
-/* Line 1455 of yacc.c  */
 #line 2041 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].defelt)); ;}
     break;
 
   case 293:
-
-/* Line 1455 of yacc.c  */
 #line 2042 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].defelt)); ;}
     break;
 
   case 294:
-
-/* Line 1455 of yacc.c  */
 #line 2048 "gram.y"
     {
 					(yyval.defelt) = makeDefElem((yyvsp[(1) - (3)].str), (Node *) (yyvsp[(3) - (3)].node));
@@ -20557,8 +20589,6 @@
     break;
 
   case 295:
-
-/* Line 1455 of yacc.c  */
 #line 2052 "gram.y"
     {
 					(yyval.defelt) = makeDefElem((yyvsp[(1) - (1)].str), NULL);
@@ -20566,8 +20596,6 @@
     break;
 
   case 296:
-
-/* Line 1455 of yacc.c  */
 #line 2056 "gram.y"
     {
 					(yyval.defelt) = makeDefElemExtended((yyvsp[(1) - (5)].str), (yyvsp[(3) - (5)].str), (Node *) (yyvsp[(5) - (5)].node),
@@ -20576,8 +20604,6 @@
     break;
 
   case 297:
-
-/* Line 1455 of yacc.c  */
 #line 2061 "gram.y"
     {
 					(yyval.defelt) = makeDefElemExtended((yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str), NULL, DEFELEM_UNSPEC);
@@ -20585,8 +20611,6 @@
     break;
 
   case 298:
-
-/* Line 1455 of yacc.c  */
 #line 2076 "gram.y"
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
@@ -20600,22 +20624,16 @@
     break;
 
   case 299:
-
-/* Line 1455 of yacc.c  */
 #line 2088 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 300:
-
-/* Line 1455 of yacc.c  */
 #line 2089 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 301:
-
-/* Line 1455 of yacc.c  */
 #line 2095 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20627,8 +20645,6 @@
     break;
 
   case 302:
-
-/* Line 1455 of yacc.c  */
 #line 2104 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20641,8 +20657,6 @@
     break;
 
   case 303:
-
-/* Line 1455 of yacc.c  */
 #line 2114 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20655,8 +20669,6 @@
     break;
 
   case 304:
-
-/* Line 1455 of yacc.c  */
 #line 2124 "gram.y"
     {
 					AlterTableCmd *n = makeNode(AlterTableCmd);
@@ -20674,8 +20686,6 @@
     break;
 
   case 305:
-
-/* Line 1455 of yacc.c  */
 #line 2149 "gram.y"
     {
 					ClosePortalStmt *n = makeNode(ClosePortalStmt);
@@ -20685,8 +20695,6 @@
     break;
 
   case 306:
-
-/* Line 1455 of yacc.c  */
 #line 2155 "gram.y"
     {
 					ClosePortalStmt *n = makeNode(ClosePortalStmt);
@@ -20696,8 +20704,6 @@
     break;
 
   case 307:
-
-/* Line 1455 of yacc.c  */
 #line 2183 "gram.y"
     {
 					CopyStmt *n = makeNode(CopyStmt);
@@ -20722,8 +20728,6 @@
     break;
 
   case 308:
-
-/* Line 1455 of yacc.c  */
 #line 2204 "gram.y"
     {
 					CopyStmt *n = makeNode(CopyStmt);
@@ -20738,71 +20742,51 @@
     break;
 
   case 309:
-
-/* Line 1455 of yacc.c  */
 #line 2217 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 310:
-
-/* Line 1455 of yacc.c  */
 #line 2218 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 311:
-
-/* Line 1455 of yacc.c  */
 #line 2227 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 312:
-
-/* Line 1455 of yacc.c  */
 #line 2228 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 313:
-
-/* Line 1455 of yacc.c  */
 #line 2229 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 314:
-
-/* Line 1455 of yacc.c  */
 #line 2232 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 315:
-
-/* Line 1455 of yacc.c  */
 #line 2233 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 316:
-
-/* Line 1455 of yacc.c  */
 #line 2238 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 317:
-
-/* Line 1455 of yacc.c  */
 #line 2239 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 318:
-
-/* Line 1455 of yacc.c  */
 #line 2244 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("format", (Node *)makeString("binary"));
@@ -20810,8 +20794,6 @@
     break;
 
   case 319:
-
-/* Line 1455 of yacc.c  */
 #line 2248 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("oids", (Node *)makeInteger(TRUE));
@@ -20819,8 +20801,6 @@
     break;
 
   case 320:
-
-/* Line 1455 of yacc.c  */
 #line 2252 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("delimiter", (Node *)makeString((yyvsp[(3) - (3)].str)));
@@ -20828,8 +20808,6 @@
     break;
 
   case 321:
-
-/* Line 1455 of yacc.c  */
 #line 2256 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("null", (Node *)makeString((yyvsp[(3) - (3)].str)));
@@ -20837,8 +20815,6 @@
     break;
 
   case 322:
-
-/* Line 1455 of yacc.c  */
 #line 2260 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("format", (Node *)makeString("csv"));
@@ -20846,8 +20822,6 @@
     break;
 
   case 323:
-
-/* Line 1455 of yacc.c  */
 #line 2264 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("header", (Node *)makeInteger(TRUE));
@@ -20855,8 +20829,6 @@
     break;
 
   case 324:
-
-/* Line 1455 of yacc.c  */
 #line 2268 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("quote", (Node *)makeString((yyvsp[(3) - (3)].str)));
@@ -20864,8 +20836,6 @@
     break;
 
   case 325:
-
-/* Line 1455 of yacc.c  */
 #line 2272 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("escape", (Node *)makeString((yyvsp[(3) - (3)].str)));
@@ -20873,8 +20843,6 @@
     break;
 
   case 326:
-
-/* Line 1455 of yacc.c  */
 #line 2276 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("force_quote", (Node *)(yyvsp[(3) - (3)].list));
@@ -20882,8 +20850,6 @@
     break;
 
   case 327:
-
-/* Line 1455 of yacc.c  */
 #line 2280 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("force_quote", (Node *)makeNode(A_Star));
@@ -20891,8 +20857,6 @@
     break;
 
   case 328:
-
-/* Line 1455 of yacc.c  */
 #line 2284 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("force_not_null", (Node *)(yyvsp[(4) - (4)].list));
@@ -20900,8 +20864,6 @@
     break;
 
   case 329:
-
-/* Line 1455 of yacc.c  */
 #line 2288 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("encoding", (Node *)makeString((yyvsp[(2) - (2)].str)));
@@ -20909,8 +20871,6 @@
     break;
 
   case 330:
-
-/* Line 1455 of yacc.c  */
 #line 2297 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("format", (Node *)makeString("binary"));
@@ -20918,15 +20878,11 @@
     break;
 
   case 331:
-
-/* Line 1455 of yacc.c  */
 #line 2300 "gram.y"
     { (yyval.defelt) = NULL; ;}
     break;
 
   case 332:
-
-/* Line 1455 of yacc.c  */
 #line 2305 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("oids", (Node *)makeInteger(TRUE));
@@ -20934,15 +20890,11 @@
     break;
 
   case 333:
-
-/* Line 1455 of yacc.c  */
 #line 2308 "gram.y"
     { (yyval.defelt) = NULL; ;}
     break;
 
   case 334:
-
-/* Line 1455 of yacc.c  */
 #line 2313 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("delimiter", (Node *)makeString((yyvsp[(3) - (3)].str)));
@@ -20950,29 +20902,21 @@
     break;
 
   case 335:
-
-/* Line 1455 of yacc.c  */
 #line 2316 "gram.y"
     { (yyval.defelt) = NULL; ;}
     break;
 
   case 336:
-
-/* Line 1455 of yacc.c  */
 #line 2320 "gram.y"
     {;}
     break;
 
   case 337:
-
-/* Line 1455 of yacc.c  */
 #line 2321 "gram.y"
     {;}
     break;
 
   case 338:
-
-/* Line 1455 of yacc.c  */
 #line 2327 "gram.y"
     {
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].defelt));
@@ -20980,8 +20924,6 @@
     break;
 
   case 339:
-
-/* Line 1455 of yacc.c  */
 #line 2331 "gram.y"
     {
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].defelt));
@@ -20989,8 +20931,6 @@
     break;
 
   case 340:
-
-/* Line 1455 of yacc.c  */
 #line 2338 "gram.y"
     {
 					(yyval.defelt) = makeDefElem((yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].node));
@@ -20998,43 +20938,31 @@
     break;
 
   case 341:
-
-/* Line 1455 of yacc.c  */
 #line 2344 "gram.y"
     { (yyval.node) = (Node *) makeString((yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 342:
-
-/* Line 1455 of yacc.c  */
 #line 2345 "gram.y"
     { (yyval.node) = (Node *) (yyvsp[(1) - (1)].value); ;}
     break;
 
   case 343:
-
-/* Line 1455 of yacc.c  */
 #line 2346 "gram.y"
     { (yyval.node) = (Node *) makeNode(A_Star); ;}
     break;
 
   case 344:
-
-/* Line 1455 of yacc.c  */
 #line 2347 "gram.y"
     { (yyval.node) = (Node *) (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 345:
-
-/* Line 1455 of yacc.c  */
 #line 2348 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 346:
-
-/* Line 1455 of yacc.c  */
 #line 2353 "gram.y"
     {
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].node));
@@ -21042,8 +20970,6 @@
     break;
 
   case 347:
-
-/* Line 1455 of yacc.c  */
 #line 2357 "gram.y"
     {
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node));
@@ -21051,15 +20977,11 @@
     break;
 
   case 348:
-
-/* Line 1455 of yacc.c  */
 #line 2364 "gram.y"
     { (yyval.node) = (Node *) makeString((yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 349:
-
-/* Line 1455 of yacc.c  */
 #line 2377 "gram.y"
     {
 					CreateStmt *n = makeNode(CreateStmt);
@@ -21077,8 +20999,6 @@
     break;
 
   case 350:
-
-/* Line 1455 of yacc.c  */
 #line 2393 "gram.y"
     {
 					CreateStmt *n = makeNode(CreateStmt);
@@ -21096,8 +21016,6 @@
     break;
 
   case 351:
-
-/* Line 1455 of yacc.c  */
 #line 2408 "gram.y"
     {
 					CreateStmt *n = makeNode(CreateStmt);
@@ -21116,8 +21034,6 @@
     break;
 
   case 352:
-
-/* Line 1455 of yacc.c  */
 #line 2424 "gram.y"
     {
 					CreateStmt *n = makeNode(CreateStmt);
@@ -21136,92 +21052,66 @@
     break;
 
   case 353:
-
-/* Line 1455 of yacc.c  */
 #line 2447 "gram.y"
     { (yyval.ival) = RELPERSISTENCE_TEMP; ;}
     break;
 
   case 354:
-
-/* Line 1455 of yacc.c  */
 #line 2448 "gram.y"
     { (yyval.ival) = RELPERSISTENCE_TEMP; ;}
     break;
 
   case 355:
-
-/* Line 1455 of yacc.c  */
 #line 2449 "gram.y"
     { (yyval.ival) = RELPERSISTENCE_TEMP; ;}
     break;
 
   case 356:
-
-/* Line 1455 of yacc.c  */
 #line 2450 "gram.y"
     { (yyval.ival) = RELPERSISTENCE_TEMP; ;}
     break;
 
   case 357:
-
-/* Line 1455 of yacc.c  */
 #line 2451 "gram.y"
     { (yyval.ival) = RELPERSISTENCE_TEMP; ;}
     break;
 
   case 358:
-
-/* Line 1455 of yacc.c  */
 #line 2452 "gram.y"
     { (yyval.ival) = RELPERSISTENCE_TEMP; ;}
     break;
 
   case 359:
-
-/* Line 1455 of yacc.c  */
 #line 2453 "gram.y"
     { (yyval.ival) = RELPERSISTENCE_UNLOGGED; ;}
     break;
 
   case 360:
-
-/* Line 1455 of yacc.c  */
 #line 2454 "gram.y"
     { (yyval.ival) = RELPERSISTENCE_PERMANENT; ;}
     break;
 
   case 361:
-
-/* Line 1455 of yacc.c  */
 #line 2458 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 362:
-
-/* Line 1455 of yacc.c  */
 #line 2459 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 363:
-
-/* Line 1455 of yacc.c  */
 #line 2463 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 364:
-
-/* Line 1455 of yacc.c  */
 #line 2464 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 365:
-
-/* Line 1455 of yacc.c  */
 #line 2469 "gram.y"
     {
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].node));
@@ -21229,8 +21119,6 @@
     break;
 
   case 366:
-
-/* Line 1455 of yacc.c  */
 #line 2473 "gram.y"
     {
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node));
@@ -21238,8 +21126,6 @@
     break;
 
   case 367:
-
-/* Line 1455 of yacc.c  */
 #line 2480 "gram.y"
     {
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].node));
@@ -21247,8 +21133,6 @@
     break;
 
   case 368:
-
-/* Line 1455 of yacc.c  */
 #line 2484 "gram.y"
     {
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node));
@@ -21256,43 +21140,31 @@
     break;
 
   case 369:
-
-/* Line 1455 of yacc.c  */
 #line 2490 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 370:
-
-/* Line 1455 of yacc.c  */
 #line 2491 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 371:
-
-/* Line 1455 of yacc.c  */
 #line 2492 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 372:
-
-/* Line 1455 of yacc.c  */
 #line 2496 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 373:
-
-/* Line 1455 of yacc.c  */
 #line 2497 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 374:
-
-/* Line 1455 of yacc.c  */
 #line 2501 "gram.y"
     {
 					ColumnDef *n = makeNode(ColumnDef);
@@ -21313,8 +21185,6 @@
     break;
 
   case 375:
-
-/* Line 1455 of yacc.c  */
 #line 2520 "gram.y"
     {
 					ColumnDef *n = makeNode(ColumnDef);
@@ -21335,22 +21205,16 @@
     break;
 
   case 376:
-
-/* Line 1455 of yacc.c  */
 #line 2539 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].node)); ;}
     break;
 
   case 377:
-
-/* Line 1455 of yacc.c  */
 #line 2540 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 378:
-
-/* Line 1455 of yacc.c  */
 #line 2545 "gram.y"
     {
 					Constraint *n = (Constraint *) (yyvsp[(3) - (3)].node);
@@ -21362,22 +21226,16 @@
     break;
 
   case 379:
-
-/* Line 1455 of yacc.c  */
 #line 2552 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 380:
-
-/* Line 1455 of yacc.c  */
 #line 2553 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 381:
-
-/* Line 1455 of yacc.c  */
 #line 2555 "gram.y"
     {
 					/*
@@ -21394,8 +21252,6 @@
     break;
 
   case 382:
-
-/* Line 1455 of yacc.c  */
 #line 2586 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21406,8 +21262,6 @@
     break;
 
   case 383:
-
-/* Line 1455 of yacc.c  */
 #line 2593 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21418,8 +21272,6 @@
     break;
 
   case 384:
-
-/* Line 1455 of yacc.c  */
 #line 2600 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21434,8 +21286,6 @@
     break;
 
   case 385:
-
-/* Line 1455 of yacc.c  */
 #line 2611 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21450,8 +21300,6 @@
     break;
 
   case 386:
-
-/* Line 1455 of yacc.c  */
 #line 2622 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21464,8 +21312,6 @@
     break;
 
   case 387:
-
-/* Line 1455 of yacc.c  */
 #line 2631 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21478,8 +21324,6 @@
     break;
 
   case 388:
-
-/* Line 1455 of yacc.c  */
 #line 2640 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21498,8 +21342,6 @@
     break;
 
   case 389:
-
-/* Line 1455 of yacc.c  */
 #line 2673 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21510,8 +21352,6 @@
     break;
 
   case 390:
-
-/* Line 1455 of yacc.c  */
 #line 2680 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21522,8 +21362,6 @@
     break;
 
   case 391:
-
-/* Line 1455 of yacc.c  */
 #line 2687 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21534,8 +21372,6 @@
     break;
 
   case 392:
-
-/* Line 1455 of yacc.c  */
 #line 2694 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21546,8 +21382,6 @@
     break;
 
   case 393:
-
-/* Line 1455 of yacc.c  */
 #line 2713 "gram.y"
     {
 					InhRelation *n = makeNode(InhRelation);
@@ -21558,71 +21392,51 @@
     break;
 
   case 394:
-
-/* Line 1455 of yacc.c  */
 #line 2722 "gram.y"
     { (yyval.ival) = (yyvsp[(1) - (3)].ival) | (yyvsp[(3) - (3)].ival); ;}
     break;
 
   case 395:
-
-/* Line 1455 of yacc.c  */
 #line 2723 "gram.y"
     { (yyval.ival) = (yyvsp[(1) - (3)].ival) & ~(yyvsp[(3) - (3)].ival); ;}
     break;
 
   case 396:
-
-/* Line 1455 of yacc.c  */
 #line 2724 "gram.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 397:
-
-/* Line 1455 of yacc.c  */
 #line 2728 "gram.y"
     { (yyval.ival) = CREATE_TABLE_LIKE_DEFAULTS; ;}
     break;
 
   case 398:
-
-/* Line 1455 of yacc.c  */
 #line 2729 "gram.y"
     { (yyval.ival) = CREATE_TABLE_LIKE_CONSTRAINTS; ;}
     break;
 
   case 399:
-
-/* Line 1455 of yacc.c  */
 #line 2730 "gram.y"
     { (yyval.ival) = CREATE_TABLE_LIKE_INDEXES; ;}
     break;
 
   case 400:
-
-/* Line 1455 of yacc.c  */
 #line 2731 "gram.y"
     { (yyval.ival) = CREATE_TABLE_LIKE_STORAGE; ;}
     break;
 
   case 401:
-
-/* Line 1455 of yacc.c  */
 #line 2732 "gram.y"
     { (yyval.ival) = CREATE_TABLE_LIKE_COMMENTS; ;}
     break;
 
   case 402:
-
-/* Line 1455 of yacc.c  */
 #line 2733 "gram.y"
     { (yyval.ival) = CREATE_TABLE_LIKE_ALL; ;}
     break;
 
   case 403:
-
-/* Line 1455 of yacc.c  */
 #line 2743 "gram.y"
     {
 					Constraint *n = (Constraint *) (yyvsp[(3) - (3)].node);
@@ -21634,15 +21448,11 @@
     break;
 
   case 404:
-
-/* Line 1455 of yacc.c  */
 #line 2750 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 405:
-
-/* Line 1455 of yacc.c  */
 #line 2755 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21658,8 +21468,6 @@
     break;
 
   case 406:
-
-/* Line 1455 of yacc.c  */
 #line 2768 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21677,8 +21485,6 @@
     break;
 
   case 407:
-
-/* Line 1455 of yacc.c  */
 #line 2782 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21696,8 +21502,6 @@
     break;
 
   case 408:
-
-/* Line 1455 of yacc.c  */
 #line 2797 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21715,8 +21519,6 @@
     break;
 
   case 409:
-
-/* Line 1455 of yacc.c  */
 #line 2811 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21734,8 +21536,6 @@
     break;
 
   case 410:
-
-/* Line 1455 of yacc.c  */
 #line 2827 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21755,8 +21555,6 @@
     break;
 
   case 411:
-
-/* Line 1455 of yacc.c  */
 #line 2844 "gram.y"
     {
 					Constraint *n = makeNode(Constraint);
@@ -21778,36 +21576,26 @@
     break;
 
   case 412:
-
-/* Line 1455 of yacc.c  */
 #line 2864 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 413:
-
-/* Line 1455 of yacc.c  */
 #line 2865 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 414:
-
-/* Line 1455 of yacc.c  */
 #line 2869 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 415:
-
-/* Line 1455 of yacc.c  */
 #line 2870 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 416:
-
-/* Line 1455 of yacc.c  */
 #line 2874 "gram.y"
     {
 					(yyval.node) = (Node *) makeString((yyvsp[(1) - (1)].str));
@@ -21815,8 +21603,6 @@
     break;
 
   case 417:
-
-/* Line 1455 of yacc.c  */
 #line 2880 "gram.y"
     {
 				(yyval.ival) = FKCONSTR_MATCH_FULL;
@@ -21824,8 +21610,6 @@
     break;
 
   case 418:
-
-/* Line 1455 of yacc.c  */
 #line 2884 "gram.y"
     {
 				ereport(ERROR,
@@ -21837,8 +21621,6 @@
     break;
 
   case 419:
-
-/* Line 1455 of yacc.c  */
 #line 2892 "gram.y"
     {
 				(yyval.ival) = FKCONSTR_MATCH_UNSPECIFIED;
@@ -21846,8 +21628,6 @@
     break;
 
   case 420:
-
-/* Line 1455 of yacc.c  */
 #line 2896 "gram.y"
     {
 				(yyval.ival) = FKCONSTR_MATCH_UNSPECIFIED;
@@ -21855,22 +21635,16 @@
     break;
 
   case 421:
-
-/* Line 1455 of yacc.c  */
 #line 2902 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].list)); ;}
     break;
 
   case 422:
-
-/* Line 1455 of yacc.c  */
 #line 2904 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list)); ;}
     break;
 
   case 423:
-
-/* Line 1455 of yacc.c  */
 #line 2908 "gram.y"
     {
 				(yyval.list) = list_make2((yyvsp[(1) - (3)].ielem), (yyvsp[(3) - (3)].list));
@@ -21878,8 +21652,6 @@
     break;
 
   case 424:
-
-/* Line 1455 of yacc.c  */
 #line 2913 "gram.y"
     {
 				(yyval.list) = list_make2((yyvsp[(1) - (6)].ielem), (yyvsp[(5) - (6)].list));
@@ -21887,211 +21659,151 @@
     break;
 
   case 425:
-
-/* Line 1455 of yacc.c  */
 #line 2919 "gram.y"
     { (yyval.node) = (yyvsp[(3) - (4)].node); ;}
     break;
 
   case 426:
-
-/* Line 1455 of yacc.c  */
 #line 2920 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 427:
-
-/* Line 1455 of yacc.c  */
 #line 2931 "gram.y"
     { (yyval.ival) = ((yyvsp[(1) - (1)].ival) << 8) | (FKCONSTR_ACTION_NOACTION & 0xFF); ;}
     break;
 
   case 428:
-
-/* Line 1455 of yacc.c  */
 #line 2933 "gram.y"
     { (yyval.ival) = (FKCONSTR_ACTION_NOACTION << 8) | ((yyvsp[(1) - (1)].ival) & 0xFF); ;}
     break;
 
   case 429:
-
-/* Line 1455 of yacc.c  */
 #line 2935 "gram.y"
     { (yyval.ival) = ((yyvsp[(1) - (2)].ival) << 8) | ((yyvsp[(2) - (2)].ival) & 0xFF); ;}
     break;
 
   case 430:
-
-/* Line 1455 of yacc.c  */
 #line 2937 "gram.y"
     { (yyval.ival) = ((yyvsp[(2) - (2)].ival) << 8) | ((yyvsp[(1) - (2)].ival) & 0xFF); ;}
     break;
 
   case 431:
-
-/* Line 1455 of yacc.c  */
 #line 2939 "gram.y"
     { (yyval.ival) = (FKCONSTR_ACTION_NOACTION << 8) | (FKCONSTR_ACTION_NOACTION & 0xFF); ;}
     break;
 
   case 432:
-
-/* Line 1455 of yacc.c  */
 #line 2942 "gram.y"
     { (yyval.ival) = (yyvsp[(3) - (3)].ival); ;}
     break;
 
   case 433:
-
-/* Line 1455 of yacc.c  */
 #line 2945 "gram.y"
     { (yyval.ival) = (yyvsp[(3) - (3)].ival); ;}
     break;
 
   case 434:
-
-/* Line 1455 of yacc.c  */
 #line 2949 "gram.y"
     { (yyval.ival) = FKCONSTR_ACTION_NOACTION; ;}
     break;
 
   case 435:
-
-/* Line 1455 of yacc.c  */
 #line 2950 "gram.y"
     { (yyval.ival) = FKCONSTR_ACTION_RESTRICT; ;}
     break;
 
   case 436:
-
-/* Line 1455 of yacc.c  */
 #line 2951 "gram.y"
     { (yyval.ival) = FKCONSTR_ACTION_CASCADE; ;}
     break;
 
   case 437:
-
-/* Line 1455 of yacc.c  */
 #line 2952 "gram.y"
     { (yyval.ival) = FKCONSTR_ACTION_SETNULL; ;}
     break;
 
   case 438:
-
-/* Line 1455 of yacc.c  */
 #line 2953 "gram.y"
     { (yyval.ival) = FKCONSTR_ACTION_SETDEFAULT; ;}
     break;
 
   case 439:
-
-/* Line 1455 of yacc.c  */
 #line 2956 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 440:
-
-/* Line 1455 of yacc.c  */
 #line 2957 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 441:
-
-/* Line 1455 of yacc.c  */
 #line 2962 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 442:
-
-/* Line 1455 of yacc.c  */
 #line 2963 "gram.y"
     { (yyval.list) = list_make1(defWithOids(true)); ;}
     break;
 
   case 443:
-
-/* Line 1455 of yacc.c  */
 #line 2964 "gram.y"
     { (yyval.list) = list_make1(defWithOids(false)); ;}
     break;
 
   case 444:
-
-/* Line 1455 of yacc.c  */
 #line 2965 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 445:
-
-/* Line 1455 of yacc.c  */
 #line 2968 "gram.y"
     { (yyval.oncommit) = ONCOMMIT_DROP; ;}
     break;
 
   case 446:
-
-/* Line 1455 of yacc.c  */
 #line 2969 "gram.y"
     { (yyval.oncommit) = ONCOMMIT_DELETE_ROWS; ;}
     break;
 
   case 447:
-
-/* Line 1455 of yacc.c  */
 #line 2970 "gram.y"
     { (yyval.oncommit) = ONCOMMIT_PRESERVE_ROWS; ;}
     break;
 
   case 448:
-
-/* Line 1455 of yacc.c  */
 #line 2971 "gram.y"
     { (yyval.oncommit) = ONCOMMIT_NOOP; ;}
     break;
 
   case 449:
-
-/* Line 1455 of yacc.c  */
 #line 2974 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 450:
-
-/* Line 1455 of yacc.c  */
 #line 2975 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 451:
-
-/* Line 1455 of yacc.c  */
 #line 2978 "gram.y"
     { (yyval.str) = (yyvsp[(4) - (4)].str); ;}
     break;
 
   case 452:
-
-/* Line 1455 of yacc.c  */
 #line 2979 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 453:
-
-/* Line 1455 of yacc.c  */
 #line 2982 "gram.y"
     { (yyval.str) = (yyvsp[(3) - (3)].str); ;}
     break;
 
   case 454:
-
-/* Line 1455 of yacc.c  */
 #line 2993 "gram.y"
     {
 					/*
@@ -22117,8 +21829,6 @@
     break;
 
   case 455:
-
-/* Line 1455 of yacc.c  */
 #line 3018 "gram.y"
     {
 					(yyval.into) = makeNode(IntoClause);
@@ -22131,36 +21841,26 @@
     break;
 
   case 456:
-
-/* Line 1455 of yacc.c  */
 #line 3029 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 457:
-
-/* Line 1455 of yacc.c  */
 #line 3030 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 458:
-
-/* Line 1455 of yacc.c  */
 #line 3034 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 459:
-
-/* Line 1455 of yacc.c  */
 #line 3035 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 460:
-
-/* Line 1455 of yacc.c  */
 #line 3040 "gram.y"
     {
 					ColumnDef *n = makeNode(ColumnDef);
@@ -22181,29 +21881,21 @@
     break;
 
   case 461:
-
-/* Line 1455 of yacc.c  */
 #line 3059 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 462:
-
-/* Line 1455 of yacc.c  */
 #line 3060 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 463:
-
-/* Line 1455 of yacc.c  */
 #line 3061 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 464:
-
-/* Line 1455 of yacc.c  */
 #line 3075 "gram.y"
     {
 					CreateSeqStmt *n = makeNode(CreateSeqStmt);
@@ -22216,8 +21908,6 @@
     break;
 
   case 465:
-
-/* Line 1455 of yacc.c  */
 #line 3087 "gram.y"
     {
 					AlterSeqStmt *n = makeNode(AlterSeqStmt);
@@ -22228,36 +21918,26 @@
     break;
 
   case 466:
-
-/* Line 1455 of yacc.c  */
 #line 3095 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 467:
-
-/* Line 1455 of yacc.c  */
 #line 3096 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 468:
-
-/* Line 1455 of yacc.c  */
 #line 3099 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].defelt)); ;}
     break;
 
   case 469:
-
-/* Line 1455 of yacc.c  */
 #line 3100 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 470:
-
-/* Line 1455 of yacc.c  */
 #line 3104 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("cache", (Node *)(yyvsp[(2) - (2)].value));
@@ -22265,8 +21945,6 @@
     break;
 
   case 471:
-
-/* Line 1455 of yacc.c  */
 #line 3108 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("cycle", (Node *)makeInteger(TRUE));
@@ -22274,8 +21952,6 @@
     break;
 
   case 472:
-
-/* Line 1455 of yacc.c  */
 #line 3112 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("cycle", (Node *)makeInteger(FALSE));
@@ -22283,8 +21959,6 @@
     break;
 
   case 473:
-
-/* Line 1455 of yacc.c  */
 #line 3116 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("increment", (Node *)(yyvsp[(3) - (3)].value));
@@ -22292,8 +21966,6 @@
     break;
 
   case 474:
-
-/* Line 1455 of yacc.c  */
 #line 3120 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("maxvalue", (Node *)(yyvsp[(2) - (2)].value));
@@ -22301,8 +21973,6 @@
     break;
 
   case 475:
-
-/* Line 1455 of yacc.c  */
 #line 3124 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("minvalue", (Node *)(yyvsp[(2) - (2)].value));
@@ -22310,8 +21980,6 @@
     break;
 
   case 476:
-
-/* Line 1455 of yacc.c  */
 #line 3128 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("maxvalue", NULL);
@@ -22319,8 +21987,6 @@
     break;
 
   case 477:
-
-/* Line 1455 of yacc.c  */
 #line 3132 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("minvalue", NULL);
@@ -22328,8 +21994,6 @@
     break;
 
   case 478:
-
-/* Line 1455 of yacc.c  */
 #line 3136 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("owned_by", (Node *)(yyvsp[(3) - (3)].list));
@@ -22337,8 +22001,6 @@
     break;
 
   case 479:
-
-/* Line 1455 of yacc.c  */
 #line 3140 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("start", (Node *)(yyvsp[(3) - (3)].value));
@@ -22346,8 +22008,6 @@
     break;
 
   case 480:
-
-/* Line 1455 of yacc.c  */
 #line 3144 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("restart", NULL);
@@ -22355,8 +22015,6 @@
     break;
 
   case 481:
-
-/* Line 1455 of yacc.c  */
 #line 3148 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("restart", (Node *)(yyvsp[(3) - (3)].value));
@@ -22364,29 +22022,21 @@
     break;
 
   case 482:
-
-/* Line 1455 of yacc.c  */
 #line 3153 "gram.y"
     {;}
     break;
 
   case 483:
-
-/* Line 1455 of yacc.c  */
 #line 3154 "gram.y"
     {;}
     break;
 
   case 484:
-
-/* Line 1455 of yacc.c  */
 #line 3158 "gram.y"
     { (yyval.value) = makeFloat((yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 485:
-
-/* Line 1455 of yacc.c  */
 #line 3160 "gram.y"
     {
 					(yyval.value) = makeFloat((yyvsp[(2) - (2)].str));
@@ -22395,29 +22045,21 @@
     break;
 
   case 486:
-
-/* Line 1455 of yacc.c  */
 #line 3164 "gram.y"
     { (yyval.value) = makeInteger((yyvsp[(1) - (1)].ival)); ;}
     break;
 
   case 487:
-
-/* Line 1455 of yacc.c  */
 #line 3167 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].value)); ;}
     break;
 
   case 488:
-
-/* Line 1455 of yacc.c  */
 #line 3168 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].value)); ;}
     break;
 
   case 489:
-
-/* Line 1455 of yacc.c  */
 #line 3181 "gram.y"
     {
 				CreatePLangStmt *n = makeNode(CreatePLangStmt);
@@ -22433,8 +22075,6 @@
     break;
 
   case 490:
-
-/* Line 1455 of yacc.c  */
 #line 3194 "gram.y"
     {
 				CreatePLangStmt *n = makeNode(CreatePLangStmt);
@@ -22449,78 +22089,56 @@
     break;
 
   case 491:
-
-/* Line 1455 of yacc.c  */
 #line 3207 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 492:
-
-/* Line 1455 of yacc.c  */
 #line 3208 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 493:
-
-/* Line 1455 of yacc.c  */
 #line 3216 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 494:
-
-/* Line 1455 of yacc.c  */
 #line 3217 "gram.y"
     { (yyval.list) = lcons(makeString((yyvsp[(1) - (2)].str)), (yyvsp[(2) - (2)].list)); ;}
     break;
 
   case 495:
-
-/* Line 1455 of yacc.c  */
 #line 3221 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 496:
-
-/* Line 1455 of yacc.c  */
 #line 3222 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 497:
-
-/* Line 1455 of yacc.c  */
 #line 3226 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 498:
-
-/* Line 1455 of yacc.c  */
 #line 3227 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 499:
-
-/* Line 1455 of yacc.c  */
 #line 3231 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 500:
-
-/* Line 1455 of yacc.c  */
 #line 3232 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 501:
-
-/* Line 1455 of yacc.c  */
 #line 3237 "gram.y"
     {
 					DropPLangStmt *n = makeNode(DropPLangStmt);
@@ -22532,8 +22150,6 @@
     break;
 
   case 502:
-
-/* Line 1455 of yacc.c  */
 #line 3245 "gram.y"
     {
 					DropPLangStmt *n = makeNode(DropPLangStmt);
@@ -22545,22 +22161,16 @@
     break;
 
   case 503:
-
-/* Line 1455 of yacc.c  */
 #line 3255 "gram.y"
     {;}
     break;
 
   case 504:
-
-/* Line 1455 of yacc.c  */
 #line 3256 "gram.y"
     {;}
     break;
 
   case 505:
-
-/* Line 1455 of yacc.c  */
 #line 3267 "gram.y"
     {
 					CreateTableSpaceStmt *n = makeNode(CreateTableSpaceStmt);
@@ -22572,22 +22182,16 @@
     break;
 
   case 506:
-
-/* Line 1455 of yacc.c  */
 #line 3276 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 507:
-
-/* Line 1455 of yacc.c  */
 #line 3277 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 508:
-
-/* Line 1455 of yacc.c  */
 #line 3291 "gram.y"
     {
 					DropTableSpaceStmt *n = makeNode(DropTableSpaceStmt);
@@ -22598,8 +22202,6 @@
     break;
 
   case 509:
-
-/* Line 1455 of yacc.c  */
 #line 3298 "gram.y"
     {
 					DropTableSpaceStmt *n = makeNode(DropTableSpaceStmt);
@@ -22610,8 +22212,6 @@
     break;
 
   case 510:
-
-/* Line 1455 of yacc.c  */
 #line 3315 "gram.y"
     {
 					CreateExtensionStmt *n = makeNode(CreateExtensionStmt);
@@ -22623,8 +22223,6 @@
     break;
 
   case 511:
-
-/* Line 1455 of yacc.c  */
 #line 3323 "gram.y"
     {
 					CreateExtensionStmt *n = makeNode(CreateExtensionStmt);
@@ -22636,22 +22234,16 @@
     break;
 
   case 512:
-
-/* Line 1455 of yacc.c  */
 #line 3334 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 513:
-
-/* Line 1455 of yacc.c  */
 #line 3336 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 514:
-
-/* Line 1455 of yacc.c  */
 #line 3341 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("schema", (Node *)makeString((yyvsp[(2) - (2)].str)));
@@ -22659,8 +22251,6 @@
     break;
 
   case 515:
-
-/* Line 1455 of yacc.c  */
 #line 3345 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("new_version", (Node *)makeString((yyvsp[(2) - (2)].str)));
@@ -22668,8 +22258,6 @@
     break;
 
   case 516:
-
-/* Line 1455 of yacc.c  */
 #line 3349 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("old_version", (Node *)makeString((yyvsp[(2) - (2)].str)));
@@ -22677,8 +22265,6 @@
     break;
 
   case 517:
-
-/* Line 1455 of yacc.c  */
 #line 3361 "gram.y"
     {
 					AlterExtensionStmt *n = makeNode(AlterExtensionStmt);
@@ -22689,22 +22275,16 @@
     break;
 
   case 518:
-
-/* Line 1455 of yacc.c  */
 #line 3371 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 519:
-
-/* Line 1455 of yacc.c  */
 #line 3373 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 520:
-
-/* Line 1455 of yacc.c  */
 #line 3378 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("new_version", (Node *)makeString((yyvsp[(2) - (2)].str)));
@@ -22712,8 +22292,6 @@
     break;
 
   case 521:
-
-/* Line 1455 of yacc.c  */
 #line 3391 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22727,8 +22305,6 @@
     break;
 
   case 522:
-
-/* Line 1455 of yacc.c  */
 #line 3401 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22742,8 +22318,6 @@
     break;
 
   case 523:
-
-/* Line 1455 of yacc.c  */
 #line 3411 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22756,8 +22330,6 @@
     break;
 
   case 524:
-
-/* Line 1455 of yacc.c  */
 #line 3420 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22770,8 +22342,6 @@
     break;
 
   case 525:
-
-/* Line 1455 of yacc.c  */
 #line 3429 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22784,8 +22354,6 @@
     break;
 
   case 526:
-
-/* Line 1455 of yacc.c  */
 #line 3438 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22799,8 +22367,6 @@
     break;
 
   case 527:
-
-/* Line 1455 of yacc.c  */
 #line 3448 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22813,8 +22379,6 @@
     break;
 
   case 528:
-
-/* Line 1455 of yacc.c  */
 #line 3457 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22828,8 +22392,6 @@
     break;
 
   case 529:
-
-/* Line 1455 of yacc.c  */
 #line 3467 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22843,8 +22405,6 @@
     break;
 
   case 530:
-
-/* Line 1455 of yacc.c  */
 #line 3477 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22858,8 +22418,6 @@
     break;
 
   case 531:
-
-/* Line 1455 of yacc.c  */
 #line 3487 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22872,8 +22430,6 @@
     break;
 
   case 532:
-
-/* Line 1455 of yacc.c  */
 #line 3496 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22886,8 +22442,6 @@
     break;
 
   case 533:
-
-/* Line 1455 of yacc.c  */
 #line 3505 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22900,8 +22454,6 @@
     break;
 
   case 534:
-
-/* Line 1455 of yacc.c  */
 #line 3514 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22914,8 +22466,6 @@
     break;
 
   case 535:
-
-/* Line 1455 of yacc.c  */
 #line 3523 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22928,8 +22478,6 @@
     break;
 
   case 536:
-
-/* Line 1455 of yacc.c  */
 #line 3532 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22942,8 +22490,6 @@
     break;
 
   case 537:
-
-/* Line 1455 of yacc.c  */
 #line 3541 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22956,8 +22502,6 @@
     break;
 
   case 538:
-
-/* Line 1455 of yacc.c  */
 #line 3550 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22970,8 +22514,6 @@
     break;
 
   case 539:
-
-/* Line 1455 of yacc.c  */
 #line 3559 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22984,8 +22526,6 @@
     break;
 
   case 540:
-
-/* Line 1455 of yacc.c  */
 #line 3568 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -22998,8 +22538,6 @@
     break;
 
   case 541:
-
-/* Line 1455 of yacc.c  */
 #line 3577 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -23012,8 +22550,6 @@
     break;
 
   case 542:
-
-/* Line 1455 of yacc.c  */
 #line 3586 "gram.y"
     {
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -23026,8 +22562,6 @@
     break;
 
   case 543:
-
-/* Line 1455 of yacc.c  */
 #line 3604 "gram.y"
     {
 					CreateFdwStmt *n = makeNode(CreateFdwStmt);
@@ -23039,64 +22573,46 @@
     break;
 
   case 544:
-
-/* Line 1455 of yacc.c  */
 #line 3614 "gram.y"
     { (yyval.defelt) = makeDefElem("handler", (Node *)(yyvsp[(2) - (2)].list)); ;}
     break;
 
   case 545:
-
-/* Line 1455 of yacc.c  */
 #line 3615 "gram.y"
     { (yyval.defelt) = makeDefElem("handler", NULL); ;}
     break;
 
   case 546:
-
-/* Line 1455 of yacc.c  */
 #line 3616 "gram.y"
     { (yyval.defelt) = makeDefElem("validator", (Node *)(yyvsp[(2) - (2)].list)); ;}
     break;
 
   case 547:
-
-/* Line 1455 of yacc.c  */
 #line 3617 "gram.y"
     { (yyval.defelt) = makeDefElem("validator", NULL); ;}
     break;
 
   case 548:
-
-/* Line 1455 of yacc.c  */
 #line 3621 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].defelt)); ;}
     break;
 
   case 549:
-
-/* Line 1455 of yacc.c  */
 #line 3622 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 550:
-
-/* Line 1455 of yacc.c  */
 #line 3626 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 551:
-
-/* Line 1455 of yacc.c  */
 #line 3627 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 552:
-
-/* Line 1455 of yacc.c  */
 #line 3638 "gram.y"
     {
 					DropFdwStmt *n = makeNode(DropFdwStmt);
@@ -23108,8 +22624,6 @@
     break;
 
   case 553:
-
-/* Line 1455 of yacc.c  */
 #line 3646 "gram.y"
     {
 					DropFdwStmt *n = makeNode(DropFdwStmt);
@@ -23121,8 +22635,6 @@
     break;
 
   case 554:
-
-/* Line 1455 of yacc.c  */
 #line 3663 "gram.y"
     {
 					AlterFdwStmt *n = makeNode(AlterFdwStmt);
@@ -23134,8 +22646,6 @@
     break;
 
   case 555:
-
-/* Line 1455 of yacc.c  */
 #line 3671 "gram.y"
     {
 					AlterFdwStmt *n = makeNode(AlterFdwStmt);
@@ -23147,22 +22657,16 @@
     break;
 
   case 556:
-
-/* Line 1455 of yacc.c  */
 #line 3682 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 557:
-
-/* Line 1455 of yacc.c  */
 #line 3683 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 558:
-
-/* Line 1455 of yacc.c  */
 #line 3688 "gram.y"
     {
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].defelt));
@@ -23170,8 +22674,6 @@
     break;
 
   case 559:
-
-/* Line 1455 of yacc.c  */
 #line 3692 "gram.y"
     {
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].defelt));
@@ -23179,15 +22681,11 @@
     break;
 
   case 560:
-
-/* Line 1455 of yacc.c  */
 #line 3699 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 561:
-
-/* Line 1455 of yacc.c  */
 #line 3704 "gram.y"
     {
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].defelt));
@@ -23195,8 +22693,6 @@
     break;
 
   case 562:
-
-/* Line 1455 of yacc.c  */
 #line 3708 "gram.y"
     {
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].defelt));
@@ -23204,8 +22700,6 @@
     break;
 
   case 563:
-
-/* Line 1455 of yacc.c  */
 #line 3715 "gram.y"
     {
 					(yyval.defelt) = (yyvsp[(1) - (1)].defelt);
@@ -23213,8 +22707,6 @@
     break;
 
   case 564:
-
-/* Line 1455 of yacc.c  */
 #line 3719 "gram.y"
     {
 					(yyval.defelt) = (yyvsp[(2) - (2)].defelt);
@@ -23223,8 +22715,6 @@
     break;
 
   case 565:
-
-/* Line 1455 of yacc.c  */
 #line 3724 "gram.y"
     {
 					(yyval.defelt) = (yyvsp[(2) - (2)].defelt);
@@ -23233,8 +22723,6 @@
     break;
 
   case 566:
-
-/* Line 1455 of yacc.c  */
 #line 3729 "gram.y"
     {
 					(yyval.defelt) = makeDefElemExtended(NULL, (yyvsp[(2) - (2)].str), NULL, DEFELEM_DROP);
@@ -23242,8 +22730,6 @@
     break;
 
   case 567:
-
-/* Line 1455 of yacc.c  */
 #line 3736 "gram.y"
     {
 					(yyval.defelt) = makeDefElem((yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].node));
@@ -23251,22 +22737,16 @@
     break;
 
   case 568:
-
-/* Line 1455 of yacc.c  */
 #line 3742 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 569:
-
-/* Line 1455 of yacc.c  */
 #line 3747 "gram.y"
     { (yyval.node) = (Node *) makeString((yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 570:
-
-/* Line 1455 of yacc.c  */
 #line 3759 "gram.y"
     {
 					CreateForeignServerStmt *n = makeNode(CreateForeignServerStmt);
@@ -23280,50 +22760,36 @@
     break;
 
   case 571:
-
-/* Line 1455 of yacc.c  */
 #line 3771 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 572:
-
-/* Line 1455 of yacc.c  */
 #line 3772 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 573:
-
-/* Line 1455 of yacc.c  */
 #line 3777 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 574:
-
-/* Line 1455 of yacc.c  */
 #line 3778 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 575:
-
-/* Line 1455 of yacc.c  */
 #line 3782 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 576:
-
-/* Line 1455 of yacc.c  */
 #line 3783 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 577:
-
-/* Line 1455 of yacc.c  */
 #line 3794 "gram.y"
     {
 					DropForeignServerStmt *n = makeNode(DropForeignServerStmt);
@@ -23335,8 +22801,6 @@
     break;
 
   case 578:
-
-/* Line 1455 of yacc.c  */
 #line 3802 "gram.y"
     {
 					DropForeignServerStmt *n = makeNode(DropForeignServerStmt);
@@ -23348,8 +22812,6 @@
     break;
 
   case 579:
-
-/* Line 1455 of yacc.c  */
 #line 3819 "gram.y"
     {
 					AlterForeignServerStmt *n = makeNode(AlterForeignServerStmt);
@@ -23362,8 +22824,6 @@
     break;
 
   case 580:
-
-/* Line 1455 of yacc.c  */
 #line 3828 "gram.y"
     {
 					AlterForeignServerStmt *n = makeNode(AlterForeignServerStmt);
@@ -23375,8 +22835,6 @@
     break;
 
   case 581:
-
-/* Line 1455 of yacc.c  */
 #line 3836 "gram.y"
     {
 					AlterForeignServerStmt *n = makeNode(AlterForeignServerStmt);
@@ -23387,8 +22845,6 @@
     break;
 
   case 582:
-
-/* Line 1455 of yacc.c  */
 #line 3855 "gram.y"
     {
 					CreateForeignTableStmt *n = makeNode(CreateForeignTableStmt);
@@ -23405,8 +22861,6 @@
     break;
 
   case 583:
-
-/* Line 1455 of yacc.c  */
 #line 3870 "gram.y"
     {
 					CreateForeignTableStmt *n = makeNode(CreateForeignTableStmt);
@@ -23423,22 +22877,16 @@
     break;
 
   case 584:
-
-/* Line 1455 of yacc.c  */
 #line 3885 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 585:
-
-/* Line 1455 of yacc.c  */
 #line 3886 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 586:
-
-/* Line 1455 of yacc.c  */
 #line 3891 "gram.y"
     {
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].node));
@@ -23446,8 +22894,6 @@
     break;
 
   case 587:
-
-/* Line 1455 of yacc.c  */
 #line 3895 "gram.y"
     {
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node));
@@ -23455,15 +22901,11 @@
     break;
 
   case 588:
-
-/* Line 1455 of yacc.c  */
 #line 3901 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 589:
-
-/* Line 1455 of yacc.c  */
 #line 3913 "gram.y"
     {
 					AlterTableStmt *n = makeNode(AlterTableStmt);
@@ -23475,8 +22917,6 @@
     break;
 
   case 590:
-
-/* Line 1455 of yacc.c  */
 #line 3930 "gram.y"
     {
 					CreateUserMappingStmt *n = makeNode(CreateUserMappingStmt);
@@ -23488,29 +22928,21 @@
     break;
 
   case 591:
-
-/* Line 1455 of yacc.c  */
 #line 3941 "gram.y"
     { (yyval.str) = "current_user"; ;}
     break;
 
   case 592:
-
-/* Line 1455 of yacc.c  */
 #line 3942 "gram.y"
     { (yyval.str) = "current_user"; ;}
     break;
 
   case 593:
-
-/* Line 1455 of yacc.c  */
 #line 3943 "gram.y"
     { (yyval.str) = (strcmp((yyvsp[(1) - (1)].str), "public") == 0) ? NULL : (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 594:
-
-/* Line 1455 of yacc.c  */
 #line 3954 "gram.y"
     {
 					DropUserMappingStmt *n = makeNode(DropUserMappingStmt);
@@ -23522,8 +22954,6 @@
     break;
 
   case 595:
-
-/* Line 1455 of yacc.c  */
 #line 3962 "gram.y"
     {
 					DropUserMappingStmt *n = makeNode(DropUserMappingStmt);
@@ -23535,8 +22965,6 @@
     break;
 
   case 596:
-
-/* Line 1455 of yacc.c  */
 #line 3979 "gram.y"
     {
 					AlterUserMappingStmt *n = makeNode(AlterUserMappingStmt);
@@ -23548,8 +22976,6 @@
     break;
 
   case 597:
-
-/* Line 1455 of yacc.c  */
 #line 4000 "gram.y"
     {
 					CreateTrigStmt *n = makeNode(CreateTrigStmt);
@@ -23571,8 +22997,6 @@
     break;
 
   case 598:
-
-/* Line 1455 of yacc.c  */
 #line 4021 "gram.y"
     {
 					CreateTrigStmt *n = makeNode(CreateTrigStmt);
@@ -23595,36 +23019,26 @@
     break;
 
   case 599:
-
-/* Line 1455 of yacc.c  */
 #line 4042 "gram.y"
     { (yyval.ival) = TRIGGER_TYPE_BEFORE; ;}
     break;
 
   case 600:
-
-/* Line 1455 of yacc.c  */
 #line 4043 "gram.y"
     { (yyval.ival) = TRIGGER_TYPE_AFTER; ;}
     break;
 
   case 601:
-
-/* Line 1455 of yacc.c  */
 #line 4044 "gram.y"
     { (yyval.ival) = TRIGGER_TYPE_INSTEAD; ;}
     break;
 
   case 602:
-
-/* Line 1455 of yacc.c  */
 #line 4049 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 603:
-
-/* Line 1455 of yacc.c  */
 #line 4051 "gram.y"
     {
 					int		events1 = intVal(linitial((yyvsp[(1) - (3)].list)));
@@ -23647,43 +23061,31 @@
     break;
 
   case 604:
-
-/* Line 1455 of yacc.c  */
 #line 4073 "gram.y"
     { (yyval.list) = list_make2(makeInteger(TRIGGER_TYPE_INSERT), NIL); ;}
     break;
 
   case 605:
-
-/* Line 1455 of yacc.c  */
 #line 4075 "gram.y"
     { (yyval.list) = list_make2(makeInteger(TRIGGER_TYPE_DELETE), NIL); ;}
     break;
 
   case 606:
-
-/* Line 1455 of yacc.c  */
 #line 4077 "gram.y"
     { (yyval.list) = list_make2(makeInteger(TRIGGER_TYPE_UPDATE), NIL); ;}
     break;
 
   case 607:
-
-/* Line 1455 of yacc.c  */
 #line 4079 "gram.y"
     { (yyval.list) = list_make2(makeInteger(TRIGGER_TYPE_UPDATE), (yyvsp[(3) - (3)].list)); ;}
     break;
 
   case 608:
-
-/* Line 1455 of yacc.c  */
 #line 4081 "gram.y"
     { (yyval.list) = list_make2(makeInteger(TRIGGER_TYPE_TRUNCATE), NIL); ;}
     break;
 
   case 609:
-
-/* Line 1455 of yacc.c  */
 #line 4086 "gram.y"
     {
 					(yyval.boolean) = (yyvsp[(3) - (3)].boolean);
@@ -23691,8 +23093,6 @@
     break;
 
   case 610:
-
-/* Line 1455 of yacc.c  */
 #line 4090 "gram.y"
     {
 					/*
@@ -23704,71 +23104,51 @@
     break;
 
   case 611:
-
-/* Line 1455 of yacc.c  */
 #line 4100 "gram.y"
     {;}
     break;
 
   case 612:
-
-/* Line 1455 of yacc.c  */
 #line 4101 "gram.y"
     {;}
     break;
 
   case 613:
-
-/* Line 1455 of yacc.c  */
 #line 4105 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 614:
-
-/* Line 1455 of yacc.c  */
 #line 4106 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 615:
-
-/* Line 1455 of yacc.c  */
 #line 4110 "gram.y"
     { (yyval.node) = (yyvsp[(3) - (4)].node); ;}
     break;
 
   case 616:
-
-/* Line 1455 of yacc.c  */
 #line 4111 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 617:
-
-/* Line 1455 of yacc.c  */
 #line 4115 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].value)); ;}
     break;
 
   case 618:
-
-/* Line 1455 of yacc.c  */
 #line 4116 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].value)); ;}
     break;
 
   case 619:
-
-/* Line 1455 of yacc.c  */
 #line 4117 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 620:
-
-/* Line 1455 of yacc.c  */
 #line 4122 "gram.y"
     {
 					char buf[64];
@@ -23778,50 +23158,36 @@
     break;
 
   case 621:
-
-/* Line 1455 of yacc.c  */
 #line 4127 "gram.y"
     { (yyval.value) = makeString((yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 622:
-
-/* Line 1455 of yacc.c  */
 #line 4128 "gram.y"
     { (yyval.value) = makeString((yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 623:
-
-/* Line 1455 of yacc.c  */
 #line 4129 "gram.y"
     { (yyval.value) = makeString((yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 624:
-
-/* Line 1455 of yacc.c  */
 #line 4133 "gram.y"
     { (yyval.range) = (yyvsp[(2) - (2)].range); ;}
     break;
 
   case 625:
-
-/* Line 1455 of yacc.c  */
 #line 4134 "gram.y"
     { (yyval.range) = NULL; ;}
     break;
 
   case 626:
-
-/* Line 1455 of yacc.c  */
 #line 4139 "gram.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 627:
-
-/* Line 1455 of yacc.c  */
 #line 4141 "gram.y"
     {
 					/*
@@ -23849,43 +23215,31 @@
     break;
 
   case 628:
-
-/* Line 1455 of yacc.c  */
 #line 4167 "gram.y"
     { (yyval.ival) = CAS_NOT_DEFERRABLE; ;}
     break;
 
   case 629:
-
-/* Line 1455 of yacc.c  */
 #line 4168 "gram.y"
     { (yyval.ival) = CAS_DEFERRABLE; ;}
     break;
 
   case 630:
-
-/* Line 1455 of yacc.c  */
 #line 4169 "gram.y"
     { (yyval.ival) = CAS_INITIALLY_IMMEDIATE; ;}
     break;
 
   case 631:
-
-/* Line 1455 of yacc.c  */
 #line 4170 "gram.y"
     { (yyval.ival) = CAS_INITIALLY_DEFERRED; ;}
     break;
 
   case 632:
-
-/* Line 1455 of yacc.c  */
 #line 4171 "gram.y"
     { (yyval.ival) = CAS_NOT_VALID; ;}
     break;
 
   case 633:
-
-/* Line 1455 of yacc.c  */
 #line 4177 "gram.y"
     {
 					DropPropertyStmt *n = makeNode(DropPropertyStmt);
@@ -23899,8 +23253,6 @@
     break;
 
   case 634:
-
-/* Line 1455 of yacc.c  */
 #line 4187 "gram.y"
     {
 					DropPropertyStmt *n = makeNode(DropPropertyStmt);
@@ -23914,8 +23266,6 @@
     break;
 
   case 635:
-
-/* Line 1455 of yacc.c  */
 #line 4210 "gram.y"
     {
 					CreateTrigStmt *n = makeNode(CreateTrigStmt);
@@ -23935,8 +23285,6 @@
     break;
 
   case 636:
-
-/* Line 1455 of yacc.c  */
 #line 4229 "gram.y"
     {
 					DropPropertyStmt *n = makeNode(DropPropertyStmt);
@@ -23952,8 +23300,6 @@
     break;
 
   case 637:
-
-/* Line 1455 of yacc.c  */
 #line 4252 "gram.y"
     {
 					DefineStmt *n = makeNode(DefineStmt);
@@ -23967,8 +23313,6 @@
     break;
 
   case 638:
-
-/* Line 1455 of yacc.c  */
 #line 4262 "gram.y"
     {
 					/* old-style (pre-8.2) syntax for CREATE AGGREGATE */
@@ -23983,8 +23327,6 @@
     break;
 
   case 639:
-
-/* Line 1455 of yacc.c  */
 #line 4273 "gram.y"
     {
 					DefineStmt *n = makeNode(DefineStmt);
@@ -23998,8 +23340,6 @@
     break;
 
   case 640:
-
-/* Line 1455 of yacc.c  */
 #line 4283 "gram.y"
     {
 					DefineStmt *n = makeNode(DefineStmt);
@@ -24013,8 +23353,6 @@
     break;
 
   case 641:
-
-/* Line 1455 of yacc.c  */
 #line 4293 "gram.y"
     {
 					/* Shell type (identified by lack of definition) */
@@ -24029,8 +23367,6 @@
     break;
 
   case 642:
-
-/* Line 1455 of yacc.c  */
 #line 4304 "gram.y"
     {
 					CompositeTypeStmt *n = makeNode(CompositeTypeStmt);
@@ -24043,8 +23379,6 @@
     break;
 
   case 643:
-
-/* Line 1455 of yacc.c  */
 #line 4313 "gram.y"
     {
 					CreateEnumStmt *n = makeNode(CreateEnumStmt);
@@ -24055,8 +23389,6 @@
     break;
 
   case 644:
-
-/* Line 1455 of yacc.c  */
 #line 4320 "gram.y"
     {
 					DefineStmt *n = makeNode(DefineStmt);
@@ -24069,8 +23401,6 @@
     break;
 
   case 645:
-
-/* Line 1455 of yacc.c  */
 #line 4329 "gram.y"
     {
 					DefineStmt *n = makeNode(DefineStmt);
@@ -24083,8 +23413,6 @@
     break;
 
   case 646:
-
-/* Line 1455 of yacc.c  */
 #line 4338 "gram.y"
     {
 					DefineStmt *n = makeNode(DefineStmt);
@@ -24097,8 +23425,6 @@
     break;
 
   case 647:
-
-/* Line 1455 of yacc.c  */
 #line 4347 "gram.y"
     {
 					DefineStmt *n = makeNode(DefineStmt);
@@ -24111,8 +23437,6 @@
     break;
 
   case 648:
-
-/* Line 1455 of yacc.c  */
 #line 4356 "gram.y"
     {
 					DefineStmt *n = makeNode(DefineStmt);
@@ -24125,8 +23449,6 @@
     break;
 
   case 649:
-
-/* Line 1455 of yacc.c  */
 #line 4365 "gram.y"
     {
 					DefineStmt *n = makeNode(DefineStmt);
@@ -24139,29 +23461,21 @@
     break;
 
   case 650:
-
-/* Line 1455 of yacc.c  */
 #line 4375 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 651:
-
-/* Line 1455 of yacc.c  */
 #line 4378 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].defelt)); ;}
     break;
 
   case 652:
-
-/* Line 1455 of yacc.c  */
 #line 4379 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].defelt)); ;}
     break;
 
   case 653:
-
-/* Line 1455 of yacc.c  */
 #line 4383 "gram.y"
     {
 					(yyval.defelt) = makeDefElem((yyvsp[(1) - (3)].str), (Node *) (yyvsp[(3) - (3)].node));
@@ -24169,8 +23483,6 @@
     break;
 
   case 654:
-
-/* Line 1455 of yacc.c  */
 #line 4387 "gram.y"
     {
 					(yyval.defelt) = makeDefElem((yyvsp[(1) - (1)].str), NULL);
@@ -24178,78 +23490,56 @@
     break;
 
   case 655:
-
-/* Line 1455 of yacc.c  */
 #line 4393 "gram.y"
     { (yyval.node) = (Node *)(yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 656:
-
-/* Line 1455 of yacc.c  */
 #line 4394 "gram.y"
     { (yyval.node) = (Node *)makeString(pstrdup((yyvsp[(1) - (1)].keyword))); ;}
     break;
 
   case 657:
-
-/* Line 1455 of yacc.c  */
 #line 4395 "gram.y"
     { (yyval.node) = (Node *)(yyvsp[(1) - (1)].list); ;}
     break;
 
   case 658:
-
-/* Line 1455 of yacc.c  */
 #line 4396 "gram.y"
     { (yyval.node) = (Node *)(yyvsp[(1) - (1)].value); ;}
     break;
 
   case 659:
-
-/* Line 1455 of yacc.c  */
 #line 4397 "gram.y"
     { (yyval.node) = (Node *)makeString((yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 660:
-
-/* Line 1455 of yacc.c  */
 #line 4400 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 661:
-
-/* Line 1455 of yacc.c  */
 #line 4401 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 662:
-
-/* Line 1455 of yacc.c  */
 #line 4404 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 663:
-
-/* Line 1455 of yacc.c  */
 #line 4407 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].defelt)); ;}
     break;
 
   case 664:
-
-/* Line 1455 of yacc.c  */
 #line 4408 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].defelt)); ;}
     break;
 
   case 665:
-
-/* Line 1455 of yacc.c  */
 #line 4417 "gram.y"
     {
 					(yyval.defelt) = makeDefElem((yyvsp[(1) - (3)].str), (Node *)(yyvsp[(3) - (3)].node));
@@ -24257,36 +23547,26 @@
     break;
 
   case 666:
-
-/* Line 1455 of yacc.c  */
 #line 4423 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 667:
-
-/* Line 1455 of yacc.c  */
 #line 4424 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 668:
-
-/* Line 1455 of yacc.c  */
 #line 4428 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 669:
-
-/* Line 1455 of yacc.c  */
 #line 4430 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), makeString((yyvsp[(3) - (3)].str))); ;}
     break;
 
   case 670:
-
-/* Line 1455 of yacc.c  */
 #line 4441 "gram.y"
     {
 				 AlterEnumStmt *n = makeNode(AlterEnumStmt);
@@ -24299,8 +23579,6 @@
     break;
 
   case 671:
-
-/* Line 1455 of yacc.c  */
 #line 4450 "gram.y"
     {
 				 AlterEnumStmt *n = makeNode(AlterEnumStmt);
@@ -24313,8 +23591,6 @@
     break;
 
   case 672:
-
-/* Line 1455 of yacc.c  */
 #line 4459 "gram.y"
     {
 				 AlterEnumStmt *n = makeNode(AlterEnumStmt);
@@ -24327,8 +23603,6 @@
     break;
 
   case 673:
-
-/* Line 1455 of yacc.c  */
 #line 4484 "gram.y"
     {
 					CreateOpClassStmt *n = makeNode(CreateOpClassStmt);
@@ -24343,22 +23617,16 @@
     break;
 
   case 674:
-
-/* Line 1455 of yacc.c  */
 #line 4497 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 675:
-
-/* Line 1455 of yacc.c  */
 #line 4498 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 676:
-
-/* Line 1455 of yacc.c  */
 #line 4503 "gram.y"
     {
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
@@ -24372,8 +23640,6 @@
     break;
 
   case 677:
-
-/* Line 1455 of yacc.c  */
 #line 4514 "gram.y"
     {
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
@@ -24387,8 +23653,6 @@
     break;
 
   case 678:
-
-/* Line 1455 of yacc.c  */
 #line 4524 "gram.y"
     {
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
@@ -24401,8 +23665,6 @@
     break;
 
   case 679:
-
-/* Line 1455 of yacc.c  */
 #line 4533 "gram.y"
     {
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
@@ -24416,8 +23678,6 @@
     break;
 
   case 680:
-
-/* Line 1455 of yacc.c  */
 #line 4543 "gram.y"
     {
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
@@ -24428,57 +23688,41 @@
     break;
 
   case 681:
-
-/* Line 1455 of yacc.c  */
 #line 4551 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 682:
-
-/* Line 1455 of yacc.c  */
 #line 4552 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 683:
-
-/* Line 1455 of yacc.c  */
 #line 4555 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 684:
-
-/* Line 1455 of yacc.c  */
 #line 4556 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 685:
-
-/* Line 1455 of yacc.c  */
 #line 4559 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 686:
-
-/* Line 1455 of yacc.c  */
 #line 4560 "gram.y"
     { (yyval.list) = (yyvsp[(4) - (4)].list); ;}
     break;
 
   case 687:
-
-/* Line 1455 of yacc.c  */
 #line 4561 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 688:
-
-/* Line 1455 of yacc.c  */
 #line 4565 "gram.y"
     {
 					/*
@@ -24496,15 +23740,11 @@
     break;
 
   case 689:
-
-/* Line 1455 of yacc.c  */
 #line 4578 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 690:
-
-/* Line 1455 of yacc.c  */
 #line 4584 "gram.y"
     {
 					CreateOpFamilyStmt *n = makeNode(CreateOpFamilyStmt);
@@ -24515,8 +23755,6 @@
     break;
 
   case 691:
-
-/* Line 1455 of yacc.c  */
 #line 4594 "gram.y"
     {
 					AlterOpFamilyStmt *n = makeNode(AlterOpFamilyStmt);
@@ -24529,8 +23767,6 @@
     break;
 
   case 692:
-
-/* Line 1455 of yacc.c  */
 #line 4603 "gram.y"
     {
 					AlterOpFamilyStmt *n = makeNode(AlterOpFamilyStmt);
@@ -24543,22 +23779,16 @@
     break;
 
   case 693:
-
-/* Line 1455 of yacc.c  */
 #line 4614 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 694:
-
-/* Line 1455 of yacc.c  */
 #line 4615 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 695:
-
-/* Line 1455 of yacc.c  */
 #line 4620 "gram.y"
     {
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
@@ -24570,8 +23800,6 @@
     break;
 
   case 696:
-
-/* Line 1455 of yacc.c  */
 #line 4628 "gram.y"
     {
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
@@ -24583,8 +23811,6 @@
     break;
 
   case 697:
-
-/* Line 1455 of yacc.c  */
 #line 4640 "gram.y"
     {
 					RemoveOpClassStmt *n = makeNode(RemoveOpClassStmt);
@@ -24597,8 +23823,6 @@
     break;
 
   case 698:
-
-/* Line 1455 of yacc.c  */
 #line 4649 "gram.y"
     {
 					RemoveOpClassStmt *n = makeNode(RemoveOpClassStmt);
@@ -24611,8 +23835,6 @@
     break;
 
   case 699:
-
-/* Line 1455 of yacc.c  */
 #line 4661 "gram.y"
     {
 					RemoveOpFamilyStmt *n = makeNode(RemoveOpFamilyStmt);
@@ -24625,8 +23847,6 @@
     break;
 
   case 700:
-
-/* Line 1455 of yacc.c  */
 #line 4670 "gram.y"
     {
 					RemoveOpFamilyStmt *n = makeNode(RemoveOpFamilyStmt);
@@ -24639,8 +23859,6 @@
     break;
 
   case 701:
-
-/* Line 1455 of yacc.c  */
 #line 4691 "gram.y"
     {
 					DropOwnedStmt *n = makeNode(DropOwnedStmt);
@@ -24651,8 +23869,6 @@
     break;
 
   case 702:
-
-/* Line 1455 of yacc.c  */
 #line 4701 "gram.y"
     {
 					ReassignOwnedStmt *n = makeNode(ReassignOwnedStmt);
@@ -24663,8 +23879,6 @@
     break;
 
   case 703:
-
-/* Line 1455 of yacc.c  */
 #line 4719 "gram.y"
     {
 					DropStmt *n = makeNode(DropStmt);
@@ -24677,8 +23891,6 @@
     break;
 
   case 704:
-
-/* Line 1455 of yacc.c  */
 #line 4728 "gram.y"
     {
 					DropStmt *n = makeNode(DropStmt);
@@ -24691,155 +23903,111 @@
     break;
 
   case 705:
-
-/* Line 1455 of yacc.c  */
 #line 4739 "gram.y"
     { (yyval.objtype) = OBJECT_TABLE; ;}
     break;
 
   case 706:
-
-/* Line 1455 of yacc.c  */
 #line 4740 "gram.y"
     { (yyval.objtype) = OBJECT_SEQUENCE; ;}
     break;
 
   case 707:
-
-/* Line 1455 of yacc.c  */
 #line 4741 "gram.y"
     { (yyval.objtype) = OBJECT_VIEW; ;}
     break;
 
   case 708:
-
-/* Line 1455 of yacc.c  */
 #line 4742 "gram.y"
     { (yyval.objtype) = OBJECT_INDEX; ;}
     break;
 
   case 709:
-
-/* Line 1455 of yacc.c  */
 #line 4743 "gram.y"
     { (yyval.objtype) = OBJECT_FOREIGN_TABLE; ;}
     break;
 
   case 710:
-
-/* Line 1455 of yacc.c  */
 #line 4744 "gram.y"
     { (yyval.objtype) = OBJECT_TYPE; ;}
     break;
 
   case 711:
-
-/* Line 1455 of yacc.c  */
 #line 4745 "gram.y"
     { (yyval.objtype) = OBJECT_DOMAIN; ;}
     break;
 
   case 712:
-
-/* Line 1455 of yacc.c  */
 #line 4746 "gram.y"
     { (yyval.objtype) = OBJECT_COLLATION; ;}
     break;
 
   case 713:
-
-/* Line 1455 of yacc.c  */
 #line 4747 "gram.y"
     { (yyval.objtype) = OBJECT_CONVERSION; ;}
     break;
 
   case 714:
-
-/* Line 1455 of yacc.c  */
 #line 4748 "gram.y"
     { (yyval.objtype) = OBJECT_SCHEMA; ;}
     break;
 
   case 715:
-
-/* Line 1455 of yacc.c  */
 #line 4749 "gram.y"
     { (yyval.objtype) = OBJECT_EXTENSION; ;}
     break;
 
   case 716:
-
-/* Line 1455 of yacc.c  */
 #line 4750 "gram.y"
     { (yyval.objtype) = OBJECT_TSPARSER; ;}
     break;
 
   case 717:
-
-/* Line 1455 of yacc.c  */
 #line 4751 "gram.y"
     { (yyval.objtype) = OBJECT_TSDICTIONARY; ;}
     break;
 
   case 718:
-
-/* Line 1455 of yacc.c  */
 #line 4752 "gram.y"
     { (yyval.objtype) = OBJECT_TSTEMPLATE; ;}
     break;
 
   case 719:
-
-/* Line 1455 of yacc.c  */
 #line 4753 "gram.y"
     { (yyval.objtype) = OBJECT_TSCONFIGURATION; ;}
     break;
 
   case 720:
-
-/* Line 1455 of yacc.c  */
 #line 4757 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].list)); ;}
     break;
 
   case 721:
-
-/* Line 1455 of yacc.c  */
 #line 4758 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list)); ;}
     break;
 
   case 722:
-
-/* Line 1455 of yacc.c  */
 #line 4761 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 723:
-
-/* Line 1455 of yacc.c  */
 #line 4762 "gram.y"
     { (yyval.list) = lcons(makeString((yyvsp[(1) - (2)].str)), (yyvsp[(2) - (2)].list)); ;}
     break;
 
   case 724:
-
-/* Line 1455 of yacc.c  */
 #line 4766 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(2) - (2)].str))); ;}
     break;
 
   case 725:
-
-/* Line 1455 of yacc.c  */
 #line 4768 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), makeString((yyvsp[(3) - (3)].str))); ;}
     break;
 
   case 726:
-
-/* Line 1455 of yacc.c  */
 #line 4781 "gram.y"
     {
 					TruncateStmt *n = makeNode(TruncateStmt);
@@ -24851,29 +24019,21 @@
     break;
 
   case 727:
-
-/* Line 1455 of yacc.c  */
 #line 4791 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 728:
-
-/* Line 1455 of yacc.c  */
 #line 4792 "gram.y"
     { (yyval.boolean) = true; ;}
     break;
 
   case 729:
-
-/* Line 1455 of yacc.c  */
 #line 4793 "gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 730:
-
-/* Line 1455 of yacc.c  */
 #line 4820 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -24886,8 +24046,6 @@
     break;
 
   case 731:
-
-/* Line 1455 of yacc.c  */
 #line 4829 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -24900,8 +24058,6 @@
     break;
 
   case 732:
-
-/* Line 1455 of yacc.c  */
 #line 4838 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -24914,8 +24070,6 @@
     break;
 
   case 733:
-
-/* Line 1455 of yacc.c  */
 #line 4847 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -24928,8 +24082,6 @@
     break;
 
   case 734:
-
-/* Line 1455 of yacc.c  */
 #line 4856 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -24942,8 +24094,6 @@
     break;
 
   case 735:
-
-/* Line 1455 of yacc.c  */
 #line 4865 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -24956,8 +24106,6 @@
     break;
 
   case 736:
-
-/* Line 1455 of yacc.c  */
 #line 4874 "gram.y"
     {
 					/* Obsolete syntax supported for awhile for compatibility */
@@ -24971,8 +24119,6 @@
     break;
 
   case 737:
-
-/* Line 1455 of yacc.c  */
 #line 4884 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -24985,8 +24131,6 @@
     break;
 
   case 738:
-
-/* Line 1455 of yacc.c  */
 #line 4893 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -24999,8 +24143,6 @@
     break;
 
   case 739:
-
-/* Line 1455 of yacc.c  */
 #line 4902 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -25013,8 +24155,6 @@
     break;
 
   case 740:
-
-/* Line 1455 of yacc.c  */
 #line 4911 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -25027,8 +24167,6 @@
     break;
 
   case 741:
-
-/* Line 1455 of yacc.c  */
 #line 4920 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -25041,8 +24179,6 @@
     break;
 
   case 742:
-
-/* Line 1455 of yacc.c  */
 #line 4929 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -25055,8 +24191,6 @@
     break;
 
   case 743:
-
-/* Line 1455 of yacc.c  */
 #line 4938 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -25068,8 +24202,6 @@
     break;
 
   case 744:
-
-/* Line 1455 of yacc.c  */
 #line 4946 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -25081,8 +24213,6 @@
     break;
 
   case 745:
-
-/* Line 1455 of yacc.c  */
 #line 4954 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -25094,8 +24224,6 @@
     break;
 
   case 746:
-
-/* Line 1455 of yacc.c  */
 #line 4962 "gram.y"
     {
 					CommentStmt *n = makeNode(CommentStmt);
@@ -25107,141 +24235,101 @@
     break;
 
   case 747:
-
-/* Line 1455 of yacc.c  */
 #line 4972 "gram.y"
     { (yyval.objtype) = OBJECT_COLUMN; ;}
     break;
 
   case 748:
-
-/* Line 1455 of yacc.c  */
 #line 4973 "gram.y"
     { (yyval.objtype) = OBJECT_DATABASE; ;}
     break;
 
   case 749:
-
-/* Line 1455 of yacc.c  */
 #line 4974 "gram.y"
     { (yyval.objtype) = OBJECT_SCHEMA; ;}
     break;
 
   case 750:
-
-/* Line 1455 of yacc.c  */
 #line 4975 "gram.y"
     { (yyval.objtype) = OBJECT_INDEX; ;}
     break;
 
   case 751:
-
-/* Line 1455 of yacc.c  */
 #line 4976 "gram.y"
     { (yyval.objtype) = OBJECT_SEQUENCE; ;}
     break;
 
   case 752:
-
-/* Line 1455 of yacc.c  */
 #line 4977 "gram.y"
     { (yyval.objtype) = OBJECT_TABLE; ;}
     break;
 
   case 753:
-
-/* Line 1455 of yacc.c  */
 #line 4978 "gram.y"
     { (yyval.objtype) = OBJECT_DOMAIN; ;}
     break;
 
   case 754:
-
-/* Line 1455 of yacc.c  */
 #line 4979 "gram.y"
     { (yyval.objtype) = OBJECT_TYPE; ;}
     break;
 
   case 755:
-
-/* Line 1455 of yacc.c  */
 #line 4980 "gram.y"
     { (yyval.objtype) = OBJECT_VIEW; ;}
     break;
 
   case 756:
-
-/* Line 1455 of yacc.c  */
 #line 4981 "gram.y"
     { (yyval.objtype) = OBJECT_COLLATION; ;}
     break;
 
   case 757:
-
-/* Line 1455 of yacc.c  */
 #line 4982 "gram.y"
     { (yyval.objtype) = OBJECT_CONVERSION; ;}
     break;
 
   case 758:
-
-/* Line 1455 of yacc.c  */
 #line 4983 "gram.y"
     { (yyval.objtype) = OBJECT_TABLESPACE; ;}
     break;
 
   case 759:
-
-/* Line 1455 of yacc.c  */
 #line 4984 "gram.y"
     { (yyval.objtype) = OBJECT_EXTENSION; ;}
     break;
 
   case 760:
-
-/* Line 1455 of yacc.c  */
 #line 4985 "gram.y"
     { (yyval.objtype) = OBJECT_ROLE; ;}
     break;
 
   case 761:
-
-/* Line 1455 of yacc.c  */
 #line 4986 "gram.y"
     { (yyval.objtype) = OBJECT_FOREIGN_TABLE; ;}
     break;
 
   case 762:
-
-/* Line 1455 of yacc.c  */
 #line 4987 "gram.y"
     { (yyval.objtype) = OBJECT_FOREIGN_SERVER; ;}
     break;
 
   case 763:
-
-/* Line 1455 of yacc.c  */
 #line 4988 "gram.y"
     { (yyval.objtype) = OBJECT_FDW; ;}
     break;
 
   case 764:
-
-/* Line 1455 of yacc.c  */
 #line 4992 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 765:
-
-/* Line 1455 of yacc.c  */
 #line 4993 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 766:
-
-/* Line 1455 of yacc.c  */
 #line 5009 "gram.y"
     {
 					SecLabelStmt *n = makeNode(SecLabelStmt);
@@ -25255,8 +24343,6 @@
     break;
 
   case 767:
-
-/* Line 1455 of yacc.c  */
 #line 5020 "gram.y"
     {
 					SecLabelStmt *n = makeNode(SecLabelStmt);
@@ -25270,8 +24356,6 @@
     break;
 
   case 768:
-
-/* Line 1455 of yacc.c  */
 #line 5031 "gram.y"
     {
 					SecLabelStmt *n = makeNode(SecLabelStmt);
@@ -25285,8 +24369,6 @@
     break;
 
   case 769:
-
-/* Line 1455 of yacc.c  */
 #line 5042 "gram.y"
     {
 					SecLabelStmt *n = makeNode(SecLabelStmt);
@@ -25300,8 +24382,6 @@
     break;
 
   case 770:
-
-/* Line 1455 of yacc.c  */
 #line 5053 "gram.y"
     {
 					SecLabelStmt *n = makeNode(SecLabelStmt);
@@ -25315,92 +24395,66 @@
     break;
 
   case 771:
-
-/* Line 1455 of yacc.c  */
 #line 5064 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 772:
-
-/* Line 1455 of yacc.c  */
 #line 5065 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 773:
-
-/* Line 1455 of yacc.c  */
 #line 5069 "gram.y"
     { (yyval.objtype) = OBJECT_COLUMN; ;}
     break;
 
   case 774:
-
-/* Line 1455 of yacc.c  */
 #line 5070 "gram.y"
     { (yyval.objtype) = OBJECT_FOREIGN_TABLE; ;}
     break;
 
   case 775:
-
-/* Line 1455 of yacc.c  */
 #line 5071 "gram.y"
     { (yyval.objtype) = OBJECT_SCHEMA; ;}
     break;
 
   case 776:
-
-/* Line 1455 of yacc.c  */
 #line 5072 "gram.y"
     { (yyval.objtype) = OBJECT_SEQUENCE; ;}
     break;
 
   case 777:
-
-/* Line 1455 of yacc.c  */
 #line 5073 "gram.y"
     { (yyval.objtype) = OBJECT_TABLE; ;}
     break;
 
   case 778:
-
-/* Line 1455 of yacc.c  */
 #line 5074 "gram.y"
     { (yyval.objtype) = OBJECT_TYPE; ;}
     break;
 
   case 779:
-
-/* Line 1455 of yacc.c  */
 #line 5075 "gram.y"
     { (yyval.objtype) = OBJECT_TYPE; ;}
     break;
 
   case 780:
-
-/* Line 1455 of yacc.c  */
 #line 5076 "gram.y"
     { (yyval.objtype) = OBJECT_VIEW; ;}
     break;
 
   case 781:
-
-/* Line 1455 of yacc.c  */
 #line 5079 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 782:
-
-/* Line 1455 of yacc.c  */
 #line 5080 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 783:
-
-/* Line 1455 of yacc.c  */
 #line 5091 "gram.y"
     {
 					FetchStmt *n = (FetchStmt *) (yyvsp[(2) - (2)].node);
@@ -25410,8 +24464,6 @@
     break;
 
   case 784:
-
-/* Line 1455 of yacc.c  */
 #line 5097 "gram.y"
     {
 					FetchStmt *n = (FetchStmt *) (yyvsp[(2) - (2)].node);
@@ -25421,8 +24473,6 @@
     break;
 
   case 785:
-
-/* Line 1455 of yacc.c  */
 #line 5105 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25434,8 +24484,6 @@
     break;
 
   case 786:
-
-/* Line 1455 of yacc.c  */
 #line 5113 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25447,8 +24495,6 @@
     break;
 
   case 787:
-
-/* Line 1455 of yacc.c  */
 #line 5121 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25460,8 +24506,6 @@
     break;
 
   case 788:
-
-/* Line 1455 of yacc.c  */
 #line 5129 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25473,8 +24517,6 @@
     break;
 
   case 789:
-
-/* Line 1455 of yacc.c  */
 #line 5137 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25486,8 +24528,6 @@
     break;
 
   case 790:
-
-/* Line 1455 of yacc.c  */
 #line 5145 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25499,8 +24539,6 @@
     break;
 
   case 791:
-
-/* Line 1455 of yacc.c  */
 #line 5153 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25512,8 +24550,6 @@
     break;
 
   case 792:
-
-/* Line 1455 of yacc.c  */
 #line 5161 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25525,8 +24561,6 @@
     break;
 
   case 793:
-
-/* Line 1455 of yacc.c  */
 #line 5169 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25538,8 +24572,6 @@
     break;
 
   case 794:
-
-/* Line 1455 of yacc.c  */
 #line 5177 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25551,8 +24583,6 @@
     break;
 
   case 795:
-
-/* Line 1455 of yacc.c  */
 #line 5185 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25564,8 +24594,6 @@
     break;
 
   case 796:
-
-/* Line 1455 of yacc.c  */
 #line 5193 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25577,8 +24605,6 @@
     break;
 
   case 797:
-
-/* Line 1455 of yacc.c  */
 #line 5201 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25590,8 +24616,6 @@
     break;
 
   case 798:
-
-/* Line 1455 of yacc.c  */
 #line 5209 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25603,8 +24627,6 @@
     break;
 
   case 799:
-
-/* Line 1455 of yacc.c  */
 #line 5217 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25616,8 +24638,6 @@
     break;
 
   case 800:
-
-/* Line 1455 of yacc.c  */
 #line 5225 "gram.y"
     {
 					FetchStmt *n = makeNode(FetchStmt);
@@ -25629,36 +24649,26 @@
     break;
 
   case 801:
-
-/* Line 1455 of yacc.c  */
 #line 5234 "gram.y"
     {;}
     break;
 
   case 802:
-
-/* Line 1455 of yacc.c  */
 #line 5235 "gram.y"
     {;}
     break;
 
   case 803:
-
-/* Line 1455 of yacc.c  */
 #line 5238 "gram.y"
     {;}
     break;
 
   case 804:
-
-/* Line 1455 of yacc.c  */
 #line 5239 "gram.y"
     {;}
     break;
 
   case 805:
-
-/* Line 1455 of yacc.c  */
 #line 5251 "gram.y"
     {
 					GrantStmt *n = makeNode(GrantStmt);
@@ -25674,8 +24684,6 @@
     break;
 
   case 806:
-
-/* Line 1455 of yacc.c  */
 #line 5267 "gram.y"
     {
 					GrantStmt *n = makeNode(GrantStmt);
@@ -25692,8 +24700,6 @@
     break;
 
   case 807:
-
-/* Line 1455 of yacc.c  */
 #line 5281 "gram.y"
     {
 					GrantStmt *n = makeNode(GrantStmt);
@@ -25710,29 +24716,21 @@
     break;
 
   case 808:
-
-/* Line 1455 of yacc.c  */
 #line 5306 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 809:
-
-/* Line 1455 of yacc.c  */
 #line 5308 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 810:
-
-/* Line 1455 of yacc.c  */
 #line 5310 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 811:
-
-/* Line 1455 of yacc.c  */
 #line 5312 "gram.y"
     {
 					AccessPriv *n = makeNode(AccessPriv);
@@ -25743,8 +24741,6 @@
     break;
 
   case 812:
-
-/* Line 1455 of yacc.c  */
 #line 5319 "gram.y"
     {
 					AccessPriv *n = makeNode(AccessPriv);
@@ -25755,22 +24751,16 @@
     break;
 
   case 813:
-
-/* Line 1455 of yacc.c  */
 #line 5327 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].accesspriv)); ;}
     break;
 
   case 814:
-
-/* Line 1455 of yacc.c  */
 #line 5328 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].accesspriv)); ;}
     break;
 
   case 815:
-
-/* Line 1455 of yacc.c  */
 #line 5332 "gram.y"
     {
 				AccessPriv *n = makeNode(AccessPriv);
@@ -25781,8 +24771,6 @@
     break;
 
   case 816:
-
-/* Line 1455 of yacc.c  */
 #line 5339 "gram.y"
     {
 				AccessPriv *n = makeNode(AccessPriv);
@@ -25793,8 +24781,6 @@
     break;
 
   case 817:
-
-/* Line 1455 of yacc.c  */
 #line 5346 "gram.y"
     {
 				AccessPriv *n = makeNode(AccessPriv);
@@ -25805,8 +24791,6 @@
     break;
 
   case 818:
-
-/* Line 1455 of yacc.c  */
 #line 5353 "gram.y"
     {
 				AccessPriv *n = makeNode(AccessPriv);
@@ -25817,8 +24801,6 @@
     break;
 
   case 819:
-
-/* Line 1455 of yacc.c  */
 #line 5367 "gram.y"
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
@@ -25830,8 +24812,6 @@
     break;
 
   case 820:
-
-/* Line 1455 of yacc.c  */
 #line 5375 "gram.y"
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
@@ -25843,8 +24823,6 @@
     break;
 
   case 821:
-
-/* Line 1455 of yacc.c  */
 #line 5383 "gram.y"
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
@@ -25856,8 +24834,6 @@
     break;
 
   case 822:
-
-/* Line 1455 of yacc.c  */
 #line 5391 "gram.y"
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
@@ -25869,8 +24845,6 @@
     break;
 
   case 823:
-
-/* Line 1455 of yacc.c  */
 #line 5399 "gram.y"
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
@@ -25882,8 +24856,6 @@
     break;
 
   case 824:
-
-/* Line 1455 of yacc.c  */
 #line 5407 "gram.y"
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
@@ -25895,8 +24867,6 @@
     break;
 
   case 825:
-
-/* Line 1455 of yacc.c  */
 #line 5415 "gram.y"
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
@@ -25908,8 +24878,6 @@
     break;
 
   case 826:
-
-/* Line 1455 of yacc.c  */
 #line 5423 "gram.y"
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
@@ -25921,8 +24889,6 @@
     break;
 
   case 827:
-
-/* Line 1455 of yacc.c  */
 #line 5431 "gram.y"
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
@@ -25934,8 +24900,6 @@
     break;
 
   case 828:
-
-/* Line 1455 of yacc.c  */
 #line 5439 "gram.y"
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
@@ -25947,8 +24911,6 @@
     break;
 
   case 829:
-
-/* Line 1455 of yacc.c  */
 #line 5447 "gram.y"
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
@@ -25960,8 +24922,6 @@
     break;
 
   case 830:
-
-/* Line 1455 of yacc.c  */
 #line 5455 "gram.y"
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
@@ -25973,8 +24933,6 @@
     break;
 
   case 831:
-
-/* Line 1455 of yacc.c  */
 #line 5463 "gram.y"
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
@@ -25986,8 +24944,6 @@
     break;
 
   case 832:
-
-/* Line 1455 of yacc.c  */
 #line 5471 "gram.y"
     {
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
@@ -25999,22 +24955,16 @@
     break;
 
   case 833:
-
-/* Line 1455 of yacc.c  */
 #line 5482 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 834:
-
-/* Line 1455 of yacc.c  */
 #line 5483 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 835:
-
-/* Line 1455 of yacc.c  */
 #line 5487 "gram.y"
     {
 					PrivGrantee *n = makeNode(PrivGrantee);
@@ -26028,8 +24978,6 @@
     break;
 
   case 836:
-
-/* Line 1455 of yacc.c  */
 #line 5497 "gram.y"
     {
 					PrivGrantee *n = makeNode(PrivGrantee);
@@ -26043,36 +24991,26 @@
     break;
 
   case 837:
-
-/* Line 1455 of yacc.c  */
 #line 5510 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 838:
-
-/* Line 1455 of yacc.c  */
 #line 5511 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 839:
-
-/* Line 1455 of yacc.c  */
 #line 5515 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].funwithargs)); ;}
     break;
 
   case 840:
-
-/* Line 1455 of yacc.c  */
 #line 5517 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].funwithargs)); ;}
     break;
 
   case 841:
-
-/* Line 1455 of yacc.c  */
 #line 5522 "gram.y"
     {
 					FuncWithArgs *n = makeNode(FuncWithArgs);
@@ -26083,8 +25021,6 @@
     break;
 
   case 842:
-
-/* Line 1455 of yacc.c  */
 #line 5538 "gram.y"
     {
 					GrantRoleStmt *n = makeNode(GrantRoleStmt);
@@ -26098,8 +25034,6 @@
     break;
 
   case 843:
-
-/* Line 1455 of yacc.c  */
 #line 5551 "gram.y"
     {
 					GrantRoleStmt *n = makeNode(GrantRoleStmt);
@@ -26113,8 +25047,6 @@
     break;
 
   case 844:
-
-/* Line 1455 of yacc.c  */
 #line 5561 "gram.y"
     {
 					GrantRoleStmt *n = makeNode(GrantRoleStmt);
@@ -26128,36 +25060,26 @@
     break;
 
   case 845:
-
-/* Line 1455 of yacc.c  */
 #line 5572 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 846:
-
-/* Line 1455 of yacc.c  */
 #line 5573 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 847:
-
-/* Line 1455 of yacc.c  */
 #line 5576 "gram.y"
     { (yyval.str) = (yyvsp[(3) - (3)].str); ;}
     break;
 
   case 848:
-
-/* Line 1455 of yacc.c  */
 #line 5577 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 849:
-
-/* Line 1455 of yacc.c  */
 #line 5588 "gram.y"
     {
 					AlterDefaultPrivilegesStmt *n = makeNode(AlterDefaultPrivilegesStmt);
@@ -26168,22 +25090,16 @@
     break;
 
   case 850:
-
-/* Line 1455 of yacc.c  */
 #line 5597 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 851:
-
-/* Line 1455 of yacc.c  */
 #line 5598 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 852:
-
-/* Line 1455 of yacc.c  */
 #line 5603 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("schemas", (Node *)(yyvsp[(3) - (3)].list));
@@ -26191,8 +25107,6 @@
     break;
 
   case 853:
-
-/* Line 1455 of yacc.c  */
 #line 5607 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("roles", (Node *)(yyvsp[(3) - (3)].list));
@@ -26200,8 +25114,6 @@
     break;
 
   case 854:
-
-/* Line 1455 of yacc.c  */
 #line 5611 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("roles", (Node *)(yyvsp[(3) - (3)].list));
@@ -26209,8 +25121,6 @@
     break;
 
   case 855:
-
-/* Line 1455 of yacc.c  */
 #line 5623 "gram.y"
     {
 					GrantStmt *n = makeNode(GrantStmt);
@@ -26226,8 +25136,6 @@
     break;
 
   case 856:
-
-/* Line 1455 of yacc.c  */
 #line 5636 "gram.y"
     {
 					GrantStmt *n = makeNode(GrantStmt);
@@ -26244,8 +25152,6 @@
     break;
 
   case 857:
-
-/* Line 1455 of yacc.c  */
 #line 5650 "gram.y"
     {
 					GrantStmt *n = makeNode(GrantStmt);
@@ -26262,29 +25168,21 @@
     break;
 
   case 858:
-
-/* Line 1455 of yacc.c  */
 #line 5665 "gram.y"
     { (yyval.ival) = ACL_OBJECT_RELATION; ;}
     break;
 
   case 859:
-
-/* Line 1455 of yacc.c  */
 #line 5666 "gram.y"
     { (yyval.ival) = ACL_OBJECT_FUNCTION; ;}
     break;
 
   case 860:
-
-/* Line 1455 of yacc.c  */
 #line 5667 "gram.y"
     { (yyval.ival) = ACL_OBJECT_SEQUENCE; ;}
     break;
 
   case 861:
-
-/* Line 1455 of yacc.c  */
 #line 5682 "gram.y"
     {
 					IndexStmt *n = makeNode(IndexStmt);
@@ -26303,78 +25201,56 @@
     break;
 
   case 862:
-
-/* Line 1455 of yacc.c  */
 #line 5699 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 863:
-
-/* Line 1455 of yacc.c  */
 #line 5700 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 864:
-
-/* Line 1455 of yacc.c  */
 #line 5704 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 865:
-
-/* Line 1455 of yacc.c  */
 #line 5705 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 866:
-
-/* Line 1455 of yacc.c  */
 #line 5709 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 867:
-
-/* Line 1455 of yacc.c  */
 #line 5710 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 868:
-
-/* Line 1455 of yacc.c  */
 #line 5714 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 869:
-
-/* Line 1455 of yacc.c  */
 #line 5715 "gram.y"
     { (yyval.str) = DEFAULT_INDEX_TYPE; ;}
     break;
 
   case 870:
-
-/* Line 1455 of yacc.c  */
 #line 5718 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].ielem)); ;}
     break;
 
   case 871:
-
-/* Line 1455 of yacc.c  */
 #line 5719 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].ielem)); ;}
     break;
 
   case 872:
-
-/* Line 1455 of yacc.c  */
 #line 5728 "gram.y"
     {
 					(yyval.ielem) = makeNode(IndexElem);
@@ -26389,8 +25265,6 @@
     break;
 
   case 873:
-
-/* Line 1455 of yacc.c  */
 #line 5739 "gram.y"
     {
 					(yyval.ielem) = makeNode(IndexElem);
@@ -26405,8 +25279,6 @@
     break;
 
   case 874:
-
-/* Line 1455 of yacc.c  */
 #line 5750 "gram.y"
     {
 					(yyval.ielem) = makeNode(IndexElem);
@@ -26421,85 +25293,61 @@
     break;
 
   case 875:
-
-/* Line 1455 of yacc.c  */
 #line 5762 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 876:
-
-/* Line 1455 of yacc.c  */
 #line 5763 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 877:
-
-/* Line 1455 of yacc.c  */
 #line 5766 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 878:
-
-/* Line 1455 of yacc.c  */
 #line 5767 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 879:
-
-/* Line 1455 of yacc.c  */
 #line 5768 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 880:
-
-/* Line 1455 of yacc.c  */
 #line 5771 "gram.y"
     { (yyval.ival) = SORTBY_ASC; ;}
     break;
 
   case 881:
-
-/* Line 1455 of yacc.c  */
 #line 5772 "gram.y"
     { (yyval.ival) = SORTBY_DESC; ;}
     break;
 
   case 882:
-
-/* Line 1455 of yacc.c  */
 #line 5773 "gram.y"
     { (yyval.ival) = SORTBY_DEFAULT; ;}
     break;
 
   case 883:
-
-/* Line 1455 of yacc.c  */
 #line 5776 "gram.y"
     { (yyval.ival) = SORTBY_NULLS_FIRST; ;}
     break;
 
   case 884:
-
-/* Line 1455 of yacc.c  */
 #line 5777 "gram.y"
     { (yyval.ival) = SORTBY_NULLS_LAST; ;}
     break;
 
   case 885:
-
-/* Line 1455 of yacc.c  */
 #line 5778 "gram.y"
     { (yyval.ival) = SORTBY_NULLS_DEFAULT; ;}
     break;
 
   case 886:
-
-/* Line 1455 of yacc.c  */
 #line 5796 "gram.y"
     {
 					CreateFunctionStmt *n = makeNode(CreateFunctionStmt);
@@ -26514,8 +25362,6 @@
     break;
 
   case 887:
-
-/* Line 1455 of yacc.c  */
 #line 5808 "gram.y"
     {
 					CreateFunctionStmt *n = makeNode(CreateFunctionStmt);
@@ -26531,8 +25377,6 @@
     break;
 
   case 888:
-
-/* Line 1455 of yacc.c  */
 #line 5821 "gram.y"
     {
 					CreateFunctionStmt *n = makeNode(CreateFunctionStmt);
@@ -26547,78 +25391,56 @@
     break;
 
   case 889:
-
-/* Line 1455 of yacc.c  */
 #line 5834 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 890:
-
-/* Line 1455 of yacc.c  */
 #line 5835 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 891:
-
-/* Line 1455 of yacc.c  */
 #line 5838 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 892:
-
-/* Line 1455 of yacc.c  */
 #line 5839 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 893:
-
-/* Line 1455 of yacc.c  */
 #line 5843 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].fun_param)); ;}
     break;
 
   case 894:
-
-/* Line 1455 of yacc.c  */
 #line 5844 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].fun_param)); ;}
     break;
 
   case 895:
-
-/* Line 1455 of yacc.c  */
 #line 5852 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 896:
-
-/* Line 1455 of yacc.c  */
 #line 5853 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 897:
-
-/* Line 1455 of yacc.c  */
 #line 5857 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].fun_param)); ;}
     break;
 
   case 898:
-
-/* Line 1455 of yacc.c  */
 #line 5859 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].fun_param)); ;}
     break;
 
   case 899:
-
-/* Line 1455 of yacc.c  */
 #line 5874 "gram.y"
     {
 					FunctionParameter *n = makeNode(FunctionParameter);
@@ -26631,8 +25453,6 @@
     break;
 
   case 900:
-
-/* Line 1455 of yacc.c  */
 #line 5883 "gram.y"
     {
 					FunctionParameter *n = makeNode(FunctionParameter);
@@ -26645,8 +25465,6 @@
     break;
 
   case 901:
-
-/* Line 1455 of yacc.c  */
 #line 5892 "gram.y"
     {
 					FunctionParameter *n = makeNode(FunctionParameter);
@@ -26659,8 +25477,6 @@
     break;
 
   case 902:
-
-/* Line 1455 of yacc.c  */
 #line 5901 "gram.y"
     {
 					FunctionParameter *n = makeNode(FunctionParameter);
@@ -26673,8 +25489,6 @@
     break;
 
   case 903:
-
-/* Line 1455 of yacc.c  */
 #line 5910 "gram.y"
     {
 					FunctionParameter *n = makeNode(FunctionParameter);
@@ -26687,43 +25501,31 @@
     break;
 
   case 904:
-
-/* Line 1455 of yacc.c  */
 #line 5921 "gram.y"
     { (yyval.fun_param_mode) = FUNC_PARAM_IN; ;}
     break;
 
   case 905:
-
-/* Line 1455 of yacc.c  */
 #line 5922 "gram.y"
     { (yyval.fun_param_mode) = FUNC_PARAM_OUT; ;}
     break;
 
   case 906:
-
-/* Line 1455 of yacc.c  */
 #line 5923 "gram.y"
     { (yyval.fun_param_mode) = FUNC_PARAM_INOUT; ;}
     break;
 
   case 907:
-
-/* Line 1455 of yacc.c  */
 #line 5924 "gram.y"
     { (yyval.fun_param_mode) = FUNC_PARAM_INOUT; ;}
     break;
 
   case 908:
-
-/* Line 1455 of yacc.c  */
 #line 5925 "gram.y"
     { (yyval.fun_param_mode) = FUNC_PARAM_VARIADIC; ;}
     break;
 
   case 910:
-
-/* Line 1455 of yacc.c  */
 #line 5936 "gram.y"
     {
 					/* We can catch over-specified results here if we want to,
@@ -26735,15 +25537,11 @@
     break;
 
   case 911:
-
-/* Line 1455 of yacc.c  */
 #line 5950 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 912:
-
-/* Line 1455 of yacc.c  */
 #line 5952 "gram.y"
     {
 					(yyval.typnam) = makeTypeNameFromNameList(lcons(makeString((yyvsp[(1) - (4)].str)), (yyvsp[(2) - (4)].list)));
@@ -26753,8 +25551,6 @@
     break;
 
   case 913:
-
-/* Line 1455 of yacc.c  */
 #line 5958 "gram.y"
     {
 					(yyval.typnam) = makeTypeNameFromNameList(lcons(makeString((yyvsp[(2) - (5)].str)), (yyvsp[(3) - (5)].list)));
@@ -26765,8 +25561,6 @@
     break;
 
   case 914:
-
-/* Line 1455 of yacc.c  */
 #line 5968 "gram.y"
     {
 				    (yyval.fun_param) = (yyvsp[(1) - (1)].fun_param);
@@ -26774,8 +25568,6 @@
     break;
 
   case 915:
-
-/* Line 1455 of yacc.c  */
 #line 5972 "gram.y"
     {
 				    (yyval.fun_param) = (yyvsp[(1) - (3)].fun_param);
@@ -26784,8 +25576,6 @@
     break;
 
   case 916:
-
-/* Line 1455 of yacc.c  */
 #line 5977 "gram.y"
     {
 				    (yyval.fun_param) = (yyvsp[(1) - (3)].fun_param);
@@ -26794,22 +25584,16 @@
     break;
 
   case 917:
-
-/* Line 1455 of yacc.c  */
 #line 5986 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].defelt)); ;}
     break;
 
   case 918:
-
-/* Line 1455 of yacc.c  */
 #line 5987 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 919:
-
-/* Line 1455 of yacc.c  */
 #line 5995 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("strict", (Node *)makeInteger(FALSE));
@@ -26817,8 +25601,6 @@
     break;
 
   case 920:
-
-/* Line 1455 of yacc.c  */
 #line 5999 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("strict", (Node *)makeInteger(TRUE));
@@ -26826,8 +25608,6 @@
     break;
 
   case 921:
-
-/* Line 1455 of yacc.c  */
 #line 6003 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("strict", (Node *)makeInteger(TRUE));
@@ -26835,8 +25615,6 @@
     break;
 
   case 922:
-
-/* Line 1455 of yacc.c  */
 #line 6007 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("volatility", (Node *)makeString("immutable"));
@@ -26844,8 +25622,6 @@
     break;
 
   case 923:
-
-/* Line 1455 of yacc.c  */
 #line 6011 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("volatility", (Node *)makeString("stable"));
@@ -26853,8 +25629,6 @@
     break;
 
   case 924:
-
-/* Line 1455 of yacc.c  */
 #line 6015 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("volatility", (Node *)makeString("volatile"));
@@ -26862,8 +25636,6 @@
     break;
 
   case 925:
-
-/* Line 1455 of yacc.c  */
 #line 6019 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("security", (Node *)makeInteger(TRUE));
@@ -26871,8 +25643,6 @@
     break;
 
   case 926:
-
-/* Line 1455 of yacc.c  */
 #line 6023 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("security", (Node *)makeInteger(FALSE));
@@ -26880,8 +25650,6 @@
     break;
 
   case 927:
-
-/* Line 1455 of yacc.c  */
 #line 6027 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("security", (Node *)makeInteger(TRUE));
@@ -26889,8 +25657,6 @@
     break;
 
   case 928:
-
-/* Line 1455 of yacc.c  */
 #line 6031 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("security", (Node *)makeInteger(FALSE));
@@ -26898,8 +25664,6 @@
     break;
 
   case 929:
-
-/* Line 1455 of yacc.c  */
 #line 6035 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("cost", (Node *)(yyvsp[(2) - (2)].value));
@@ -26907,8 +25671,6 @@
     break;
 
   case 930:
-
-/* Line 1455 of yacc.c  */
 #line 6039 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("rows", (Node *)(yyvsp[(2) - (2)].value));
@@ -26916,8 +25678,6 @@
     break;
 
   case 931:
-
-/* Line 1455 of yacc.c  */
 #line 6043 "gram.y"
     {
 					/* we abuse the normal content of a DefElem here */
@@ -26926,8 +25686,6 @@
     break;
 
   case 932:
-
-/* Line 1455 of yacc.c  */
 #line 6051 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("as", (Node *)(yyvsp[(2) - (2)].list));
@@ -26935,8 +25693,6 @@
     break;
 
   case 933:
-
-/* Line 1455 of yacc.c  */
 #line 6055 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("language", (Node *)makeString((yyvsp[(2) - (2)].str)));
@@ -26944,8 +25700,6 @@
     break;
 
   case 934:
-
-/* Line 1455 of yacc.c  */
 #line 6059 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("window", (Node *)makeInteger(TRUE));
@@ -26953,8 +25707,6 @@
     break;
 
   case 935:
-
-/* Line 1455 of yacc.c  */
 #line 6063 "gram.y"
     {
 					(yyval.defelt) = (yyvsp[(1) - (1)].defelt);
@@ -26962,15 +25714,11 @@
     break;
 
   case 936:
-
-/* Line 1455 of yacc.c  */
 #line 6068 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 937:
-
-/* Line 1455 of yacc.c  */
 #line 6070 "gram.y"
     {
 					(yyval.list) = list_make2(makeString((yyvsp[(1) - (3)].str)), makeString((yyvsp[(3) - (3)].str)));
@@ -26978,22 +25726,16 @@
     break;
 
   case 938:
-
-/* Line 1455 of yacc.c  */
 #line 6076 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 939:
-
-/* Line 1455 of yacc.c  */
 #line 6077 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 940:
-
-/* Line 1455 of yacc.c  */
 #line 6081 "gram.y"
     {
 					FunctionParameter *n = makeNode(FunctionParameter);
@@ -27006,8 +25748,6 @@
     break;
 
   case 941:
-
-/* Line 1455 of yacc.c  */
 #line 6093 "gram.y"
     {
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].fun_param));
@@ -27015,8 +25755,6 @@
     break;
 
   case 942:
-
-/* Line 1455 of yacc.c  */
 #line 6097 "gram.y"
     {
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].fun_param));
@@ -27024,8 +25762,6 @@
     break;
 
   case 943:
-
-/* Line 1455 of yacc.c  */
 #line 6112 "gram.y"
     {
 					AlterFunctionStmt *n = makeNode(AlterFunctionStmt);
@@ -27036,22 +25772,16 @@
     break;
 
   case 944:
-
-/* Line 1455 of yacc.c  */
 #line 6122 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].defelt)); ;}
     break;
 
   case 945:
-
-/* Line 1455 of yacc.c  */
 #line 6123 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 948:
-
-/* Line 1455 of yacc.c  */
 #line 6145 "gram.y"
     {
 					RemoveFuncStmt *n = makeNode(RemoveFuncStmt);
@@ -27065,8 +25795,6 @@
     break;
 
   case 949:
-
-/* Line 1455 of yacc.c  */
 #line 6155 "gram.y"
     {
 					RemoveFuncStmt *n = makeNode(RemoveFuncStmt);
@@ -27080,8 +25808,6 @@
     break;
 
   case 950:
-
-/* Line 1455 of yacc.c  */
 #line 6168 "gram.y"
     {
 					RemoveFuncStmt *n = makeNode(RemoveFuncStmt);
@@ -27095,8 +25821,6 @@
     break;
 
   case 951:
-
-/* Line 1455 of yacc.c  */
 #line 6178 "gram.y"
     {
 					RemoveFuncStmt *n = makeNode(RemoveFuncStmt);
@@ -27110,8 +25834,6 @@
     break;
 
   case 952:
-
-/* Line 1455 of yacc.c  */
 #line 6191 "gram.y"
     {
 					RemoveFuncStmt *n = makeNode(RemoveFuncStmt);
@@ -27125,8 +25847,6 @@
     break;
 
   case 953:
-
-/* Line 1455 of yacc.c  */
 #line 6201 "gram.y"
     {
 					RemoveFuncStmt *n = makeNode(RemoveFuncStmt);
@@ -27140,8 +25860,6 @@
     break;
 
   case 954:
-
-/* Line 1455 of yacc.c  */
 #line 6214 "gram.y"
     {
 				   ereport(ERROR,
@@ -27153,43 +25871,31 @@
     break;
 
   case 955:
-
-/* Line 1455 of yacc.c  */
 #line 6222 "gram.y"
     { (yyval.list) = list_make2((yyvsp[(2) - (5)].typnam), (yyvsp[(4) - (5)].typnam)); ;}
     break;
 
   case 956:
-
-/* Line 1455 of yacc.c  */
 #line 6224 "gram.y"
     { (yyval.list) = list_make2(NULL, (yyvsp[(4) - (5)].typnam)); ;}
     break;
 
   case 957:
-
-/* Line 1455 of yacc.c  */
 #line 6226 "gram.y"
     { (yyval.list) = list_make2((yyvsp[(2) - (5)].typnam), NULL); ;}
     break;
 
   case 958:
-
-/* Line 1455 of yacc.c  */
 #line 6231 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 959:
-
-/* Line 1455 of yacc.c  */
 #line 6233 "gram.y"
     { (yyval.list) = lcons(makeString((yyvsp[(1) - (3)].str)), (yyvsp[(3) - (3)].list)); ;}
     break;
 
   case 960:
-
-/* Line 1455 of yacc.c  */
 #line 6246 "gram.y"
     {
 					DoStmt *n = makeNode(DoStmt);
@@ -27199,22 +25905,16 @@
     break;
 
   case 961:
-
-/* Line 1455 of yacc.c  */
 #line 6254 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].defelt)); ;}
     break;
 
   case 962:
-
-/* Line 1455 of yacc.c  */
 #line 6255 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 963:
-
-/* Line 1455 of yacc.c  */
 #line 6260 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("as", (Node *)makeString((yyvsp[(1) - (1)].str)));
@@ -27222,8 +25922,6 @@
     break;
 
   case 964:
-
-/* Line 1455 of yacc.c  */
 #line 6264 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("language", (Node *)makeString((yyvsp[(2) - (2)].str)));
@@ -27231,8 +25929,6 @@
     break;
 
   case 965:
-
-/* Line 1455 of yacc.c  */
 #line 6277 "gram.y"
     {
 					CreateCastStmt *n = makeNode(CreateCastStmt);
@@ -27246,8 +25942,6 @@
     break;
 
   case 966:
-
-/* Line 1455 of yacc.c  */
 #line 6288 "gram.y"
     {
 					CreateCastStmt *n = makeNode(CreateCastStmt);
@@ -27261,8 +25955,6 @@
     break;
 
   case 967:
-
-/* Line 1455 of yacc.c  */
 #line 6299 "gram.y"
     {
 					CreateCastStmt *n = makeNode(CreateCastStmt);
@@ -27276,29 +25968,21 @@
     break;
 
   case 968:
-
-/* Line 1455 of yacc.c  */
 #line 6310 "gram.y"
     { (yyval.ival) = COERCION_IMPLICIT; ;}
     break;
 
   case 969:
-
-/* Line 1455 of yacc.c  */
 #line 6311 "gram.y"
     { (yyval.ival) = COERCION_ASSIGNMENT; ;}
     break;
 
   case 970:
-
-/* Line 1455 of yacc.c  */
 #line 6312 "gram.y"
     { (yyval.ival) = COERCION_EXPLICIT; ;}
     break;
 
   case 971:
-
-/* Line 1455 of yacc.c  */
 #line 6317 "gram.y"
     {
 					DropCastStmt *n = makeNode(DropCastStmt);
@@ -27311,22 +25995,16 @@
     break;
 
   case 972:
-
-/* Line 1455 of yacc.c  */
 #line 6327 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 973:
-
-/* Line 1455 of yacc.c  */
 #line 6328 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 974:
-
-/* Line 1455 of yacc.c  */
 #line 6343 "gram.y"
     {
 					ReindexStmt *n = makeNode(ReindexStmt);
@@ -27338,8 +26016,6 @@
     break;
 
   case 975:
-
-/* Line 1455 of yacc.c  */
 #line 6351 "gram.y"
     {
 					ReindexStmt *n = makeNode(ReindexStmt);
@@ -27353,8 +26029,6 @@
     break;
 
   case 976:
-
-/* Line 1455 of yacc.c  */
 #line 6361 "gram.y"
     {
 					ReindexStmt *n = makeNode(ReindexStmt);
@@ -27368,36 +26042,26 @@
     break;
 
   case 977:
-
-/* Line 1455 of yacc.c  */
 #line 6373 "gram.y"
     { (yyval.objtype) = OBJECT_INDEX; ;}
     break;
 
   case 978:
-
-/* Line 1455 of yacc.c  */
 #line 6374 "gram.y"
     { (yyval.objtype) = OBJECT_TABLE; ;}
     break;
 
   case 979:
-
-/* Line 1455 of yacc.c  */
 #line 6377 "gram.y"
     {  (yyval.boolean) = TRUE; ;}
     break;
 
   case 980:
-
-/* Line 1455 of yacc.c  */
 #line 6378 "gram.y"
     {  (yyval.boolean) = FALSE; ;}
     break;
 
   case 981:
-
-/* Line 1455 of yacc.c  */
 #line 6389 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27410,8 +26074,6 @@
     break;
 
   case 982:
-
-/* Line 1455 of yacc.c  */
 #line 6398 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27423,8 +26085,6 @@
     break;
 
   case 983:
-
-/* Line 1455 of yacc.c  */
 #line 6406 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27436,8 +26096,6 @@
     break;
 
   case 984:
-
-/* Line 1455 of yacc.c  */
 #line 6414 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27449,8 +26107,6 @@
     break;
 
   case 985:
-
-/* Line 1455 of yacc.c  */
 #line 6422 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27463,8 +26119,6 @@
     break;
 
   case 986:
-
-/* Line 1455 of yacc.c  */
 #line 6431 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27476,8 +26130,6 @@
     break;
 
   case 987:
-
-/* Line 1455 of yacc.c  */
 #line 6439 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27489,8 +26141,6 @@
     break;
 
   case 988:
-
-/* Line 1455 of yacc.c  */
 #line 6447 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27503,8 +26153,6 @@
     break;
 
   case 989:
-
-/* Line 1455 of yacc.c  */
 #line 6456 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27517,8 +26165,6 @@
     break;
 
   case 990:
-
-/* Line 1455 of yacc.c  */
 #line 6465 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27530,8 +26176,6 @@
     break;
 
   case 991:
-
-/* Line 1455 of yacc.c  */
 #line 6473 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27544,8 +26188,6 @@
     break;
 
   case 992:
-
-/* Line 1455 of yacc.c  */
 #line 6482 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27558,8 +26200,6 @@
     break;
 
   case 993:
-
-/* Line 1455 of yacc.c  */
 #line 6491 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27572,8 +26212,6 @@
     break;
 
   case 994:
-
-/* Line 1455 of yacc.c  */
 #line 6500 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27586,8 +26224,6 @@
     break;
 
   case 995:
-
-/* Line 1455 of yacc.c  */
 #line 6509 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27600,8 +26236,6 @@
     break;
 
   case 996:
-
-/* Line 1455 of yacc.c  */
 #line 6518 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27615,8 +26249,6 @@
     break;
 
   case 997:
-
-/* Line 1455 of yacc.c  */
 #line 6528 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27630,8 +26262,6 @@
     break;
 
   case 998:
-
-/* Line 1455 of yacc.c  */
 #line 6538 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27644,8 +26274,6 @@
     break;
 
   case 999:
-
-/* Line 1455 of yacc.c  */
 #line 6547 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27657,8 +26285,6 @@
     break;
 
   case 1000:
-
-/* Line 1455 of yacc.c  */
 #line 6555 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27670,8 +26296,6 @@
     break;
 
   case 1001:
-
-/* Line 1455 of yacc.c  */
 #line 6563 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27683,8 +26307,6 @@
     break;
 
   case 1002:
-
-/* Line 1455 of yacc.c  */
 #line 6571 "gram.y"
     {
 					AlterTableSpaceOptionsStmt *n =
@@ -27697,8 +26319,6 @@
     break;
 
   case 1003:
-
-/* Line 1455 of yacc.c  */
 #line 6580 "gram.y"
     {
 					AlterTableSpaceOptionsStmt *n =
@@ -27711,8 +26331,6 @@
     break;
 
   case 1004:
-
-/* Line 1455 of yacc.c  */
 #line 6589 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27724,8 +26342,6 @@
     break;
 
   case 1005:
-
-/* Line 1455 of yacc.c  */
 #line 6597 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27737,8 +26353,6 @@
     break;
 
   case 1006:
-
-/* Line 1455 of yacc.c  */
 #line 6605 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27750,8 +26364,6 @@
     break;
 
   case 1007:
-
-/* Line 1455 of yacc.c  */
 #line 6613 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27763,8 +26375,6 @@
     break;
 
   case 1008:
-
-/* Line 1455 of yacc.c  */
 #line 6621 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27776,8 +26386,6 @@
     break;
 
   case 1009:
-
-/* Line 1455 of yacc.c  */
 #line 6629 "gram.y"
     {
 					RenameStmt *n = makeNode(RenameStmt);
@@ -27792,36 +26400,26 @@
     break;
 
   case 1010:
-
-/* Line 1455 of yacc.c  */
 #line 6641 "gram.y"
     { (yyval.ival) = COLUMN; ;}
     break;
 
   case 1011:
-
-/* Line 1455 of yacc.c  */
 #line 6642 "gram.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 1012:
-
-/* Line 1455 of yacc.c  */
 #line 6645 "gram.y"
     { (yyval.ival) = 1; ;}
     break;
 
   case 1013:
-
-/* Line 1455 of yacc.c  */
 #line 6646 "gram.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 1014:
-
-/* Line 1455 of yacc.c  */
 #line 6657 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -27834,8 +26432,6 @@
     break;
 
   case 1015:
-
-/* Line 1455 of yacc.c  */
 #line 6666 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -27847,8 +26443,6 @@
     break;
 
   case 1016:
-
-/* Line 1455 of yacc.c  */
 #line 6674 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -27860,8 +26454,6 @@
     break;
 
   case 1017:
-
-/* Line 1455 of yacc.c  */
 #line 6682 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -27873,8 +26465,6 @@
     break;
 
   case 1018:
-
-/* Line 1455 of yacc.c  */
 #line 6690 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -27886,8 +26476,6 @@
     break;
 
   case 1019:
-
-/* Line 1455 of yacc.c  */
 #line 6698 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -27900,8 +26488,6 @@
     break;
 
   case 1020:
-
-/* Line 1455 of yacc.c  */
 #line 6707 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -27914,8 +26500,6 @@
     break;
 
   case 1021:
-
-/* Line 1455 of yacc.c  */
 #line 6716 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -27928,8 +26512,6 @@
     break;
 
   case 1022:
-
-/* Line 1455 of yacc.c  */
 #line 6725 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -27942,8 +26524,6 @@
     break;
 
   case 1023:
-
-/* Line 1455 of yacc.c  */
 #line 6734 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -27955,8 +26535,6 @@
     break;
 
   case 1024:
-
-/* Line 1455 of yacc.c  */
 #line 6742 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -27968,8 +26546,6 @@
     break;
 
   case 1025:
-
-/* Line 1455 of yacc.c  */
 #line 6750 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -27981,8 +26557,6 @@
     break;
 
   case 1026:
-
-/* Line 1455 of yacc.c  */
 #line 6758 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -27994,8 +26568,6 @@
     break;
 
   case 1027:
-
-/* Line 1455 of yacc.c  */
 #line 6766 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -28007,8 +26579,6 @@
     break;
 
   case 1028:
-
-/* Line 1455 of yacc.c  */
 #line 6774 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -28020,8 +26590,6 @@
     break;
 
   case 1029:
-
-/* Line 1455 of yacc.c  */
 #line 6782 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -28033,8 +26601,6 @@
     break;
 
   case 1030:
-
-/* Line 1455 of yacc.c  */
 #line 6790 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -28046,8 +26612,6 @@
     break;
 
   case 1031:
-
-/* Line 1455 of yacc.c  */
 #line 6798 "gram.y"
     {
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -28059,8 +26623,6 @@
     break;
 
   case 1032:
-
-/* Line 1455 of yacc.c  */
 #line 6814 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28073,8 +26635,6 @@
     break;
 
   case 1033:
-
-/* Line 1455 of yacc.c  */
 #line 6823 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28086,8 +26646,6 @@
     break;
 
   case 1034:
-
-/* Line 1455 of yacc.c  */
 #line 6831 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28099,8 +26657,6 @@
     break;
 
   case 1035:
-
-/* Line 1455 of yacc.c  */
 #line 6839 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28112,8 +26668,6 @@
     break;
 
   case 1036:
-
-/* Line 1455 of yacc.c  */
 #line 6847 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28125,8 +26679,6 @@
     break;
 
   case 1037:
-
-/* Line 1455 of yacc.c  */
 #line 6855 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28139,8 +26691,6 @@
     break;
 
   case 1038:
-
-/* Line 1455 of yacc.c  */
 #line 6864 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28152,8 +26702,6 @@
     break;
 
   case 1039:
-
-/* Line 1455 of yacc.c  */
 #line 6872 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28165,8 +26713,6 @@
     break;
 
   case 1040:
-
-/* Line 1455 of yacc.c  */
 #line 6880 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28179,8 +26725,6 @@
     break;
 
   case 1041:
-
-/* Line 1455 of yacc.c  */
 #line 6889 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28193,8 +26737,6 @@
     break;
 
   case 1042:
-
-/* Line 1455 of yacc.c  */
 #line 6898 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28207,8 +26749,6 @@
     break;
 
   case 1043:
-
-/* Line 1455 of yacc.c  */
 #line 6907 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28220,8 +26760,6 @@
     break;
 
   case 1044:
-
-/* Line 1455 of yacc.c  */
 #line 6915 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28233,8 +26771,6 @@
     break;
 
   case 1045:
-
-/* Line 1455 of yacc.c  */
 #line 6923 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28246,8 +26782,6 @@
     break;
 
   case 1046:
-
-/* Line 1455 of yacc.c  */
 #line 6931 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28259,8 +26793,6 @@
     break;
 
   case 1047:
-
-/* Line 1455 of yacc.c  */
 #line 6939 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28272,8 +26804,6 @@
     break;
 
   case 1048:
-
-/* Line 1455 of yacc.c  */
 #line 6947 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28285,8 +26815,6 @@
     break;
 
   case 1049:
-
-/* Line 1455 of yacc.c  */
 #line 6955 "gram.y"
     {
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -28298,8 +26826,6 @@
     break;
 
   case 1050:
-
-/* Line 1455 of yacc.c  */
 #line 6974 "gram.y"
     {
 					RuleStmt *n = makeNode(RuleStmt);
@@ -28315,29 +26841,21 @@
     break;
 
   case 1051:
-
-/* Line 1455 of yacc.c  */
 #line 6988 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1052:
-
-/* Line 1455 of yacc.c  */
 #line 6989 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 1053:
-
-/* Line 1455 of yacc.c  */
 #line 6990 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 1054:
-
-/* Line 1455 of yacc.c  */
 #line 6996 "gram.y"
     { if ((yyvsp[(3) - (3)].node) != NULL)
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node));
@@ -28347,8 +26865,6 @@
     break;
 
   case 1055:
-
-/* Line 1455 of yacc.c  */
 #line 7002 "gram.y"
     { if ((yyvsp[(1) - (1)].node) != NULL)
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].node));
@@ -28358,71 +26874,51 @@
     break;
 
   case 1061:
-
-/* Line 1455 of yacc.c  */
 #line 7018 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1062:
-
-/* Line 1455 of yacc.c  */
 #line 7019 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 1063:
-
-/* Line 1455 of yacc.c  */
 #line 7022 "gram.y"
     { (yyval.ival) = CMD_SELECT; ;}
     break;
 
   case 1064:
-
-/* Line 1455 of yacc.c  */
 #line 7023 "gram.y"
     { (yyval.ival) = CMD_UPDATE; ;}
     break;
 
   case 1065:
-
-/* Line 1455 of yacc.c  */
 #line 7024 "gram.y"
     { (yyval.ival) = CMD_DELETE; ;}
     break;
 
   case 1066:
-
-/* Line 1455 of yacc.c  */
 #line 7025 "gram.y"
     { (yyval.ival) = CMD_INSERT; ;}
     break;
 
   case 1067:
-
-/* Line 1455 of yacc.c  */
 #line 7029 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 1068:
-
-/* Line 1455 of yacc.c  */
 #line 7030 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 1069:
-
-/* Line 1455 of yacc.c  */
 #line 7031 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 1070:
-
-/* Line 1455 of yacc.c  */
 #line 7037 "gram.y"
     {
 					DropPropertyStmt *n = makeNode(DropPropertyStmt);
@@ -28436,8 +26932,6 @@
     break;
 
   case 1071:
-
-/* Line 1455 of yacc.c  */
 #line 7047 "gram.y"
     {
 					DropPropertyStmt *n = makeNode(DropPropertyStmt);
@@ -28451,8 +26945,6 @@
     break;
 
   case 1072:
-
-/* Line 1455 of yacc.c  */
 #line 7068 "gram.y"
     {
 					NotifyStmt *n = makeNode(NotifyStmt);
@@ -28463,22 +26955,16 @@
     break;
 
   case 1073:
-
-/* Line 1455 of yacc.c  */
 #line 7077 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 1074:
-
-/* Line 1455 of yacc.c  */
 #line 7078 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 1075:
-
-/* Line 1455 of yacc.c  */
 #line 7082 "gram.y"
     {
 					ListenStmt *n = makeNode(ListenStmt);
@@ -28488,8 +26974,6 @@
     break;
 
   case 1076:
-
-/* Line 1455 of yacc.c  */
 #line 7091 "gram.y"
     {
 					UnlistenStmt *n = makeNode(UnlistenStmt);
@@ -28499,8 +26983,6 @@
     break;
 
   case 1077:
-
-/* Line 1455 of yacc.c  */
 #line 7097 "gram.y"
     {
 					UnlistenStmt *n = makeNode(UnlistenStmt);
@@ -28510,8 +26992,6 @@
     break;
 
   case 1078:
-
-/* Line 1455 of yacc.c  */
 #line 7116 "gram.y"
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
@@ -28522,8 +27002,6 @@
     break;
 
   case 1079:
-
-/* Line 1455 of yacc.c  */
 #line 7123 "gram.y"
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
@@ -28534,8 +27012,6 @@
     break;
 
   case 1080:
-
-/* Line 1455 of yacc.c  */
 #line 7130 "gram.y"
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
@@ -28546,8 +27022,6 @@
     break;
 
   case 1081:
-
-/* Line 1455 of yacc.c  */
 #line 7137 "gram.y"
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
@@ -28558,8 +27032,6 @@
     break;
 
   case 1082:
-
-/* Line 1455 of yacc.c  */
 #line 7144 "gram.y"
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
@@ -28570,8 +27042,6 @@
     break;
 
   case 1083:
-
-/* Line 1455 of yacc.c  */
 #line 7151 "gram.y"
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
@@ -28582,8 +27052,6 @@
     break;
 
   case 1084:
-
-/* Line 1455 of yacc.c  */
 #line 7158 "gram.y"
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
@@ -28595,8 +27063,6 @@
     break;
 
   case 1085:
-
-/* Line 1455 of yacc.c  */
 #line 7166 "gram.y"
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
@@ -28608,8 +27074,6 @@
     break;
 
   case 1086:
-
-/* Line 1455 of yacc.c  */
 #line 7174 "gram.y"
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
@@ -28621,8 +27085,6 @@
     break;
 
   case 1087:
-
-/* Line 1455 of yacc.c  */
 #line 7182 "gram.y"
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
@@ -28634,8 +27096,6 @@
     break;
 
   case 1088:
-
-/* Line 1455 of yacc.c  */
 #line 7190 "gram.y"
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
@@ -28647,8 +27107,6 @@
     break;
 
   case 1089:
-
-/* Line 1455 of yacc.c  */
 #line 7198 "gram.y"
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
@@ -28659,8 +27117,6 @@
     break;
 
   case 1090:
-
-/* Line 1455 of yacc.c  */
 #line 7205 "gram.y"
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
@@ -28671,8 +27127,6 @@
     break;
 
   case 1091:
-
-/* Line 1455 of yacc.c  */
 #line 7212 "gram.y"
     {
 					TransactionStmt *n = makeNode(TransactionStmt);
@@ -28683,97 +27137,71 @@
     break;
 
   case 1092:
-
-/* Line 1455 of yacc.c  */
 #line 7220 "gram.y"
     {;}
     break;
 
   case 1093:
-
-/* Line 1455 of yacc.c  */
 #line 7221 "gram.y"
     {;}
     break;
 
   case 1094:
-
-/* Line 1455 of yacc.c  */
 #line 7222 "gram.y"
     {;}
     break;
 
   case 1095:
-
-/* Line 1455 of yacc.c  */
 #line 7227 "gram.y"
     { (yyval.defelt) = makeDefElem("transaction_isolation",
 									   makeStringConst((yyvsp[(3) - (3)].str), (yylsp[(3) - (3)]))); ;}
     break;
 
   case 1096:
-
-/* Line 1455 of yacc.c  */
 #line 7230 "gram.y"
     { (yyval.defelt) = makeDefElem("transaction_read_only",
 									   makeIntConst(TRUE, (yylsp[(1) - (2)]))); ;}
     break;
 
   case 1097:
-
-/* Line 1455 of yacc.c  */
 #line 7233 "gram.y"
     { (yyval.defelt) = makeDefElem("transaction_read_only",
 									   makeIntConst(FALSE, (yylsp[(1) - (2)]))); ;}
     break;
 
   case 1098:
-
-/* Line 1455 of yacc.c  */
 #line 7236 "gram.y"
     { (yyval.defelt) = makeDefElem("transaction_deferrable",
 									   makeIntConst(TRUE, (yylsp[(1) - (1)]))); ;}
     break;
 
   case 1099:
-
-/* Line 1455 of yacc.c  */
 #line 7239 "gram.y"
     { (yyval.defelt) = makeDefElem("transaction_deferrable",
 									   makeIntConst(FALSE, (yylsp[(1) - (2)]))); ;}
     break;
 
   case 1100:
-
-/* Line 1455 of yacc.c  */
 #line 7246 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].defelt)); ;}
     break;
 
   case 1101:
-
-/* Line 1455 of yacc.c  */
 #line 7248 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].defelt)); ;}
     break;
 
   case 1102:
-
-/* Line 1455 of yacc.c  */
 #line 7250 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 1104:
-
-/* Line 1455 of yacc.c  */
 #line 7256 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1105:
-
-/* Line 1455 of yacc.c  */
 #line 7270 "gram.y"
     {
 					ViewStmt *n = makeNode(ViewStmt);
@@ -28787,8 +27215,6 @@
     break;
 
   case 1106:
-
-/* Line 1455 of yacc.c  */
 #line 7281 "gram.y"
     {
 					ViewStmt *n = makeNode(ViewStmt);
@@ -28802,8 +27228,6 @@
     break;
 
   case 1107:
-
-/* Line 1455 of yacc.c  */
 #line 7294 "gram.y"
     {
 					ereport(ERROR,
@@ -28813,8 +27237,6 @@
     break;
 
   case 1108:
-
-/* Line 1455 of yacc.c  */
 #line 7300 "gram.y"
     {
 					ereport(ERROR,
@@ -28824,8 +27246,6 @@
     break;
 
   case 1109:
-
-/* Line 1455 of yacc.c  */
 #line 7306 "gram.y"
     {
 					ereport(ERROR,
@@ -28835,15 +27255,11 @@
     break;
 
   case 1110:
-
-/* Line 1455 of yacc.c  */
 #line 7311 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1111:
-
-/* Line 1455 of yacc.c  */
 #line 7322 "gram.y"
     {
 					LoadStmt *n = makeNode(LoadStmt);
@@ -28853,8 +27269,6 @@
     break;
 
   case 1112:
-
-/* Line 1455 of yacc.c  */
 #line 7338 "gram.y"
     {
 					CreatedbStmt *n = makeNode(CreatedbStmt);
@@ -28865,22 +27279,16 @@
     break;
 
   case 1113:
-
-/* Line 1455 of yacc.c  */
 #line 7347 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 1114:
-
-/* Line 1455 of yacc.c  */
 #line 7348 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1115:
-
-/* Line 1455 of yacc.c  */
 #line 7353 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("tablespace", (Node *)makeString((yyvsp[(3) - (3)].str)));
@@ -28888,8 +27296,6 @@
     break;
 
   case 1116:
-
-/* Line 1455 of yacc.c  */
 #line 7357 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("tablespace", NULL);
@@ -28897,8 +27303,6 @@
     break;
 
   case 1117:
-
-/* Line 1455 of yacc.c  */
 #line 7361 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("location", (Node *)makeString((yyvsp[(3) - (3)].str)));
@@ -28906,8 +27310,6 @@
     break;
 
   case 1118:
-
-/* Line 1455 of yacc.c  */
 #line 7365 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("location", NULL);
@@ -28915,8 +27317,6 @@
     break;
 
   case 1119:
-
-/* Line 1455 of yacc.c  */
 #line 7369 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("template", (Node *)makeString((yyvsp[(3) - (3)].str)));
@@ -28924,8 +27324,6 @@
     break;
 
   case 1120:
-
-/* Line 1455 of yacc.c  */
 #line 7373 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("template", NULL);
@@ -28933,8 +27331,6 @@
     break;
 
   case 1121:
-
-/* Line 1455 of yacc.c  */
 #line 7377 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("encoding", (Node *)makeString((yyvsp[(3) - (3)].str)));
@@ -28942,8 +27338,6 @@
     break;
 
   case 1122:
-
-/* Line 1455 of yacc.c  */
 #line 7381 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("encoding", (Node *)makeInteger((yyvsp[(3) - (3)].ival)));
@@ -28951,8 +27345,6 @@
     break;
 
   case 1123:
-
-/* Line 1455 of yacc.c  */
 #line 7385 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("encoding", NULL);
@@ -28960,8 +27352,6 @@
     break;
 
   case 1124:
-
-/* Line 1455 of yacc.c  */
 #line 7389 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("lc_collate", (Node *)makeString((yyvsp[(3) - (3)].str)));
@@ -28969,8 +27359,6 @@
     break;
 
   case 1125:
-
-/* Line 1455 of yacc.c  */
 #line 7393 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("lc_collate", NULL);
@@ -28978,8 +27366,6 @@
     break;
 
   case 1126:
-
-/* Line 1455 of yacc.c  */
 #line 7397 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("lc_ctype", (Node *)makeString((yyvsp[(3) - (3)].str)));
@@ -28987,8 +27373,6 @@
     break;
 
   case 1127:
-
-/* Line 1455 of yacc.c  */
 #line 7401 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("lc_ctype", NULL);
@@ -28996,8 +27380,6 @@
     break;
 
   case 1128:
-
-/* Line 1455 of yacc.c  */
 #line 7405 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("connectionlimit", (Node *)makeInteger((yyvsp[(4) - (4)].ival)));
@@ -29005,8 +27387,6 @@
     break;
 
   case 1129:
-
-/* Line 1455 of yacc.c  */
 #line 7409 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("owner", (Node *)makeString((yyvsp[(3) - (3)].str)));
@@ -29014,8 +27394,6 @@
     break;
 
   case 1130:
-
-/* Line 1455 of yacc.c  */
 #line 7413 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("owner", NULL);
@@ -29023,22 +27401,16 @@
     break;
 
   case 1131:
-
-/* Line 1455 of yacc.c  */
 #line 7422 "gram.y"
     {;}
     break;
 
   case 1132:
-
-/* Line 1455 of yacc.c  */
 #line 7423 "gram.y"
     {;}
     break;
 
   case 1133:
-
-/* Line 1455 of yacc.c  */
 #line 7435 "gram.y"
     {
 					AlterDatabaseStmt *n = makeNode(AlterDatabaseStmt);
@@ -29049,8 +27421,6 @@
     break;
 
   case 1134:
-
-/* Line 1455 of yacc.c  */
 #line 7442 "gram.y"
     {
 					AlterDatabaseStmt *n = makeNode(AlterDatabaseStmt);
@@ -29062,8 +27432,6 @@
     break;
 
   case 1135:
-
-/* Line 1455 of yacc.c  */
 #line 7453 "gram.y"
     {
 					AlterDatabaseSetStmt *n = makeNode(AlterDatabaseSetStmt);
@@ -29074,22 +27442,16 @@
     break;
 
   case 1136:
-
-/* Line 1455 of yacc.c  */
 #line 7463 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 1137:
-
-/* Line 1455 of yacc.c  */
 #line 7464 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1138:
-
-/* Line 1455 of yacc.c  */
 #line 7469 "gram.y"
     {
 					(yyval.defelt) = makeDefElem("connectionlimit", (Node *)makeInteger((yyvsp[(4) - (4)].ival)));
@@ -29097,8 +27459,6 @@
     break;
 
   case 1139:
-
-/* Line 1455 of yacc.c  */
 #line 7483 "gram.y"
     {
 					DropdbStmt *n = makeNode(DropdbStmt);
@@ -29109,8 +27469,6 @@
     break;
 
   case 1140:
-
-/* Line 1455 of yacc.c  */
 #line 7490 "gram.y"
     {
 					DropdbStmt *n = makeNode(DropdbStmt);
@@ -29121,8 +27479,6 @@
     break;
 
   case 1141:
-
-/* Line 1455 of yacc.c  */
 #line 7507 "gram.y"
     {
 					CreateDomainStmt *n = makeNode(CreateDomainStmt);
@@ -29135,8 +27491,6 @@
     break;
 
   case 1142:
-
-/* Line 1455 of yacc.c  */
 #line 7520 "gram.y"
     {
 					AlterDomainStmt *n = makeNode(AlterDomainStmt);
@@ -29148,8 +27502,6 @@
     break;
 
   case 1143:
-
-/* Line 1455 of yacc.c  */
 #line 7529 "gram.y"
     {
 					AlterDomainStmt *n = makeNode(AlterDomainStmt);
@@ -29160,8 +27512,6 @@
     break;
 
   case 1144:
-
-/* Line 1455 of yacc.c  */
 #line 7537 "gram.y"
     {
 					AlterDomainStmt *n = makeNode(AlterDomainStmt);
@@ -29172,8 +27522,6 @@
     break;
 
   case 1145:
-
-/* Line 1455 of yacc.c  */
 #line 7545 "gram.y"
     {
 					AlterDomainStmt *n = makeNode(AlterDomainStmt);
@@ -29185,8 +27533,6 @@
     break;
 
   case 1146:
-
-/* Line 1455 of yacc.c  */
 #line 7554 "gram.y"
     {
 					AlterDomainStmt *n = makeNode(AlterDomainStmt);
@@ -29199,22 +27545,16 @@
     break;
 
   case 1147:
-
-/* Line 1455 of yacc.c  */
 #line 7564 "gram.y"
     {;}
     break;
 
   case 1148:
-
-/* Line 1455 of yacc.c  */
 #line 7565 "gram.y"
     {;}
     break;
 
   case 1149:
-
-/* Line 1455 of yacc.c  */
 #line 7577 "gram.y"
     {
 					AlterTSDictionaryStmt *n = makeNode(AlterTSDictionaryStmt);
@@ -29225,8 +27565,6 @@
     break;
 
   case 1150:
-
-/* Line 1455 of yacc.c  */
 #line 7587 "gram.y"
     {
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
@@ -29240,8 +27578,6 @@
     break;
 
   case 1151:
-
-/* Line 1455 of yacc.c  */
 #line 7597 "gram.y"
     {
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
@@ -29255,8 +27591,6 @@
     break;
 
   case 1152:
-
-/* Line 1455 of yacc.c  */
 #line 7607 "gram.y"
     {
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
@@ -29270,8 +27604,6 @@
     break;
 
   case 1153:
-
-/* Line 1455 of yacc.c  */
 #line 7617 "gram.y"
     {
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
@@ -29285,8 +27617,6 @@
     break;
 
   case 1154:
-
-/* Line 1455 of yacc.c  */
 #line 7627 "gram.y"
     {
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
@@ -29298,8 +27628,6 @@
     break;
 
   case 1155:
-
-/* Line 1455 of yacc.c  */
 #line 7635 "gram.y"
     {
 					AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
@@ -29311,8 +27639,6 @@
     break;
 
   case 1156:
-
-/* Line 1455 of yacc.c  */
 #line 7657 "gram.y"
     {
 			  CreateConversionStmt *n = makeNode(CreateConversionStmt);
@@ -29326,8 +27652,6 @@
     break;
 
   case 1157:
-
-/* Line 1455 of yacc.c  */
 #line 7679 "gram.y"
     {
 			       ClusterStmt *n = makeNode(ClusterStmt);
@@ -29339,8 +27663,6 @@
     break;
 
   case 1158:
-
-/* Line 1455 of yacc.c  */
 #line 7687 "gram.y"
     {
 				   ClusterStmt *n = makeNode(ClusterStmt);
@@ -29352,8 +27674,6 @@
     break;
 
   case 1159:
-
-/* Line 1455 of yacc.c  */
 #line 7696 "gram.y"
     {
 				   ClusterStmt *n = makeNode(ClusterStmt);
@@ -29365,22 +27685,16 @@
     break;
 
   case 1160:
-
-/* Line 1455 of yacc.c  */
 #line 7706 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 1161:
-
-/* Line 1455 of yacc.c  */
 #line 7707 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 1162:
-
-/* Line 1455 of yacc.c  */
 #line 7720 "gram.y"
     {
 					VacuumStmt *n = makeNode(VacuumStmt);
@@ -29398,8 +27712,6 @@
     break;
 
   case 1163:
-
-/* Line 1455 of yacc.c  */
 #line 7734 "gram.y"
     {
 					VacuumStmt *n = makeNode(VacuumStmt);
@@ -29417,8 +27729,6 @@
     break;
 
   case 1164:
-
-/* Line 1455 of yacc.c  */
 #line 7748 "gram.y"
     {
 					VacuumStmt *n = (VacuumStmt *) (yyvsp[(5) - (5)].node);
@@ -29434,8 +27744,6 @@
     break;
 
   case 1165:
-
-/* Line 1455 of yacc.c  */
 #line 7760 "gram.y"
     {
 					VacuumStmt *n = makeNode(VacuumStmt);
@@ -29451,8 +27759,6 @@
     break;
 
   case 1166:
-
-/* Line 1455 of yacc.c  */
 #line 7772 "gram.y"
     {
 					VacuumStmt *n = makeNode(VacuumStmt);
@@ -29470,50 +27776,36 @@
     break;
 
   case 1167:
-
-/* Line 1455 of yacc.c  */
 #line 7788 "gram.y"
     { (yyval.ival) = (yyvsp[(1) - (1)].ival); ;}
     break;
 
   case 1168:
-
-/* Line 1455 of yacc.c  */
 #line 7789 "gram.y"
     { (yyval.ival) = (yyvsp[(1) - (3)].ival) | (yyvsp[(3) - (3)].ival); ;}
     break;
 
   case 1169:
-
-/* Line 1455 of yacc.c  */
 #line 7793 "gram.y"
     { (yyval.ival) = VACOPT_ANALYZE; ;}
     break;
 
   case 1170:
-
-/* Line 1455 of yacc.c  */
 #line 7794 "gram.y"
     { (yyval.ival) = VACOPT_VERBOSE; ;}
     break;
 
   case 1171:
-
-/* Line 1455 of yacc.c  */
 #line 7795 "gram.y"
     { (yyval.ival) = VACOPT_FREEZE; ;}
     break;
 
   case 1172:
-
-/* Line 1455 of yacc.c  */
 #line 7796 "gram.y"
     { (yyval.ival) = VACOPT_FULL; ;}
     break;
 
   case 1173:
-
-/* Line 1455 of yacc.c  */
 #line 7801 "gram.y"
     {
 					VacuumStmt *n = makeNode(VacuumStmt);
@@ -29529,8 +27821,6 @@
     break;
 
   case 1174:
-
-/* Line 1455 of yacc.c  */
 #line 7813 "gram.y"
     {
 					VacuumStmt *n = makeNode(VacuumStmt);
@@ -29546,78 +27836,56 @@
     break;
 
   case 1175:
-
-/* Line 1455 of yacc.c  */
 #line 7827 "gram.y"
     {;}
     break;
 
   case 1176:
-
-/* Line 1455 of yacc.c  */
 #line 7828 "gram.y"
     {;}
     break;
 
   case 1177:
-
-/* Line 1455 of yacc.c  */
 #line 7832 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 1178:
-
-/* Line 1455 of yacc.c  */
 #line 7833 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 1179:
-
-/* Line 1455 of yacc.c  */
 #line 7836 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 1180:
-
-/* Line 1455 of yacc.c  */
 #line 7837 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 1181:
-
-/* Line 1455 of yacc.c  */
 #line 7840 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 1182:
-
-/* Line 1455 of yacc.c  */
 #line 7841 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 1183:
-
-/* Line 1455 of yacc.c  */
 #line 7845 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 1184:
-
-/* Line 1455 of yacc.c  */
 #line 7846 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1185:
-
-/* Line 1455 of yacc.c  */
 #line 7860 "gram.y"
     {
 					ExplainStmt *n = makeNode(ExplainStmt);
@@ -29628,8 +27896,6 @@
     break;
 
   case 1186:
-
-/* Line 1455 of yacc.c  */
 #line 7867 "gram.y"
     {
 					ExplainStmt *n = makeNode(ExplainStmt);
@@ -29643,8 +27909,6 @@
     break;
 
   case 1187:
-
-/* Line 1455 of yacc.c  */
 #line 7877 "gram.y"
     {
 					ExplainStmt *n = makeNode(ExplainStmt);
@@ -29655,8 +27919,6 @@
     break;
 
   case 1188:
-
-/* Line 1455 of yacc.c  */
 #line 7884 "gram.y"
     {
 					ExplainStmt *n = makeNode(ExplainStmt);
@@ -29667,8 +27929,6 @@
     break;
 
   case 1196:
-
-/* Line 1455 of yacc.c  */
 #line 7904 "gram.y"
     {
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].defelt));
@@ -29676,8 +27936,6 @@
     break;
 
   case 1197:
-
-/* Line 1455 of yacc.c  */
 #line 7908 "gram.y"
     {
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].defelt));
@@ -29685,8 +27943,6 @@
     break;
 
   case 1198:
-
-/* Line 1455 of yacc.c  */
 #line 7915 "gram.y"
     {
 					(yyval.defelt) = makeDefElem((yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].node));
@@ -29694,50 +27950,36 @@
     break;
 
   case 1199:
-
-/* Line 1455 of yacc.c  */
 #line 7921 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1200:
-
-/* Line 1455 of yacc.c  */
 #line 7922 "gram.y"
     { (yyval.str) = "analyze"; ;}
     break;
 
   case 1201:
-
-/* Line 1455 of yacc.c  */
 #line 7923 "gram.y"
     { (yyval.str) = "verbose"; ;}
     break;
 
   case 1202:
-
-/* Line 1455 of yacc.c  */
 #line 7927 "gram.y"
     { (yyval.node) = (Node *) makeString((yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 1203:
-
-/* Line 1455 of yacc.c  */
 #line 7928 "gram.y"
     { (yyval.node) = (Node *) (yyvsp[(1) - (1)].value); ;}
     break;
 
   case 1204:
-
-/* Line 1455 of yacc.c  */
 #line 7929 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 1205:
-
-/* Line 1455 of yacc.c  */
 #line 7940 "gram.y"
     {
 					PrepareStmt *n = makeNode(PrepareStmt);
@@ -29749,22 +27991,16 @@
     break;
 
   case 1206:
-
-/* Line 1455 of yacc.c  */
 #line 7949 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 1207:
-
-/* Line 1455 of yacc.c  */
 #line 7950 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1212:
-
-/* Line 1455 of yacc.c  */
 #line 7968 "gram.y"
     {
 					ExecuteStmt *n = makeNode(ExecuteStmt);
@@ -29776,8 +28012,6 @@
     break;
 
   case 1213:
-
-/* Line 1455 of yacc.c  */
 #line 7977 "gram.y"
     {
 					ExecuteStmt *n = makeNode(ExecuteStmt);
@@ -29795,22 +28029,16 @@
     break;
 
   case 1214:
-
-/* Line 1455 of yacc.c  */
 #line 7992 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 1215:
-
-/* Line 1455 of yacc.c  */
 #line 7993 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1216:
-
-/* Line 1455 of yacc.c  */
 #line 8004 "gram.y"
     {
 						DeallocateStmt *n = makeNode(DeallocateStmt);
@@ -29820,8 +28048,6 @@
     break;
 
   case 1217:
-
-/* Line 1455 of yacc.c  */
 #line 8010 "gram.y"
     {
 						DeallocateStmt *n = makeNode(DeallocateStmt);
@@ -29831,8 +28057,6 @@
     break;
 
   case 1218:
-
-/* Line 1455 of yacc.c  */
 #line 8016 "gram.y"
     {
 						DeallocateStmt *n = makeNode(DeallocateStmt);
@@ -29842,8 +28066,6 @@
     break;
 
   case 1219:
-
-/* Line 1455 of yacc.c  */
 #line 8022 "gram.y"
     {
 						DeallocateStmt *n = makeNode(DeallocateStmt);
@@ -29853,8 +28075,6 @@
     break;
 
   case 1220:
-
-/* Line 1455 of yacc.c  */
 #line 8038 "gram.y"
     {
 					(yyvsp[(5) - (6)].istmt)->relation = (yyvsp[(4) - (6)].range);
@@ -29865,8 +28085,6 @@
     break;
 
   case 1221:
-
-/* Line 1455 of yacc.c  */
 #line 8048 "gram.y"
     {
 					(yyval.istmt) = makeNode(InsertStmt);
@@ -29876,8 +28094,6 @@
     break;
 
   case 1222:
-
-/* Line 1455 of yacc.c  */
 #line 8054 "gram.y"
     {
 					(yyval.istmt) = makeNode(InsertStmt);
@@ -29887,8 +28103,6 @@
     break;
 
   case 1223:
-
-/* Line 1455 of yacc.c  */
 #line 8060 "gram.y"
     {
 					(yyval.istmt) = makeNode(InsertStmt);
@@ -29898,22 +28112,16 @@
     break;
 
   case 1224:
-
-/* Line 1455 of yacc.c  */
 #line 8069 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].target)); ;}
     break;
 
   case 1225:
-
-/* Line 1455 of yacc.c  */
 #line 8071 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].target)); ;}
     break;
 
   case 1226:
-
-/* Line 1455 of yacc.c  */
 #line 8076 "gram.y"
     {
 					(yyval.target) = makeNode(ResTarget);
@@ -29925,22 +28133,16 @@
     break;
 
   case 1227:
-
-/* Line 1455 of yacc.c  */
 #line 8086 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 1228:
-
-/* Line 1455 of yacc.c  */
 #line 8087 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1229:
-
-/* Line 1455 of yacc.c  */
 #line 8100 "gram.y"
     {
 					DeleteStmt *n = makeNode(DeleteStmt);
@@ -29954,22 +28156,16 @@
     break;
 
   case 1230:
-
-/* Line 1455 of yacc.c  */
 #line 8112 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 1231:
-
-/* Line 1455 of yacc.c  */
 #line 8113 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1232:
-
-/* Line 1455 of yacc.c  */
 #line 8125 "gram.y"
     {
 					LockStmt *n = makeNode(LockStmt);
@@ -29982,92 +28178,66 @@
     break;
 
   case 1233:
-
-/* Line 1455 of yacc.c  */
 #line 8135 "gram.y"
     { (yyval.ival) = (yyvsp[(2) - (3)].ival); ;}
     break;
 
   case 1234:
-
-/* Line 1455 of yacc.c  */
 #line 8136 "gram.y"
     { (yyval.ival) = AccessExclusiveLock; ;}
     break;
 
   case 1235:
-
-/* Line 1455 of yacc.c  */
 #line 8139 "gram.y"
     { (yyval.ival) = AccessShareLock; ;}
     break;
 
   case 1236:
-
-/* Line 1455 of yacc.c  */
 #line 8140 "gram.y"
     { (yyval.ival) = RowShareLock; ;}
     break;
 
   case 1237:
-
-/* Line 1455 of yacc.c  */
 #line 8141 "gram.y"
     { (yyval.ival) = RowExclusiveLock; ;}
     break;
 
   case 1238:
-
-/* Line 1455 of yacc.c  */
 #line 8142 "gram.y"
     { (yyval.ival) = ShareUpdateExclusiveLock; ;}
     break;
 
   case 1239:
-
-/* Line 1455 of yacc.c  */
 #line 8143 "gram.y"
     { (yyval.ival) = ShareLock; ;}
     break;
 
   case 1240:
-
-/* Line 1455 of yacc.c  */
 #line 8144 "gram.y"
     { (yyval.ival) = ShareRowExclusiveLock; ;}
     break;
 
   case 1241:
-
-/* Line 1455 of yacc.c  */
 #line 8145 "gram.y"
     { (yyval.ival) = ExclusiveLock; ;}
     break;
 
   case 1242:
-
-/* Line 1455 of yacc.c  */
 #line 8146 "gram.y"
     { (yyval.ival) = AccessExclusiveLock; ;}
     break;
 
   case 1243:
-
-/* Line 1455 of yacc.c  */
 #line 8149 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 1244:
-
-/* Line 1455 of yacc.c  */
 #line 8150 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 1245:
-
-/* Line 1455 of yacc.c  */
 #line 8166 "gram.y"
     {
 					UpdateStmt *n = makeNode(UpdateStmt);
@@ -30082,36 +28252,26 @@
     break;
 
   case 1246:
-
-/* Line 1455 of yacc.c  */
 #line 8179 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 1247:
-
-/* Line 1455 of yacc.c  */
 #line 8180 "gram.y"
     { (yyval.list) = list_concat((yyvsp[(1) - (3)].list),(yyvsp[(3) - (3)].list)); ;}
     break;
 
   case 1248:
-
-/* Line 1455 of yacc.c  */
 #line 8184 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].target)); ;}
     break;
 
   case 1249:
-
-/* Line 1455 of yacc.c  */
 #line 8185 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 1250:
-
-/* Line 1455 of yacc.c  */
 #line 8190 "gram.y"
     {
 					(yyval.target) = (yyvsp[(1) - (3)].target);
@@ -30120,8 +28280,6 @@
     break;
 
   case 1251:
-
-/* Line 1455 of yacc.c  */
 #line 8198 "gram.y"
     {
 					ListCell *col_cell;
@@ -30150,8 +28308,6 @@
     break;
 
   case 1252:
-
-/* Line 1455 of yacc.c  */
 #line 8226 "gram.y"
     {
 					(yyval.target) = makeNode(ResTarget);
@@ -30163,22 +28319,16 @@
     break;
 
   case 1253:
-
-/* Line 1455 of yacc.c  */
 #line 8236 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].target)); ;}
     break;
 
   case 1254:
-
-/* Line 1455 of yacc.c  */
 #line 8237 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list),(yyvsp[(3) - (3)].target)); ;}
     break;
 
   case 1255:
-
-/* Line 1455 of yacc.c  */
 #line 8248 "gram.y"
     {
 					DeclareCursorStmt *n = makeNode(DeclareCursorStmt);
@@ -30191,92 +28341,66 @@
     break;
 
   case 1256:
-
-/* Line 1455 of yacc.c  */
 #line 8258 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1257:
-
-/* Line 1455 of yacc.c  */
 #line 8261 "gram.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 1258:
-
-/* Line 1455 of yacc.c  */
 #line 8262 "gram.y"
     { (yyval.ival) = (yyvsp[(1) - (3)].ival) | CURSOR_OPT_NO_SCROLL; ;}
     break;
 
   case 1259:
-
-/* Line 1455 of yacc.c  */
 #line 8263 "gram.y"
     { (yyval.ival) = (yyvsp[(1) - (2)].ival) | CURSOR_OPT_SCROLL; ;}
     break;
 
   case 1260:
-
-/* Line 1455 of yacc.c  */
 #line 8264 "gram.y"
     { (yyval.ival) = (yyvsp[(1) - (2)].ival) | CURSOR_OPT_BINARY; ;}
     break;
 
   case 1261:
-
-/* Line 1455 of yacc.c  */
 #line 8265 "gram.y"
     { (yyval.ival) = (yyvsp[(1) - (2)].ival) | CURSOR_OPT_INSENSITIVE; ;}
     break;
 
   case 1262:
-
-/* Line 1455 of yacc.c  */
 #line 8268 "gram.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 1263:
-
-/* Line 1455 of yacc.c  */
 #line 8269 "gram.y"
     { (yyval.ival) = CURSOR_OPT_HOLD; ;}
     break;
 
   case 1264:
-
-/* Line 1455 of yacc.c  */
 #line 8270 "gram.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 1267:
-
-/* Line 1455 of yacc.c  */
 #line 8323 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (3)].node); ;}
     break;
 
   case 1268:
-
-/* Line 1455 of yacc.c  */
 #line 8324 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (3)].node); ;}
     break;
 
   case 1269:
-
-/* Line 1455 of yacc.c  */
 #line 8338 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1270:
-
-/* Line 1455 of yacc.c  */
 #line 8340 "gram.y"
     {
 					insertSelectOptions((SelectStmt *) (yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].list), NIL,
@@ -30287,8 +28411,6 @@
     break;
 
   case 1271:
-
-/* Line 1455 of yacc.c  */
 #line 8347 "gram.y"
     {
 					insertSelectOptions((SelectStmt *) (yyvsp[(1) - (4)].node), (yyvsp[(2) - (4)].list), (yyvsp[(3) - (4)].list),
@@ -30300,8 +28422,6 @@
     break;
 
   case 1272:
-
-/* Line 1455 of yacc.c  */
 #line 8355 "gram.y"
     {
 					insertSelectOptions((SelectStmt *) (yyvsp[(1) - (4)].node), (yyvsp[(2) - (4)].list), (yyvsp[(4) - (4)].list),
@@ -30313,8 +28433,6 @@
     break;
 
   case 1273:
-
-/* Line 1455 of yacc.c  */
 #line 8363 "gram.y"
     {
 					insertSelectOptions((SelectStmt *) (yyvsp[(2) - (2)].node), NULL, NIL,
@@ -30326,8 +28444,6 @@
     break;
 
   case 1274:
-
-/* Line 1455 of yacc.c  */
 #line 8371 "gram.y"
     {
 					insertSelectOptions((SelectStmt *) (yyvsp[(2) - (3)].node), (yyvsp[(3) - (3)].list), NIL,
@@ -30339,8 +28455,6 @@
     break;
 
   case 1275:
-
-/* Line 1455 of yacc.c  */
 #line 8379 "gram.y"
     {
 					insertSelectOptions((SelectStmt *) (yyvsp[(2) - (5)].node), (yyvsp[(3) - (5)].list), (yyvsp[(4) - (5)].list),
@@ -30352,8 +28466,6 @@
     break;
 
   case 1276:
-
-/* Line 1455 of yacc.c  */
 #line 8387 "gram.y"
     {
 					insertSelectOptions((SelectStmt *) (yyvsp[(2) - (5)].node), (yyvsp[(3) - (5)].list), (yyvsp[(5) - (5)].list),
@@ -30365,22 +28477,16 @@
     break;
 
   case 1277:
-
-/* Line 1455 of yacc.c  */
 #line 8397 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1278:
-
-/* Line 1455 of yacc.c  */
 #line 8398 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1279:
-
-/* Line 1455 of yacc.c  */
 #line 8428 "gram.y"
     {
 					SelectStmt *n = makeNode(SelectStmt);
@@ -30397,15 +28503,11 @@
     break;
 
   case 1280:
-
-/* Line 1455 of yacc.c  */
 #line 8440 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1281:
-
-/* Line 1455 of yacc.c  */
 #line 8442 "gram.y"
     {
 					/* same as SELECT * FROM relation_expr */
@@ -30428,8 +28530,6 @@
     break;
 
   case 1282:
-
-/* Line 1455 of yacc.c  */
 #line 8461 "gram.y"
     {
 					(yyval.node) = makeSetOp(SETOP_UNION, (yyvsp[(3) - (4)].boolean), (yyvsp[(1) - (4)].node), (yyvsp[(4) - (4)].node));
@@ -30437,8 +28537,6 @@
     break;
 
   case 1283:
-
-/* Line 1455 of yacc.c  */
 #line 8465 "gram.y"
     {
 					(yyval.node) = makeSetOp(SETOP_INTERSECT, (yyvsp[(3) - (4)].boolean), (yyvsp[(1) - (4)].node), (yyvsp[(4) - (4)].node));
@@ -30446,8 +28544,6 @@
     break;
 
   case 1284:
-
-/* Line 1455 of yacc.c  */
 #line 8469 "gram.y"
     {
 					(yyval.node) = makeSetOp(SETOP_EXCEPT, (yyvsp[(3) - (4)].boolean), (yyvsp[(1) - (4)].node), (yyvsp[(4) - (4)].node));
@@ -30455,8 +28551,6 @@
     break;
 
   case 1285:
-
-/* Line 1455 of yacc.c  */
 #line 8484 "gram.y"
     {
 				(yyval.with) = makeNode(WithClause);
@@ -30467,8 +28561,6 @@
     break;
 
   case 1286:
-
-/* Line 1455 of yacc.c  */
 #line 8491 "gram.y"
     {
 				(yyval.with) = makeNode(WithClause);
@@ -30479,22 +28571,16 @@
     break;
 
   case 1287:
-
-/* Line 1455 of yacc.c  */
 #line 8500 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 1288:
-
-/* Line 1455 of yacc.c  */
 #line 8501 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 1289:
-
-/* Line 1455 of yacc.c  */
 #line 8505 "gram.y"
     {
 				CommonTableExpr *n = makeNode(CommonTableExpr);
@@ -30507,22 +28593,16 @@
     break;
 
   case 1290:
-
-/* Line 1455 of yacc.c  */
 #line 8516 "gram.y"
     { (yyval.with) = (yyvsp[(1) - (1)].with); ;}
     break;
 
   case 1291:
-
-/* Line 1455 of yacc.c  */
 #line 8517 "gram.y"
     { (yyval.with) = NULL; ;}
     break;
 
   case 1292:
-
-/* Line 1455 of yacc.c  */
 #line 8522 "gram.y"
     {
 					(yyval.into) = makeNode(IntoClause);
@@ -30535,15 +28615,11 @@
     break;
 
   case 1293:
-
-/* Line 1455 of yacc.c  */
 #line 8531 "gram.y"
     { (yyval.into) = NULL; ;}
     break;
 
   case 1294:
-
-/* Line 1455 of yacc.c  */
 #line 8540 "gram.y"
     {
 					(yyval.range) = (yyvsp[(3) - (3)].range);
@@ -30552,8 +28628,6 @@
     break;
 
   case 1295:
-
-/* Line 1455 of yacc.c  */
 #line 8545 "gram.y"
     {
 					(yyval.range) = (yyvsp[(3) - (3)].range);
@@ -30562,8 +28636,6 @@
     break;
 
   case 1296:
-
-/* Line 1455 of yacc.c  */
 #line 8550 "gram.y"
     {
 					(yyval.range) = (yyvsp[(4) - (4)].range);
@@ -30572,8 +28644,6 @@
     break;
 
   case 1297:
-
-/* Line 1455 of yacc.c  */
 #line 8555 "gram.y"
     {
 					(yyval.range) = (yyvsp[(4) - (4)].range);
@@ -30582,8 +28652,6 @@
     break;
 
   case 1298:
-
-/* Line 1455 of yacc.c  */
 #line 8560 "gram.y"
     {
 					(yyval.range) = (yyvsp[(4) - (4)].range);
@@ -30592,8 +28660,6 @@
     break;
 
   case 1299:
-
-/* Line 1455 of yacc.c  */
 #line 8565 "gram.y"
     {
 					(yyval.range) = (yyvsp[(4) - (4)].range);
@@ -30602,8 +28668,6 @@
     break;
 
   case 1300:
-
-/* Line 1455 of yacc.c  */
 #line 8570 "gram.y"
     {
 					(yyval.range) = (yyvsp[(3) - (3)].range);
@@ -30612,8 +28676,6 @@
     break;
 
   case 1301:
-
-/* Line 1455 of yacc.c  */
 #line 8575 "gram.y"
     {
 					(yyval.range) = (yyvsp[(2) - (2)].range);
@@ -30622,8 +28684,6 @@
     break;
 
   case 1302:
-
-/* Line 1455 of yacc.c  */
 #line 8580 "gram.y"
     {
 					(yyval.range) = (yyvsp[(1) - (1)].range);
@@ -30632,106 +28692,76 @@
     break;
 
   case 1303:
-
-/* Line 1455 of yacc.c  */
 #line 8586 "gram.y"
     {;}
     break;
 
   case 1304:
-
-/* Line 1455 of yacc.c  */
 #line 8587 "gram.y"
     {;}
     break;
 
   case 1305:
-
-/* Line 1455 of yacc.c  */
 #line 8590 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 1306:
-
-/* Line 1455 of yacc.c  */
 #line 8591 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 1307:
-
-/* Line 1455 of yacc.c  */
 #line 8592 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 1308:
-
-/* Line 1455 of yacc.c  */
 #line 8599 "gram.y"
     { (yyval.list) = list_make1(NIL); ;}
     break;
 
   case 1309:
-
-/* Line 1455 of yacc.c  */
 #line 8600 "gram.y"
     { (yyval.list) = (yyvsp[(4) - (5)].list); ;}
     break;
 
   case 1310:
-
-/* Line 1455 of yacc.c  */
 #line 8601 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1311:
-
-/* Line 1455 of yacc.c  */
 #line 8602 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1312:
-
-/* Line 1455 of yacc.c  */
 #line 8606 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list);;}
     break;
 
   case 1313:
-
-/* Line 1455 of yacc.c  */
 #line 8607 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1314:
-
-/* Line 1455 of yacc.c  */
 #line 8611 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (3)].list); ;}
     break;
 
   case 1315:
-
-/* Line 1455 of yacc.c  */
 #line 8615 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].sortby)); ;}
     break;
 
   case 1316:
-
-/* Line 1455 of yacc.c  */
 #line 8616 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].sortby)); ;}
     break;
 
   case 1317:
-
-/* Line 1455 of yacc.c  */
 #line 8620 "gram.y"
     {
 					(yyval.sortby) = makeNode(SortBy);
@@ -30744,8 +28774,6 @@
     break;
 
   case 1318:
-
-/* Line 1455 of yacc.c  */
 #line 8629 "gram.y"
     {
 					(yyval.sortby) = makeNode(SortBy);
@@ -30758,57 +28786,41 @@
     break;
 
   case 1319:
-
-/* Line 1455 of yacc.c  */
 #line 8641 "gram.y"
     { (yyval.list) = list_make2((yyvsp[(2) - (2)].node), (yyvsp[(1) - (2)].node)); ;}
     break;
 
   case 1320:
-
-/* Line 1455 of yacc.c  */
 #line 8642 "gram.y"
     { (yyval.list) = list_make2((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].node)); ;}
     break;
 
   case 1321:
-
-/* Line 1455 of yacc.c  */
 #line 8643 "gram.y"
     { (yyval.list) = list_make2(NULL, (yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 1322:
-
-/* Line 1455 of yacc.c  */
 #line 8644 "gram.y"
     { (yyval.list) = list_make2((yyvsp[(1) - (1)].node), NULL); ;}
     break;
 
   case 1323:
-
-/* Line 1455 of yacc.c  */
 #line 8648 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 1324:
-
-/* Line 1455 of yacc.c  */
 #line 8649 "gram.y"
     { (yyval.list) = list_make2(NULL,NULL); ;}
     break;
 
   case 1325:
-
-/* Line 1455 of yacc.c  */
 #line 8654 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (2)].node); ;}
     break;
 
   case 1326:
-
-/* Line 1455 of yacc.c  */
 #line 8656 "gram.y"
     {
 					/* Disabled because it was too confusing, bjm 2002-02-18 */
@@ -30821,36 +28833,26 @@
     break;
 
   case 1327:
-
-/* Line 1455 of yacc.c  */
 #line 8666 "gram.y"
     { (yyval.node) = (yyvsp[(3) - (5)].node); ;}
     break;
 
   case 1328:
-
-/* Line 1455 of yacc.c  */
 #line 8671 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (2)].node); ;}
     break;
 
   case 1329:
-
-/* Line 1455 of yacc.c  */
 #line 8674 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (3)].node); ;}
     break;
 
   case 1330:
-
-/* Line 1455 of yacc.c  */
 #line 8678 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1331:
-
-/* Line 1455 of yacc.c  */
 #line 8680 "gram.y"
     {
 					/* LIMIT ALL is represented as a NULL constant */
@@ -30859,141 +28861,101 @@
     break;
 
   case 1332:
-
-/* Line 1455 of yacc.c  */
 #line 8687 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1333:
-
-/* Line 1455 of yacc.c  */
 #line 8697 "gram.y"
     { (yyval.node) = makeIntConst((yyvsp[(1) - (1)].ival), (yylsp[(1) - (1)])); ;}
     break;
 
   case 1334:
-
-/* Line 1455 of yacc.c  */
 #line 8698 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (3)].node); ;}
     break;
 
   case 1335:
-
-/* Line 1455 of yacc.c  */
 #line 8699 "gram.y"
     { (yyval.node) = makeIntConst(1, -1); ;}
     break;
 
   case 1336:
-
-/* Line 1455 of yacc.c  */
 #line 8707 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1337:
-
-/* Line 1455 of yacc.c  */
 #line 8711 "gram.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 1338:
-
-/* Line 1455 of yacc.c  */
 #line 8712 "gram.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 1339:
-
-/* Line 1455 of yacc.c  */
 #line 8715 "gram.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 1340:
-
-/* Line 1455 of yacc.c  */
 #line 8716 "gram.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 1341:
-
-/* Line 1455 of yacc.c  */
 #line 8721 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (3)].list); ;}
     break;
 
   case 1342:
-
-/* Line 1455 of yacc.c  */
 #line 8722 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1343:
-
-/* Line 1455 of yacc.c  */
 #line 8726 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (2)].node); ;}
     break;
 
   case 1344:
-
-/* Line 1455 of yacc.c  */
 #line 8727 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 1345:
-
-/* Line 1455 of yacc.c  */
 #line 8731 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 1346:
-
-/* Line 1455 of yacc.c  */
 #line 8732 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1347:
-
-/* Line 1455 of yacc.c  */
 #line 8736 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 1348:
-
-/* Line 1455 of yacc.c  */
 #line 8737 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1349:
-
-/* Line 1455 of yacc.c  */
 #line 8741 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 1350:
-
-/* Line 1455 of yacc.c  */
 #line 8742 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].node)); ;}
     break;
 
   case 1351:
-
-/* Line 1455 of yacc.c  */
 #line 8747 "gram.y"
     {
 					LockingClause *n = makeNode(LockingClause);
@@ -31005,8 +28967,6 @@
     break;
 
   case 1352:
-
-/* Line 1455 of yacc.c  */
 #line 8755 "gram.y"
     {
 					LockingClause *n = makeNode(LockingClause);
@@ -31018,22 +28978,16 @@
     break;
 
   case 1353:
-
-/* Line 1455 of yacc.c  */
 #line 8765 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 1354:
-
-/* Line 1455 of yacc.c  */
 #line 8766 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1355:
-
-/* Line 1455 of yacc.c  */
 #line 8772 "gram.y"
     {
 					SelectStmt *n = makeNode(SelectStmt);
@@ -31043,8 +28997,6 @@
     break;
 
   case 1356:
-
-/* Line 1455 of yacc.c  */
 #line 8778 "gram.y"
     {
 					SelectStmt *n = (SelectStmt *) (yyvsp[(1) - (3)].node);
@@ -31054,36 +29006,26 @@
     break;
 
   case 1357:
-
-/* Line 1455 of yacc.c  */
 #line 8795 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 1358:
-
-/* Line 1455 of yacc.c  */
 #line 8796 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1359:
-
-/* Line 1455 of yacc.c  */
 #line 8800 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 1360:
-
-/* Line 1455 of yacc.c  */
 #line 8801 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 1361:
-
-/* Line 1455 of yacc.c  */
 #line 8812 "gram.y"
     {
 					(yyval.node) = (Node *) (yyvsp[(1) - (1)].range);
@@ -31091,8 +29033,6 @@
     break;
 
   case 1362:
-
-/* Line 1455 of yacc.c  */
 #line 8816 "gram.y"
     {
 					(yyvsp[(1) - (2)].range)->alias = (yyvsp[(2) - (2)].alias);
@@ -31101,8 +29041,6 @@
     break;
 
   case 1363:
-
-/* Line 1455 of yacc.c  */
 #line 8821 "gram.y"
     {
 					RangeFunction *n = makeNode(RangeFunction);
@@ -31113,8 +29051,6 @@
     break;
 
   case 1364:
-
-/* Line 1455 of yacc.c  */
 #line 8828 "gram.y"
     {
 					RangeFunction *n = makeNode(RangeFunction);
@@ -31126,8 +29062,6 @@
     break;
 
   case 1365:
-
-/* Line 1455 of yacc.c  */
 #line 8836 "gram.y"
     {
 					RangeFunction *n = makeNode(RangeFunction);
@@ -31138,8 +29072,6 @@
     break;
 
   case 1366:
-
-/* Line 1455 of yacc.c  */
 #line 8843 "gram.y"
     {
 					RangeFunction *n = makeNode(RangeFunction);
@@ -31153,8 +29085,6 @@
     break;
 
   case 1367:
-
-/* Line 1455 of yacc.c  */
 #line 8853 "gram.y"
     {
 					RangeFunction *n = makeNode(RangeFunction);
@@ -31168,8 +29098,6 @@
     break;
 
   case 1368:
-
-/* Line 1455 of yacc.c  */
 #line 8863 "gram.y"
     {
 					/*
@@ -31201,8 +29129,6 @@
     break;
 
   case 1369:
-
-/* Line 1455 of yacc.c  */
 #line 8891 "gram.y"
     {
 					RangeSubselect *n = makeNode(RangeSubselect);
@@ -31213,8 +29139,6 @@
     break;
 
   case 1370:
-
-/* Line 1455 of yacc.c  */
 #line 8898 "gram.y"
     {
 					(yyval.node) = (Node *) (yyvsp[(1) - (1)].jexpr);
@@ -31222,8 +29146,6 @@
     break;
 
   case 1371:
-
-/* Line 1455 of yacc.c  */
 #line 8902 "gram.y"
     {
 					(yyvsp[(2) - (4)].jexpr)->alias = (yyvsp[(4) - (4)].alias);
@@ -31232,8 +29154,6 @@
     break;
 
   case 1372:
-
-/* Line 1455 of yacc.c  */
 #line 8928 "gram.y"
     {
 					(yyval.jexpr) = (yyvsp[(2) - (3)].jexpr);
@@ -31241,8 +29161,6 @@
     break;
 
   case 1373:
-
-/* Line 1455 of yacc.c  */
 #line 8932 "gram.y"
     {
 					/* CROSS JOIN is same as unqualified inner join */
@@ -31258,8 +29176,6 @@
     break;
 
   case 1374:
-
-/* Line 1455 of yacc.c  */
 #line 8944 "gram.y"
     {
 					JoinExpr *n = makeNode(JoinExpr);
@@ -31276,8 +29192,6 @@
     break;
 
   case 1375:
-
-/* Line 1455 of yacc.c  */
 #line 8957 "gram.y"
     {
 					/* letting join_type reduce to empty doesn't work */
@@ -31295,8 +29209,6 @@
     break;
 
   case 1376:
-
-/* Line 1455 of yacc.c  */
 #line 8971 "gram.y"
     {
 					JoinExpr *n = makeNode(JoinExpr);
@@ -31311,8 +29223,6 @@
     break;
 
   case 1377:
-
-/* Line 1455 of yacc.c  */
 #line 8982 "gram.y"
     {
 					/* letting join_type reduce to empty doesn't work */
@@ -31328,8 +29238,6 @@
     break;
 
   case 1378:
-
-/* Line 1455 of yacc.c  */
 #line 8997 "gram.y"
     {
 					(yyval.alias) = makeNode(Alias);
@@ -31339,8 +29247,6 @@
     break;
 
   case 1379:
-
-/* Line 1455 of yacc.c  */
 #line 9003 "gram.y"
     {
 					(yyval.alias) = makeNode(Alias);
@@ -31349,8 +29255,6 @@
     break;
 
   case 1380:
-
-/* Line 1455 of yacc.c  */
 #line 9008 "gram.y"
     {
 					(yyval.alias) = makeNode(Alias);
@@ -31360,8 +29264,6 @@
     break;
 
   case 1381:
-
-/* Line 1455 of yacc.c  */
 #line 9014 "gram.y"
     {
 					(yyval.alias) = makeNode(Alias);
@@ -31370,64 +29272,46 @@
     break;
 
   case 1382:
-
-/* Line 1455 of yacc.c  */
 #line 9020 "gram.y"
     { (yyval.jtype) = JOIN_FULL; ;}
     break;
 
   case 1383:
-
-/* Line 1455 of yacc.c  */
 #line 9021 "gram.y"
     { (yyval.jtype) = JOIN_LEFT; ;}
     break;
 
   case 1384:
-
-/* Line 1455 of yacc.c  */
 #line 9022 "gram.y"
     { (yyval.jtype) = JOIN_RIGHT; ;}
     break;
 
   case 1385:
-
-/* Line 1455 of yacc.c  */
 #line 9023 "gram.y"
     { (yyval.jtype) = JOIN_INNER; ;}
     break;
 
   case 1386:
-
-/* Line 1455 of yacc.c  */
 #line 9027 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 1387:
-
-/* Line 1455 of yacc.c  */
 #line 9028 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 1388:
-
-/* Line 1455 of yacc.c  */
 #line 9040 "gram.y"
     { (yyval.node) = (Node *) (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 1389:
-
-/* Line 1455 of yacc.c  */
 #line 9041 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (2)].node); ;}
     break;
 
   case 1390:
-
-/* Line 1455 of yacc.c  */
 #line 9047 "gram.y"
     {
 					/* default inheritance */
@@ -31438,8 +29322,6 @@
     break;
 
   case 1391:
-
-/* Line 1455 of yacc.c  */
 #line 9054 "gram.y"
     {
 					/* inheritance query */
@@ -31450,8 +29332,6 @@
     break;
 
   case 1392:
-
-/* Line 1455 of yacc.c  */
 #line 9061 "gram.y"
     {
 					/* no inheritance */
@@ -31462,8 +29342,6 @@
     break;
 
   case 1393:
-
-/* Line 1455 of yacc.c  */
 #line 9068 "gram.y"
     {
 					/* no inheritance, SQL99-style syntax */
@@ -31474,22 +29352,16 @@
     break;
 
   case 1394:
-
-/* Line 1455 of yacc.c  */
 #line 9078 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].range)); ;}
     break;
 
   case 1395:
-
-/* Line 1455 of yacc.c  */
 #line 9079 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].range)); ;}
     break;
 
   case 1396:
-
-/* Line 1455 of yacc.c  */
 #line 9093 "gram.y"
     {
 					(yyval.range) = (yyvsp[(1) - (1)].range);
@@ -31497,8 +29369,6 @@
     break;
 
   case 1397:
-
-/* Line 1455 of yacc.c  */
 #line 9097 "gram.y"
     {
 					Alias *alias = makeNode(Alias);
@@ -31509,8 +29379,6 @@
     break;
 
   case 1398:
-
-/* Line 1455 of yacc.c  */
 #line 9104 "gram.y"
     {
 					Alias *alias = makeNode(Alias);
@@ -31521,36 +29389,26 @@
     break;
 
   case 1399:
-
-/* Line 1455 of yacc.c  */
 #line 9113 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1400:
-
-/* Line 1455 of yacc.c  */
 #line 9118 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (2)].node); ;}
     break;
 
   case 1401:
-
-/* Line 1455 of yacc.c  */
 #line 9119 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 1402:
-
-/* Line 1455 of yacc.c  */
 #line 9124 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (2)].node); ;}
     break;
 
   case 1403:
-
-/* Line 1455 of yacc.c  */
 #line 9126 "gram.y"
     {
 					CurrentOfExpr *n = makeNode(CurrentOfExpr);
@@ -31562,29 +29420,21 @@
     break;
 
   case 1404:
-
-/* Line 1455 of yacc.c  */
 #line 9133 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 1405:
-
-/* Line 1455 of yacc.c  */
 #line 9138 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 1406:
-
-/* Line 1455 of yacc.c  */
 #line 9139 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1407:
-
-/* Line 1455 of yacc.c  */
 #line 9144 "gram.y"
     {
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].node));
@@ -31592,8 +29442,6 @@
     break;
 
   case 1408:
-
-/* Line 1455 of yacc.c  */
 #line 9148 "gram.y"
     {
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node));
@@ -31601,8 +29449,6 @@
     break;
 
   case 1409:
-
-/* Line 1455 of yacc.c  */
 #line 9154 "gram.y"
     {
 					ColumnDef *n = makeNode(ColumnDef);
@@ -31623,8 +29469,6 @@
     break;
 
   case 1410:
-
-/* Line 1455 of yacc.c  */
 #line 9183 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (2)].typnam);
@@ -31633,8 +29477,6 @@
     break;
 
   case 1411:
-
-/* Line 1455 of yacc.c  */
 #line 9188 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(2) - (3)].typnam);
@@ -31644,8 +29486,6 @@
     break;
 
   case 1412:
-
-/* Line 1455 of yacc.c  */
 #line 9195 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (5)].typnam);
@@ -31654,8 +29494,6 @@
     break;
 
   case 1413:
-
-/* Line 1455 of yacc.c  */
 #line 9200 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(2) - (6)].typnam);
@@ -31665,8 +29503,6 @@
     break;
 
   case 1414:
-
-/* Line 1455 of yacc.c  */
 #line 9206 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (2)].typnam);
@@ -31675,8 +29511,6 @@
     break;
 
   case 1415:
-
-/* Line 1455 of yacc.c  */
 #line 9211 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(2) - (3)].typnam);
@@ -31686,64 +29520,46 @@
     break;
 
   case 1416:
-
-/* Line 1455 of yacc.c  */
 #line 9220 "gram.y"
     {  (yyval.list) = lappend((yyvsp[(1) - (3)].list), makeInteger(-1)); ;}
     break;
 
   case 1417:
-
-/* Line 1455 of yacc.c  */
 #line 9222 "gram.y"
     {  (yyval.list) = lappend((yyvsp[(1) - (4)].list), makeInteger((yyvsp[(3) - (4)].ival))); ;}
     break;
 
   case 1418:
-
-/* Line 1455 of yacc.c  */
 #line 9224 "gram.y"
     {  (yyval.list) = NIL; ;}
     break;
 
   case 1419:
-
-/* Line 1455 of yacc.c  */
 #line 9228 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1420:
-
-/* Line 1455 of yacc.c  */
 #line 9229 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1421:
-
-/* Line 1455 of yacc.c  */
 #line 9230 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1422:
-
-/* Line 1455 of yacc.c  */
 #line 9231 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1423:
-
-/* Line 1455 of yacc.c  */
 #line 9232 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1424:
-
-/* Line 1455 of yacc.c  */
 #line 9234 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (2)].typnam);
@@ -31752,8 +29568,6 @@
     break;
 
   case 1425:
-
-/* Line 1455 of yacc.c  */
 #line 9239 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (5)].typnam);
@@ -31773,36 +29587,26 @@
     break;
 
   case 1426:
-
-/* Line 1455 of yacc.c  */
 #line 9268 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1427:
-
-/* Line 1455 of yacc.c  */
 #line 9269 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1428:
-
-/* Line 1455 of yacc.c  */
 #line 9270 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1429:
-
-/* Line 1455 of yacc.c  */
 #line 9271 "gram.y"
     { (yyval.typnam) = (yyvsp[(1) - (1)].typnam); ;}
     break;
 
   case 1430:
-
-/* Line 1455 of yacc.c  */
 #line 9283 "gram.y"
     {
 					(yyval.typnam) = makeTypeName((yyvsp[(1) - (2)].str));
@@ -31812,8 +29616,6 @@
     break;
 
   case 1431:
-
-/* Line 1455 of yacc.c  */
 #line 9289 "gram.y"
     {
 					(yyval.typnam) = makeTypeNameFromNameList(lcons(makeString((yyvsp[(1) - (3)].str)), (yyvsp[(2) - (3)].list)));
@@ -31823,22 +29625,16 @@
     break;
 
   case 1432:
-
-/* Line 1455 of yacc.c  */
 #line 9296 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 1433:
-
-/* Line 1455 of yacc.c  */
 #line 9297 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1434:
-
-/* Line 1455 of yacc.c  */
 #line 9304 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("int4");
@@ -31847,8 +29643,6 @@
     break;
 
   case 1435:
-
-/* Line 1455 of yacc.c  */
 #line 9309 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("int4");
@@ -31857,8 +29651,6 @@
     break;
 
   case 1436:
-
-/* Line 1455 of yacc.c  */
 #line 9314 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("int2");
@@ -31867,8 +29659,6 @@
     break;
 
   case 1437:
-
-/* Line 1455 of yacc.c  */
 #line 9319 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("int8");
@@ -31877,8 +29667,6 @@
     break;
 
   case 1438:
-
-/* Line 1455 of yacc.c  */
 #line 9324 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("float4");
@@ -31887,8 +29675,6 @@
     break;
 
   case 1439:
-
-/* Line 1455 of yacc.c  */
 #line 9329 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(2) - (2)].typnam);
@@ -31897,8 +29683,6 @@
     break;
 
   case 1440:
-
-/* Line 1455 of yacc.c  */
 #line 9334 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("float8");
@@ -31907,8 +29691,6 @@
     break;
 
   case 1441:
-
-/* Line 1455 of yacc.c  */
 #line 9339 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("numeric");
@@ -31918,8 +29700,6 @@
     break;
 
   case 1442:
-
-/* Line 1455 of yacc.c  */
 #line 9345 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("numeric");
@@ -31929,8 +29709,6 @@
     break;
 
   case 1443:
-
-/* Line 1455 of yacc.c  */
 #line 9351 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("numeric");
@@ -31940,8 +29718,6 @@
     break;
 
   case 1444:
-
-/* Line 1455 of yacc.c  */
 #line 9357 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("bool");
@@ -31950,8 +29726,6 @@
     break;
 
   case 1445:
-
-/* Line 1455 of yacc.c  */
 #line 9364 "gram.y"
     {
 					/*
@@ -31976,8 +29750,6 @@
     break;
 
   case 1446:
-
-/* Line 1455 of yacc.c  */
 #line 9385 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("float8");
@@ -31985,8 +29757,6 @@
     break;
 
   case 1447:
-
-/* Line 1455 of yacc.c  */
 #line 9395 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (1)].typnam);
@@ -31994,8 +29764,6 @@
     break;
 
   case 1448:
-
-/* Line 1455 of yacc.c  */
 #line 9399 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (1)].typnam);
@@ -32003,8 +29771,6 @@
     break;
 
   case 1449:
-
-/* Line 1455 of yacc.c  */
 #line 9407 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (1)].typnam);
@@ -32012,8 +29778,6 @@
     break;
 
   case 1450:
-
-/* Line 1455 of yacc.c  */
 #line 9411 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (1)].typnam);
@@ -32022,8 +29786,6 @@
     break;
 
   case 1451:
-
-/* Line 1455 of yacc.c  */
 #line 9419 "gram.y"
     {
 					char *typname;
@@ -32036,8 +29798,6 @@
     break;
 
   case 1452:
-
-/* Line 1455 of yacc.c  */
 #line 9431 "gram.y"
     {
 					/* bit defaults to bit(1), varbit to no limit */
@@ -32055,8 +29815,6 @@
     break;
 
   case 1453:
-
-/* Line 1455 of yacc.c  */
 #line 9452 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (1)].typnam);
@@ -32064,8 +29822,6 @@
     break;
 
   case 1454:
-
-/* Line 1455 of yacc.c  */
 #line 9456 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (1)].typnam);
@@ -32073,8 +29829,6 @@
     break;
 
   case 1455:
-
-/* Line 1455 of yacc.c  */
 #line 9462 "gram.y"
     {
 					(yyval.typnam) = (yyvsp[(1) - (1)].typnam);
@@ -32082,8 +29836,6 @@
     break;
 
   case 1456:
-
-/* Line 1455 of yacc.c  */
 #line 9466 "gram.y"
     {
 					/* Length was not specified so allow to be unrestricted.
@@ -32098,8 +29850,6 @@
     break;
 
   case 1457:
-
-/* Line 1455 of yacc.c  */
 #line 9479 "gram.y"
     {
 					if (((yyvsp[(5) - (5)].str) != NULL) && (strcmp((yyvsp[(5) - (5)].str), "sql_text") != 0))
@@ -32120,8 +29870,6 @@
     break;
 
   case 1458:
-
-/* Line 1455 of yacc.c  */
 #line 9498 "gram.y"
     {
 					if (((yyvsp[(2) - (2)].str) != NULL) && (strcmp((yyvsp[(2) - (2)].str), "sql_text") != 0))
@@ -32146,78 +29894,56 @@
     break;
 
   case 1459:
-
-/* Line 1455 of yacc.c  */
 #line 9521 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].boolean) ? "varchar": "bpchar"; ;}
     break;
 
   case 1460:
-
-/* Line 1455 of yacc.c  */
 #line 9523 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].boolean) ? "varchar": "bpchar"; ;}
     break;
 
   case 1461:
-
-/* Line 1455 of yacc.c  */
 #line 9525 "gram.y"
     { (yyval.str) = "varchar"; ;}
     break;
 
   case 1462:
-
-/* Line 1455 of yacc.c  */
 #line 9527 "gram.y"
     { (yyval.str) = (yyvsp[(3) - (3)].boolean) ? "varchar": "bpchar"; ;}
     break;
 
   case 1463:
-
-/* Line 1455 of yacc.c  */
 #line 9529 "gram.y"
     { (yyval.str) = (yyvsp[(3) - (3)].boolean) ? "varchar": "bpchar"; ;}
     break;
 
   case 1464:
-
-/* Line 1455 of yacc.c  */
 #line 9531 "gram.y"
     { (yyval.str) = (yyvsp[(2) - (2)].boolean) ? "varchar": "bpchar"; ;}
     break;
 
   case 1465:
-
-/* Line 1455 of yacc.c  */
 #line 9535 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 1466:
-
-/* Line 1455 of yacc.c  */
 #line 9536 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 1467:
-
-/* Line 1455 of yacc.c  */
 #line 9540 "gram.y"
     { (yyval.str) = (yyvsp[(3) - (3)].str); ;}
     break;
 
   case 1468:
-
-/* Line 1455 of yacc.c  */
 #line 9541 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 1469:
-
-/* Line 1455 of yacc.c  */
 #line 9549 "gram.y"
     {
 					if ((yyvsp[(5) - (5)].boolean))
@@ -32230,8 +29956,6 @@
     break;
 
   case 1470:
-
-/* Line 1455 of yacc.c  */
 #line 9558 "gram.y"
     {
 					if ((yyvsp[(2) - (2)].boolean))
@@ -32243,8 +29967,6 @@
     break;
 
   case 1471:
-
-/* Line 1455 of yacc.c  */
 #line 9566 "gram.y"
     {
 					if ((yyvsp[(5) - (5)].boolean))
@@ -32257,8 +29979,6 @@
     break;
 
   case 1472:
-
-/* Line 1455 of yacc.c  */
 #line 9575 "gram.y"
     {
 					if ((yyvsp[(2) - (2)].boolean))
@@ -32270,8 +29990,6 @@
     break;
 
   case 1473:
-
-/* Line 1455 of yacc.c  */
 #line 9586 "gram.y"
     {
 					(yyval.typnam) = SystemTypeName("interval");
@@ -32280,71 +29998,51 @@
     break;
 
   case 1474:
-
-/* Line 1455 of yacc.c  */
 #line 9593 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 1475:
-
-/* Line 1455 of yacc.c  */
 #line 9594 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 1476:
-
-/* Line 1455 of yacc.c  */
 #line 9595 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 1477:
-
-/* Line 1455 of yacc.c  */
 #line 9600 "gram.y"
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(YEAR), (yylsp[(1) - (1)]))); ;}
     break;
 
   case 1478:
-
-/* Line 1455 of yacc.c  */
 #line 9602 "gram.y"
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(MONTH), (yylsp[(1) - (1)]))); ;}
     break;
 
   case 1479:
-
-/* Line 1455 of yacc.c  */
 #line 9604 "gram.y"
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(DAY), (yylsp[(1) - (1)]))); ;}
     break;
 
   case 1480:
-
-/* Line 1455 of yacc.c  */
 #line 9606 "gram.y"
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(HOUR), (yylsp[(1) - (1)]))); ;}
     break;
 
   case 1481:
-
-/* Line 1455 of yacc.c  */
 #line 9608 "gram.y"
     { (yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(MINUTE), (yylsp[(1) - (1)]))); ;}
     break;
 
   case 1482:
-
-/* Line 1455 of yacc.c  */
 #line 9610 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 1483:
-
-/* Line 1455 of yacc.c  */
 #line 9612 "gram.y"
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(YEAR) |
@@ -32353,8 +30051,6 @@
     break;
 
   case 1484:
-
-/* Line 1455 of yacc.c  */
 #line 9617 "gram.y"
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(DAY) |
@@ -32363,8 +30059,6 @@
     break;
 
   case 1485:
-
-/* Line 1455 of yacc.c  */
 #line 9622 "gram.y"
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(DAY) |
@@ -32374,8 +30068,6 @@
     break;
 
   case 1486:
-
-/* Line 1455 of yacc.c  */
 #line 9628 "gram.y"
     {
 					(yyval.list) = (yyvsp[(3) - (3)].list);
@@ -32387,8 +30079,6 @@
     break;
 
   case 1487:
-
-/* Line 1455 of yacc.c  */
 #line 9636 "gram.y"
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(HOUR) |
@@ -32397,8 +30087,6 @@
     break;
 
   case 1488:
-
-/* Line 1455 of yacc.c  */
 #line 9641 "gram.y"
     {
 					(yyval.list) = (yyvsp[(3) - (3)].list);
@@ -32409,8 +30097,6 @@
     break;
 
   case 1489:
-
-/* Line 1455 of yacc.c  */
 #line 9648 "gram.y"
     {
 					(yyval.list) = (yyvsp[(3) - (3)].list);
@@ -32420,15 +30106,11 @@
     break;
 
   case 1490:
-
-/* Line 1455 of yacc.c  */
 #line 9654 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1491:
-
-/* Line 1455 of yacc.c  */
 #line 9659 "gram.y"
     {
 					(yyval.list) = list_make1(makeIntConst(INTERVAL_MASK(SECOND), (yylsp[(1) - (1)])));
@@ -32436,8 +30118,6 @@
     break;
 
   case 1492:
-
-/* Line 1455 of yacc.c  */
 #line 9663 "gram.y"
     {
 					(yyval.list) = list_make2(makeIntConst(INTERVAL_MASK(SECOND), (yylsp[(1) - (4)])),
@@ -32446,22 +30126,16 @@
     break;
 
   case 1493:
-
-/* Line 1455 of yacc.c  */
 #line 9692 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1494:
-
-/* Line 1455 of yacc.c  */
 #line 9694 "gram.y"
     { (yyval.node) = makeTypeCast((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].typnam), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1495:
-
-/* Line 1455 of yacc.c  */
 #line 9696 "gram.y"
     {
 					CollateClause *n = makeNode(CollateClause);
@@ -32473,8 +30147,6 @@
     break;
 
   case 1496:
-
-/* Line 1455 of yacc.c  */
 #line 9704 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -32491,134 +30163,96 @@
     break;
 
   case 1497:
-
-/* Line 1455 of yacc.c  */
 #line 9726 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "+", NULL, (yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 1498:
-
-/* Line 1455 of yacc.c  */
 #line 9728 "gram.y"
     { (yyval.node) = doNegate((yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 1499:
-
-/* Line 1455 of yacc.c  */
 #line 9730 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "+", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1500:
-
-/* Line 1455 of yacc.c  */
 #line 9732 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "-", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1501:
-
-/* Line 1455 of yacc.c  */
 #line 9734 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "*", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1502:
-
-/* Line 1455 of yacc.c  */
 #line 9736 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "/", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1503:
-
-/* Line 1455 of yacc.c  */
 #line 9738 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "%", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1504:
-
-/* Line 1455 of yacc.c  */
 #line 9740 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "^", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1505:
-
-/* Line 1455 of yacc.c  */
 #line 9742 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "<", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1506:
-
-/* Line 1455 of yacc.c  */
 #line 9744 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, ">", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1507:
-
-/* Line 1455 of yacc.c  */
 #line 9746 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "=", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1508:
-
-/* Line 1455 of yacc.c  */
 #line 9749 "gram.y"
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[(2) - (3)].list), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1509:
-
-/* Line 1455 of yacc.c  */
 #line 9751 "gram.y"
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[(1) - (2)].list), NULL, (yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 1510:
-
-/* Line 1455 of yacc.c  */
 #line 9753 "gram.y"
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[(2) - (2)].list), (yyvsp[(1) - (2)].node), NULL, (yylsp[(2) - (2)])); ;}
     break;
 
   case 1511:
-
-/* Line 1455 of yacc.c  */
 #line 9756 "gram.y"
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_AND, NIL, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1512:
-
-/* Line 1455 of yacc.c  */
 #line 9758 "gram.y"
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OR, NIL, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1513:
-
-/* Line 1455 of yacc.c  */
 #line 9760 "gram.y"
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_NOT, NIL, NULL, (yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 1514:
-
-/* Line 1455 of yacc.c  */
 #line 9763 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "~~", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1515:
-
-/* Line 1455 of yacc.c  */
 #line 9765 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -32635,15 +30269,11 @@
     break;
 
   case 1516:
-
-/* Line 1455 of yacc.c  */
 #line 9778 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "!~~", (yyvsp[(1) - (4)].node), (yyvsp[(4) - (4)].node), (yylsp[(2) - (4)])); ;}
     break;
 
   case 1517:
-
-/* Line 1455 of yacc.c  */
 #line 9780 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -32660,15 +30290,11 @@
     break;
 
   case 1518:
-
-/* Line 1455 of yacc.c  */
 #line 9793 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "~~*", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1519:
-
-/* Line 1455 of yacc.c  */
 #line 9795 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -32685,15 +30311,11 @@
     break;
 
   case 1520:
-
-/* Line 1455 of yacc.c  */
 #line 9808 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "!~~*", (yyvsp[(1) - (4)].node), (yyvsp[(4) - (4)].node), (yylsp[(2) - (4)])); ;}
     break;
 
   case 1521:
-
-/* Line 1455 of yacc.c  */
 #line 9810 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -32710,8 +30332,6 @@
     break;
 
   case 1522:
-
-/* Line 1455 of yacc.c  */
 #line 9824 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -32728,8 +30348,6 @@
     break;
 
   case 1523:
-
-/* Line 1455 of yacc.c  */
 #line 9837 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -32746,8 +30364,6 @@
     break;
 
   case 1524:
-
-/* Line 1455 of yacc.c  */
 #line 9850 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -32764,8 +30380,6 @@
     break;
 
   case 1525:
-
-/* Line 1455 of yacc.c  */
 #line 9863 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -32782,8 +30396,6 @@
     break;
 
   case 1526:
-
-/* Line 1455 of yacc.c  */
 #line 9886 "gram.y"
     {
 					NullTest *n = makeNode(NullTest);
@@ -32794,8 +30406,6 @@
     break;
 
   case 1527:
-
-/* Line 1455 of yacc.c  */
 #line 9893 "gram.y"
     {
 					NullTest *n = makeNode(NullTest);
@@ -32806,8 +30416,6 @@
     break;
 
   case 1528:
-
-/* Line 1455 of yacc.c  */
 #line 9900 "gram.y"
     {
 					NullTest *n = makeNode(NullTest);
@@ -32818,8 +30426,6 @@
     break;
 
   case 1529:
-
-/* Line 1455 of yacc.c  */
 #line 9907 "gram.y"
     {
 					NullTest *n = makeNode(NullTest);
@@ -32830,8 +30436,6 @@
     break;
 
   case 1530:
-
-/* Line 1455 of yacc.c  */
 #line 9914 "gram.y"
     {
 					(yyval.node) = (Node *)makeOverlaps((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].list), (yylsp[(2) - (3)]), yyscanner);
@@ -32839,8 +30443,6 @@
     break;
 
   case 1531:
-
-/* Line 1455 of yacc.c  */
 #line 9918 "gram.y"
     {
 					BooleanTest *b = makeNode(BooleanTest);
@@ -32851,8 +30453,6 @@
     break;
 
   case 1532:
-
-/* Line 1455 of yacc.c  */
 #line 9925 "gram.y"
     {
 					BooleanTest *b = makeNode(BooleanTest);
@@ -32863,8 +30463,6 @@
     break;
 
   case 1533:
-
-/* Line 1455 of yacc.c  */
 #line 9932 "gram.y"
     {
 					BooleanTest *b = makeNode(BooleanTest);
@@ -32875,8 +30473,6 @@
     break;
 
   case 1534:
-
-/* Line 1455 of yacc.c  */
 #line 9939 "gram.y"
     {
 					BooleanTest *b = makeNode(BooleanTest);
@@ -32887,8 +30483,6 @@
     break;
 
   case 1535:
-
-/* Line 1455 of yacc.c  */
 #line 9946 "gram.y"
     {
 					BooleanTest *b = makeNode(BooleanTest);
@@ -32899,8 +30493,6 @@
     break;
 
   case 1536:
-
-/* Line 1455 of yacc.c  */
 #line 9953 "gram.y"
     {
 					BooleanTest *b = makeNode(BooleanTest);
@@ -32911,8 +30503,6 @@
     break;
 
   case 1537:
-
-/* Line 1455 of yacc.c  */
 #line 9960 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_DISTINCT, "=", (yyvsp[(1) - (5)].node), (yyvsp[(5) - (5)].node), (yylsp[(2) - (5)]));
@@ -32920,8 +30510,6 @@
     break;
 
   case 1538:
-
-/* Line 1455 of yacc.c  */
 #line 9964 "gram.y"
     {
 					(yyval.node) = (Node *) makeA_Expr(AEXPR_NOT, NIL, NULL,
@@ -32933,8 +30521,6 @@
     break;
 
   case 1539:
-
-/* Line 1455 of yacc.c  */
 #line 9972 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OF, "=", (yyvsp[(1) - (6)].node), (Node *) (yyvsp[(5) - (6)].list), (yylsp[(2) - (6)]));
@@ -32942,8 +30528,6 @@
     break;
 
   case 1540:
-
-/* Line 1455 of yacc.c  */
 #line 9976 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OF, "<>", (yyvsp[(1) - (7)].node), (Node *) (yyvsp[(6) - (7)].list), (yylsp[(2) - (7)]));
@@ -32951,8 +30535,6 @@
     break;
 
   case 1541:
-
-/* Line 1455 of yacc.c  */
 #line 9986 "gram.y"
     {
 					(yyval.node) = (Node *) makeA_Expr(AEXPR_AND, NIL,
@@ -32963,8 +30545,6 @@
     break;
 
   case 1542:
-
-/* Line 1455 of yacc.c  */
 #line 9993 "gram.y"
     {
 					(yyval.node) = (Node *) makeA_Expr(AEXPR_OR, NIL,
@@ -32975,8 +30555,6 @@
     break;
 
   case 1543:
-
-/* Line 1455 of yacc.c  */
 #line 10000 "gram.y"
     {
 					(yyval.node) = (Node *) makeA_Expr(AEXPR_OR, NIL,
@@ -32993,8 +30571,6 @@
     break;
 
   case 1544:
-
-/* Line 1455 of yacc.c  */
 #line 10013 "gram.y"
     {
 					(yyval.node) = (Node *) makeA_Expr(AEXPR_AND, NIL,
@@ -33011,8 +30587,6 @@
     break;
 
   case 1545:
-
-/* Line 1455 of yacc.c  */
 #line 10026 "gram.y"
     {
 					/* in_expr returns a SubLink or a list of a_exprs */
@@ -33035,8 +30609,6 @@
     break;
 
   case 1546:
-
-/* Line 1455 of yacc.c  */
 #line 10045 "gram.y"
     {
 					/* in_expr returns a SubLink or a list of a_exprs */
@@ -33061,8 +30633,6 @@
     break;
 
   case 1547:
-
-/* Line 1455 of yacc.c  */
 #line 10066 "gram.y"
     {
 					SubLink *n = makeNode(SubLink);
@@ -33076,8 +30646,6 @@
     break;
 
   case 1548:
-
-/* Line 1455 of yacc.c  */
 #line 10076 "gram.y"
     {
 					if ((yyvsp[(3) - (6)].ival) == ANY_SUBLINK)
@@ -33088,8 +30656,6 @@
     break;
 
   case 1549:
-
-/* Line 1455 of yacc.c  */
 #line 10083 "gram.y"
     {
 					/* Not sure how to get rid of the parentheses
@@ -33109,8 +30675,6 @@
     break;
 
   case 1550:
-
-/* Line 1455 of yacc.c  */
 #line 10099 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_DOCUMENT, NULL, NIL,
@@ -33119,8 +30683,6 @@
     break;
 
   case 1551:
-
-/* Line 1455 of yacc.c  */
 #line 10104 "gram.y"
     {
 					(yyval.node) = (Node *) makeA_Expr(AEXPR_NOT, NIL, NULL,
@@ -33131,120 +30693,86 @@
     break;
 
   case 1552:
-
-/* Line 1455 of yacc.c  */
 #line 10122 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1553:
-
-/* Line 1455 of yacc.c  */
 #line 10124 "gram.y"
     { (yyval.node) = makeTypeCast((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].typnam), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1554:
-
-/* Line 1455 of yacc.c  */
 #line 10126 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "+", NULL, (yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 1555:
-
-/* Line 1455 of yacc.c  */
 #line 10128 "gram.y"
     { (yyval.node) = doNegate((yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 1556:
-
-/* Line 1455 of yacc.c  */
 #line 10130 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "+", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1557:
-
-/* Line 1455 of yacc.c  */
 #line 10132 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "-", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1558:
-
-/* Line 1455 of yacc.c  */
 #line 10134 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "*", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1559:
-
-/* Line 1455 of yacc.c  */
 #line 10136 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "/", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1560:
-
-/* Line 1455 of yacc.c  */
 #line 10138 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "%", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1561:
-
-/* Line 1455 of yacc.c  */
 #line 10140 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "^", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1562:
-
-/* Line 1455 of yacc.c  */
 #line 10142 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "<", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1563:
-
-/* Line 1455 of yacc.c  */
 #line 10144 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, ">", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1564:
-
-/* Line 1455 of yacc.c  */
 #line 10146 "gram.y"
     { (yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OP, "=", (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1565:
-
-/* Line 1455 of yacc.c  */
 #line 10148 "gram.y"
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[(2) - (3)].list), (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node), (yylsp[(2) - (3)])); ;}
     break;
 
   case 1566:
-
-/* Line 1455 of yacc.c  */
 #line 10150 "gram.y"
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[(1) - (2)].list), NULL, (yyvsp[(2) - (2)].node), (yylsp[(1) - (2)])); ;}
     break;
 
   case 1567:
-
-/* Line 1455 of yacc.c  */
 #line 10152 "gram.y"
     { (yyval.node) = (Node *) makeA_Expr(AEXPR_OP, (yyvsp[(2) - (2)].list), (yyvsp[(1) - (2)].node), NULL, (yylsp[(2) - (2)])); ;}
     break;
 
   case 1568:
-
-/* Line 1455 of yacc.c  */
 #line 10154 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_DISTINCT, "=", (yyvsp[(1) - (5)].node), (yyvsp[(5) - (5)].node), (yylsp[(2) - (5)]));
@@ -33252,8 +30780,6 @@
     break;
 
   case 1569:
-
-/* Line 1455 of yacc.c  */
 #line 10158 "gram.y"
     {
 					(yyval.node) = (Node *) makeA_Expr(AEXPR_NOT, NIL,
@@ -33262,8 +30788,6 @@
     break;
 
   case 1570:
-
-/* Line 1455 of yacc.c  */
 #line 10163 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OF, "=", (yyvsp[(1) - (6)].node), (Node *) (yyvsp[(5) - (6)].list), (yylsp[(2) - (6)]));
@@ -33271,8 +30795,6 @@
     break;
 
   case 1571:
-
-/* Line 1455 of yacc.c  */
 #line 10167 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_OF, "<>", (yyvsp[(1) - (7)].node), (Node *) (yyvsp[(6) - (7)].list), (yylsp[(2) - (7)]));
@@ -33280,8 +30802,6 @@
     break;
 
   case 1572:
-
-/* Line 1455 of yacc.c  */
 #line 10171 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_DOCUMENT, NULL, NIL,
@@ -33290,8 +30810,6 @@
     break;
 
   case 1573:
-
-/* Line 1455 of yacc.c  */
 #line 10176 "gram.y"
     {
 					(yyval.node) = (Node *) makeA_Expr(AEXPR_NOT, NIL, NULL,
@@ -33302,22 +30820,16 @@
     break;
 
   case 1574:
-
-/* Line 1455 of yacc.c  */
 #line 10192 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1575:
-
-/* Line 1455 of yacc.c  */
 #line 10193 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1576:
-
-/* Line 1455 of yacc.c  */
 #line 10195 "gram.y"
     {
 					ParamRef *p = makeNode(ParamRef);
@@ -33336,8 +30848,6 @@
     break;
 
   case 1577:
-
-/* Line 1455 of yacc.c  */
 #line 10210 "gram.y"
     {
 					if ((yyvsp[(4) - (4)].list))
@@ -33353,22 +30863,16 @@
     break;
 
   case 1578:
-
-/* Line 1455 of yacc.c  */
 #line 10222 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1579:
-
-/* Line 1455 of yacc.c  */
 #line 10224 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1580:
-
-/* Line 1455 of yacc.c  */
 #line 10226 "gram.y"
     {
 					SubLink *n = makeNode(SubLink);
@@ -33382,8 +30886,6 @@
     break;
 
   case 1581:
-
-/* Line 1455 of yacc.c  */
 #line 10236 "gram.y"
     {
 					SubLink *n = makeNode(SubLink);
@@ -33397,8 +30899,6 @@
     break;
 
   case 1582:
-
-/* Line 1455 of yacc.c  */
 #line 10246 "gram.y"
     {
 					SubLink *n = makeNode(SubLink);
@@ -33412,8 +30912,6 @@
     break;
 
   case 1583:
-
-/* Line 1455 of yacc.c  */
 #line 10256 "gram.y"
     {
 					A_ArrayExpr *n = (A_ArrayExpr *) (yyvsp[(2) - (2)].node);
@@ -33425,8 +30923,6 @@
     break;
 
   case 1584:
-
-/* Line 1455 of yacc.c  */
 #line 10264 "gram.y"
     {
 					RowExpr *r = makeNode(RowExpr);
@@ -33438,8 +30934,6 @@
     break;
 
   case 1585:
-
-/* Line 1455 of yacc.c  */
 #line 10282 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -33456,8 +30950,6 @@
     break;
 
   case 1586:
-
-/* Line 1455 of yacc.c  */
 #line 10295 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -33474,8 +30966,6 @@
     break;
 
   case 1587:
-
-/* Line 1455 of yacc.c  */
 #line 10308 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -33492,8 +30982,6 @@
     break;
 
   case 1588:
-
-/* Line 1455 of yacc.c  */
 #line 10321 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -33510,8 +30998,6 @@
     break;
 
   case 1589:
-
-/* Line 1455 of yacc.c  */
 #line 10334 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -33528,8 +31014,6 @@
     break;
 
   case 1590:
-
-/* Line 1455 of yacc.c  */
 #line 10347 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -33550,8 +31034,6 @@
     break;
 
   case 1591:
-
-/* Line 1455 of yacc.c  */
 #line 10364 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -33568,8 +31050,6 @@
     break;
 
   case 1592:
-
-/* Line 1455 of yacc.c  */
 #line 10377 "gram.y"
     {
 					/*
@@ -33596,8 +31076,6 @@
     break;
 
   case 1593:
-
-/* Line 1455 of yacc.c  */
 #line 10400 "gram.y"
     {
 					/*
@@ -33622,8 +31100,6 @@
     break;
 
   case 1594:
-
-/* Line 1455 of yacc.c  */
 #line 10421 "gram.y"
     {
 					/*
@@ -33637,8 +31113,6 @@
     break;
 
   case 1595:
-
-/* Line 1455 of yacc.c  */
 #line 10431 "gram.y"
     {
 					/*
@@ -33655,8 +31129,6 @@
     break;
 
   case 1596:
-
-/* Line 1455 of yacc.c  */
 #line 10444 "gram.y"
     {
 					/*
@@ -33677,8 +31149,6 @@
     break;
 
   case 1597:
-
-/* Line 1455 of yacc.c  */
 #line 10461 "gram.y"
     {
 					/*
@@ -33695,8 +31165,6 @@
     break;
 
   case 1598:
-
-/* Line 1455 of yacc.c  */
 #line 10474 "gram.y"
     {
 					/*
@@ -33710,8 +31178,6 @@
     break;
 
   case 1599:
-
-/* Line 1455 of yacc.c  */
 #line 10484 "gram.y"
     {
 					/*
@@ -33728,8 +31194,6 @@
     break;
 
   case 1600:
-
-/* Line 1455 of yacc.c  */
 #line 10497 "gram.y"
     {
 					/*
@@ -33743,8 +31207,6 @@
     break;
 
   case 1601:
-
-/* Line 1455 of yacc.c  */
 #line 10507 "gram.y"
     {
 					/*
@@ -33761,8 +31223,6 @@
     break;
 
   case 1602:
-
-/* Line 1455 of yacc.c  */
 #line 10520 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -33779,8 +31239,6 @@
     break;
 
   case 1603:
-
-/* Line 1455 of yacc.c  */
 #line 10533 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -33797,8 +31255,6 @@
     break;
 
   case 1604:
-
-/* Line 1455 of yacc.c  */
 #line 10546 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -33815,8 +31271,6 @@
     break;
 
   case 1605:
-
-/* Line 1455 of yacc.c  */
 #line 10559 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -33833,8 +31287,6 @@
     break;
 
   case 1606:
-
-/* Line 1455 of yacc.c  */
 #line 10572 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -33851,8 +31303,6 @@
     break;
 
   case 1607:
-
-/* Line 1455 of yacc.c  */
 #line 10585 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -33869,15 +31319,11 @@
     break;
 
   case 1608:
-
-/* Line 1455 of yacc.c  */
 #line 10598 "gram.y"
     { (yyval.node) = makeTypeCast((yyvsp[(3) - (6)].node), (yyvsp[(5) - (6)].typnam), (yylsp[(1) - (6)])); ;}
     break;
 
   case 1609:
-
-/* Line 1455 of yacc.c  */
 #line 10600 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -33894,8 +31340,6 @@
     break;
 
   case 1610:
-
-/* Line 1455 of yacc.c  */
 #line 10613 "gram.y"
     {
 					/* overlay(A PLACING B FROM C FOR D) is converted to
@@ -33917,8 +31361,6 @@
     break;
 
   case 1611:
-
-/* Line 1455 of yacc.c  */
 #line 10631 "gram.y"
     {
 					/* position(A in B) is converted to position(B, A) */
@@ -33936,8 +31378,6 @@
     break;
 
   case 1612:
-
-/* Line 1455 of yacc.c  */
 #line 10645 "gram.y"
     {
 					/* substring(A from B for C) is converted to
@@ -33957,8 +31397,6 @@
     break;
 
   case 1613:
-
-/* Line 1455 of yacc.c  */
 #line 10661 "gram.y"
     {
 					/* TREAT(expr AS target) converts expr of a particular type to target,
@@ -33984,8 +31422,6 @@
     break;
 
   case 1614:
-
-/* Line 1455 of yacc.c  */
 #line 10683 "gram.y"
     {
 					/* various trim expressions are defined in SQL92
@@ -34005,8 +31441,6 @@
     break;
 
   case 1615:
-
-/* Line 1455 of yacc.c  */
 #line 10699 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -34023,8 +31457,6 @@
     break;
 
   case 1616:
-
-/* Line 1455 of yacc.c  */
 #line 10712 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -34041,8 +31473,6 @@
     break;
 
   case 1617:
-
-/* Line 1455 of yacc.c  */
 #line 10725 "gram.y"
     {
 					FuncCall *n = makeNode(FuncCall);
@@ -34059,8 +31489,6 @@
     break;
 
   case 1618:
-
-/* Line 1455 of yacc.c  */
 #line 10738 "gram.y"
     {
 					(yyval.node) = (Node *) makeSimpleA_Expr(AEXPR_NULLIF, "=", (yyvsp[(3) - (6)].node), (yyvsp[(5) - (6)].node), (yylsp[(1) - (6)]));
@@ -34068,8 +31496,6 @@
     break;
 
   case 1619:
-
-/* Line 1455 of yacc.c  */
 #line 10742 "gram.y"
     {
 					CoalesceExpr *c = makeNode(CoalesceExpr);
@@ -34080,8 +31506,6 @@
     break;
 
   case 1620:
-
-/* Line 1455 of yacc.c  */
 #line 10749 "gram.y"
     {
 					MinMaxExpr *v = makeNode(MinMaxExpr);
@@ -34093,8 +31517,6 @@
     break;
 
   case 1621:
-
-/* Line 1455 of yacc.c  */
 #line 10757 "gram.y"
     {
 					MinMaxExpr *v = makeNode(MinMaxExpr);
@@ -34106,8 +31528,6 @@
     break;
 
   case 1622:
-
-/* Line 1455 of yacc.c  */
 #line 10765 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLCONCAT, NULL, NIL, (yyvsp[(3) - (4)].list), (yylsp[(1) - (4)]));
@@ -34115,8 +31535,6 @@
     break;
 
   case 1623:
-
-/* Line 1455 of yacc.c  */
 #line 10769 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLELEMENT, (yyvsp[(4) - (5)].str), NIL, NIL, (yylsp[(1) - (5)]));
@@ -34124,8 +31542,6 @@
     break;
 
   case 1624:
-
-/* Line 1455 of yacc.c  */
 #line 10773 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLELEMENT, (yyvsp[(4) - (7)].str), (yyvsp[(6) - (7)].list), NIL, (yylsp[(1) - (7)]));
@@ -34133,8 +31549,6 @@
     break;
 
   case 1625:
-
-/* Line 1455 of yacc.c  */
 #line 10777 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLELEMENT, (yyvsp[(4) - (7)].str), NIL, (yyvsp[(6) - (7)].list), (yylsp[(1) - (7)]));
@@ -34142,8 +31556,6 @@
     break;
 
   case 1626:
-
-/* Line 1455 of yacc.c  */
 #line 10781 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLELEMENT, (yyvsp[(4) - (9)].str), (yyvsp[(6) - (9)].list), (yyvsp[(8) - (9)].list), (yylsp[(1) - (9)]));
@@ -34151,8 +31563,6 @@
     break;
 
   case 1627:
-
-/* Line 1455 of yacc.c  */
 #line 10785 "gram.y"
     {
 					/* xmlexists(A PASSING [BY REF] B [BY REF]) is
@@ -34171,8 +31581,6 @@
     break;
 
   case 1628:
-
-/* Line 1455 of yacc.c  */
 #line 10800 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLFOREST, NULL, (yyvsp[(3) - (4)].list), NIL, (yylsp[(1) - (4)]));
@@ -34180,8 +31588,6 @@
     break;
 
   case 1629:
-
-/* Line 1455 of yacc.c  */
 #line 10804 "gram.y"
     {
 					XmlExpr *x = (XmlExpr *)
@@ -34194,8 +31600,6 @@
     break;
 
   case 1630:
-
-/* Line 1455 of yacc.c  */
 #line 10813 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLPI, (yyvsp[(4) - (5)].str), NULL, NIL, (yylsp[(1) - (5)]));
@@ -34203,8 +31607,6 @@
     break;
 
   case 1631:
-
-/* Line 1455 of yacc.c  */
 #line 10817 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLPI, (yyvsp[(4) - (7)].str), NULL, list_make1((yyvsp[(6) - (7)].node)), (yylsp[(1) - (7)]));
@@ -34212,8 +31614,6 @@
     break;
 
   case 1632:
-
-/* Line 1455 of yacc.c  */
 #line 10821 "gram.y"
     {
 					(yyval.node) = makeXmlExpr(IS_XMLROOT, NULL, NIL,
@@ -34222,8 +31622,6 @@
     break;
 
   case 1633:
-
-/* Line 1455 of yacc.c  */
 #line 10826 "gram.y"
     {
 					XmlSerialize *n = makeNode(XmlSerialize);
@@ -34236,71 +31634,51 @@
     break;
 
   case 1634:
-
-/* Line 1455 of yacc.c  */
 #line 10840 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (2)].node); ;}
     break;
 
   case 1635:
-
-/* Line 1455 of yacc.c  */
 #line 10842 "gram.y"
     { (yyval.node) = makeNullAConst(-1); ;}
     break;
 
   case 1636:
-
-/* Line 1455 of yacc.c  */
 #line 10846 "gram.y"
     { (yyval.node) = makeIntConst(XML_STANDALONE_YES, -1); ;}
     break;
 
   case 1637:
-
-/* Line 1455 of yacc.c  */
 #line 10848 "gram.y"
     { (yyval.node) = makeIntConst(XML_STANDALONE_NO, -1); ;}
     break;
 
   case 1638:
-
-/* Line 1455 of yacc.c  */
 #line 10850 "gram.y"
     { (yyval.node) = makeIntConst(XML_STANDALONE_NO_VALUE, -1); ;}
     break;
 
   case 1639:
-
-/* Line 1455 of yacc.c  */
 #line 10852 "gram.y"
     { (yyval.node) = makeIntConst(XML_STANDALONE_OMITTED, -1); ;}
     break;
 
   case 1640:
-
-/* Line 1455 of yacc.c  */
 #line 10855 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 1641:
-
-/* Line 1455 of yacc.c  */
 #line 10858 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].target)); ;}
     break;
 
   case 1642:
-
-/* Line 1455 of yacc.c  */
 #line 10859 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].target)); ;}
     break;
 
   case 1643:
-
-/* Line 1455 of yacc.c  */
 #line 10863 "gram.y"
     {
 					(yyval.target) = makeNode(ResTarget);
@@ -34312,8 +31690,6 @@
     break;
 
   case 1644:
-
-/* Line 1455 of yacc.c  */
 #line 10871 "gram.y"
     {
 					(yyval.target) = makeNode(ResTarget);
@@ -34325,43 +31701,31 @@
     break;
 
   case 1645:
-
-/* Line 1455 of yacc.c  */
 #line 10880 "gram.y"
     { (yyval.ival) = XMLOPTION_DOCUMENT; ;}
     break;
 
   case 1646:
-
-/* Line 1455 of yacc.c  */
 #line 10881 "gram.y"
     { (yyval.ival) = XMLOPTION_CONTENT; ;}
     break;
 
   case 1647:
-
-/* Line 1455 of yacc.c  */
 #line 10884 "gram.y"
     { (yyval.boolean) = TRUE; ;}
     break;
 
   case 1648:
-
-/* Line 1455 of yacc.c  */
 #line 10885 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 1649:
-
-/* Line 1455 of yacc.c  */
 #line 10886 "gram.y"
     { (yyval.boolean) = FALSE; ;}
     break;
 
   case 1650:
-
-/* Line 1455 of yacc.c  */
 #line 10892 "gram.y"
     {
 					(yyval.node) = (yyvsp[(2) - (2)].node);
@@ -34369,8 +31733,6 @@
     break;
 
   case 1651:
-
-/* Line 1455 of yacc.c  */
 #line 10896 "gram.y"
     {
 					(yyval.node) = (yyvsp[(2) - (4)].node);
@@ -34378,8 +31740,6 @@
     break;
 
   case 1652:
-
-/* Line 1455 of yacc.c  */
 #line 10900 "gram.y"
     {
 					(yyval.node) = (yyvsp[(4) - (4)].node);
@@ -34387,8 +31747,6 @@
     break;
 
   case 1653:
-
-/* Line 1455 of yacc.c  */
 #line 10904 "gram.y"
     {
 					(yyval.node) = (yyvsp[(4) - (6)].node);
@@ -34396,36 +31754,26 @@
     break;
 
   case 1654:
-
-/* Line 1455 of yacc.c  */
 #line 10914 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 1655:
-
-/* Line 1455 of yacc.c  */
 #line 10915 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1656:
-
-/* Line 1455 of yacc.c  */
 #line 10919 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].windef)); ;}
     break;
 
   case 1657:
-
-/* Line 1455 of yacc.c  */
 #line 10921 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].windef)); ;}
     break;
 
   case 1658:
-
-/* Line 1455 of yacc.c  */
 #line 10926 "gram.y"
     {
 					WindowDef *n = (yyvsp[(3) - (3)].windef);
@@ -34435,15 +31783,11 @@
     break;
 
   case 1659:
-
-/* Line 1455 of yacc.c  */
 #line 10934 "gram.y"
     { (yyval.windef) = (yyvsp[(2) - (2)].windef); ;}
     break;
 
   case 1660:
-
-/* Line 1455 of yacc.c  */
 #line 10936 "gram.y"
     {
 					WindowDef *n = makeNode(WindowDef);
@@ -34460,15 +31804,11 @@
     break;
 
   case 1661:
-
-/* Line 1455 of yacc.c  */
 #line 10949 "gram.y"
     { (yyval.windef) = NULL; ;}
     break;
 
   case 1662:
-
-/* Line 1455 of yacc.c  */
 #line 10954 "gram.y"
     {
 					WindowDef *n = makeNode(WindowDef);
@@ -34486,36 +31826,26 @@
     break;
 
   case 1663:
-
-/* Line 1455 of yacc.c  */
 #line 10979 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1664:
-
-/* Line 1455 of yacc.c  */
 #line 10980 "gram.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 1665:
-
-/* Line 1455 of yacc.c  */
 #line 10983 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (3)].list); ;}
     break;
 
   case 1666:
-
-/* Line 1455 of yacc.c  */
 #line 10984 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1667:
-
-/* Line 1455 of yacc.c  */
 #line 10996 "gram.y"
     {
 					WindowDef *n = (yyvsp[(2) - (2)].windef);
@@ -34537,8 +31867,6 @@
     break;
 
   case 1668:
-
-/* Line 1455 of yacc.c  */
 #line 11014 "gram.y"
     {
 					WindowDef *n = (yyvsp[(2) - (2)].windef);
@@ -34548,8 +31876,6 @@
     break;
 
   case 1669:
-
-/* Line 1455 of yacc.c  */
 #line 11020 "gram.y"
     {
 					WindowDef *n = makeNode(WindowDef);
@@ -34561,8 +31887,6 @@
     break;
 
   case 1670:
-
-/* Line 1455 of yacc.c  */
 #line 11030 "gram.y"
     {
 					WindowDef *n = (yyvsp[(1) - (1)].windef);
@@ -34583,8 +31907,6 @@
     break;
 
   case 1671:
-
-/* Line 1455 of yacc.c  */
 #line 11047 "gram.y"
     {
 					WindowDef *n1 = (yyvsp[(2) - (4)].windef);
@@ -34625,8 +31947,6 @@
     break;
 
   case 1672:
-
-/* Line 1455 of yacc.c  */
 #line 11092 "gram.y"
     {
 					WindowDef *n = makeNode(WindowDef);
@@ -34638,8 +31958,6 @@
     break;
 
   case 1673:
-
-/* Line 1455 of yacc.c  */
 #line 11100 "gram.y"
     {
 					WindowDef *n = makeNode(WindowDef);
@@ -34651,8 +31969,6 @@
     break;
 
   case 1674:
-
-/* Line 1455 of yacc.c  */
 #line 11108 "gram.y"
     {
 					WindowDef *n = makeNode(WindowDef);
@@ -34664,8 +31980,6 @@
     break;
 
   case 1675:
-
-/* Line 1455 of yacc.c  */
 #line 11116 "gram.y"
     {
 					WindowDef *n = makeNode(WindowDef);
@@ -34677,8 +31991,6 @@
     break;
 
   case 1676:
-
-/* Line 1455 of yacc.c  */
 #line 11124 "gram.y"
     {
 					WindowDef *n = makeNode(WindowDef);
@@ -34690,197 +32002,141 @@
     break;
 
   case 1677:
-
-/* Line 1455 of yacc.c  */
 #line 11144 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 1678:
-
-/* Line 1455 of yacc.c  */
 #line 11145 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1679:
-
-/* Line 1455 of yacc.c  */
 #line 11146 "gram.y"
     { (yyval.list) = lappend((yyvsp[(2) - (5)].list), (yyvsp[(4) - (5)].node)); ;}
     break;
 
   case 1680:
-
-/* Line 1455 of yacc.c  */
 #line 11149 "gram.y"
     { (yyval.ival) = ANY_SUBLINK; ;}
     break;
 
   case 1681:
-
-/* Line 1455 of yacc.c  */
 #line 11150 "gram.y"
     { (yyval.ival) = ANY_SUBLINK; ;}
     break;
 
   case 1682:
-
-/* Line 1455 of yacc.c  */
 #line 11151 "gram.y"
     { (yyval.ival) = ALL_SUBLINK; ;}
     break;
 
   case 1683:
-
-/* Line 1455 of yacc.c  */
 #line 11154 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1684:
-
-/* Line 1455 of yacc.c  */
 #line 11155 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1685:
-
-/* Line 1455 of yacc.c  */
 #line 11158 "gram.y"
     { (yyval.str) = "+"; ;}
     break;
 
   case 1686:
-
-/* Line 1455 of yacc.c  */
 #line 11159 "gram.y"
     { (yyval.str) = "-"; ;}
     break;
 
   case 1687:
-
-/* Line 1455 of yacc.c  */
 #line 11160 "gram.y"
     { (yyval.str) = "*"; ;}
     break;
 
   case 1688:
-
-/* Line 1455 of yacc.c  */
 #line 11161 "gram.y"
     { (yyval.str) = "/"; ;}
     break;
 
   case 1689:
-
-/* Line 1455 of yacc.c  */
 #line 11162 "gram.y"
     { (yyval.str) = "%"; ;}
     break;
 
   case 1690:
-
-/* Line 1455 of yacc.c  */
 #line 11163 "gram.y"
     { (yyval.str) = "^"; ;}
     break;
 
   case 1691:
-
-/* Line 1455 of yacc.c  */
 #line 11164 "gram.y"
     { (yyval.str) = "<"; ;}
     break;
 
   case 1692:
-
-/* Line 1455 of yacc.c  */
 #line 11165 "gram.y"
     { (yyval.str) = ">"; ;}
     break;
 
   case 1693:
-
-/* Line 1455 of yacc.c  */
 #line 11166 "gram.y"
     { (yyval.str) = "="; ;}
     break;
 
   case 1694:
-
-/* Line 1455 of yacc.c  */
 #line 11170 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 1695:
-
-/* Line 1455 of yacc.c  */
 #line 11172 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 1696:
-
-/* Line 1455 of yacc.c  */
 #line 11177 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 1697:
-
-/* Line 1455 of yacc.c  */
 #line 11179 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 1698:
-
-/* Line 1455 of yacc.c  */
 #line 11184 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 1699:
-
-/* Line 1455 of yacc.c  */
 #line 11186 "gram.y"
     { (yyval.list) = (yyvsp[(3) - (4)].list); ;}
     break;
 
   case 1700:
-
-/* Line 1455 of yacc.c  */
 #line 11188 "gram.y"
     { (yyval.list) = list_make1(makeString("~~")); ;}
     break;
 
   case 1701:
-
-/* Line 1455 of yacc.c  */
 #line 11190 "gram.y"
     { (yyval.list) = list_make1(makeString("!~~")); ;}
     break;
 
   case 1702:
-
-/* Line 1455 of yacc.c  */
 #line 11192 "gram.y"
     { (yyval.list) = list_make1(makeString("~~*")); ;}
     break;
 
   case 1703:
-
-/* Line 1455 of yacc.c  */
 #line 11194 "gram.y"
     { (yyval.list) = list_make1(makeString("!~~*")); ;}
     break;
 
   case 1704:
-
-/* Line 1455 of yacc.c  */
 #line 11206 "gram.y"
     {
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].node));
@@ -34888,8 +32144,6 @@
     break;
 
   case 1705:
-
-/* Line 1455 of yacc.c  */
 #line 11210 "gram.y"
     {
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node));
@@ -34897,8 +32151,6 @@
     break;
 
   case 1706:
-
-/* Line 1455 of yacc.c  */
 #line 11217 "gram.y"
     {
 					(yyval.list) = list_make1((yyvsp[(1) - (1)].node));
@@ -34906,8 +32158,6 @@
     break;
 
   case 1707:
-
-/* Line 1455 of yacc.c  */
 #line 11221 "gram.y"
     {
 					(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node));
@@ -34915,8 +32165,6 @@
     break;
 
   case 1708:
-
-/* Line 1455 of yacc.c  */
 #line 11227 "gram.y"
     {
 					(yyval.node) = (yyvsp[(1) - (1)].node);
@@ -34924,8 +32172,6 @@
     break;
 
   case 1709:
-
-/* Line 1455 of yacc.c  */
 #line 11231 "gram.y"
     {
 					NamedArgExpr *na = makeNode(NamedArgExpr);
@@ -34938,22 +32184,16 @@
     break;
 
   case 1710:
-
-/* Line 1455 of yacc.c  */
 #line 11241 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].typnam)); ;}
     break;
 
   case 1711:
-
-/* Line 1455 of yacc.c  */
 #line 11242 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].typnam)); ;}
     break;
 
   case 1712:
-
-/* Line 1455 of yacc.c  */
 #line 11246 "gram.y"
     {
 					(yyval.node) = makeAArrayExpr((yyvsp[(2) - (3)].list), (yylsp[(1) - (3)]));
@@ -34961,8 +32201,6 @@
     break;
 
   case 1713:
-
-/* Line 1455 of yacc.c  */
 #line 11250 "gram.y"
     {
 					(yyval.node) = makeAArrayExpr((yyvsp[(2) - (3)].list), (yylsp[(1) - (3)]));
@@ -34970,8 +32208,6 @@
     break;
 
   case 1714:
-
-/* Line 1455 of yacc.c  */
 #line 11254 "gram.y"
     {
 					(yyval.node) = makeAArrayExpr(NIL, (yylsp[(1) - (2)]));
@@ -34979,22 +32215,16 @@
     break;
 
   case 1715:
-
-/* Line 1455 of yacc.c  */
 #line 11259 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 1716:
-
-/* Line 1455 of yacc.c  */
 #line 11260 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 1717:
-
-/* Line 1455 of yacc.c  */
 #line 11266 "gram.y"
     {
 					(yyval.list) = list_make2(makeStringConst((yyvsp[(1) - (3)].str), (yylsp[(1) - (3)])), (yyvsp[(3) - (3)].node));
@@ -35002,71 +32232,51 @@
     break;
 
   case 1718:
-
-/* Line 1455 of yacc.c  */
 #line 11269 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1719:
-
-/* Line 1455 of yacc.c  */
 #line 11276 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1720:
-
-/* Line 1455 of yacc.c  */
 #line 11277 "gram.y"
     { (yyval.str) = "year"; ;}
     break;
 
   case 1721:
-
-/* Line 1455 of yacc.c  */
 #line 11278 "gram.y"
     { (yyval.str) = "month"; ;}
     break;
 
   case 1722:
-
-/* Line 1455 of yacc.c  */
 #line 11279 "gram.y"
     { (yyval.str) = "day"; ;}
     break;
 
   case 1723:
-
-/* Line 1455 of yacc.c  */
 #line 11280 "gram.y"
     { (yyval.str) = "hour"; ;}
     break;
 
   case 1724:
-
-/* Line 1455 of yacc.c  */
 #line 11281 "gram.y"
     { (yyval.str) = "minute"; ;}
     break;
 
   case 1725:
-
-/* Line 1455 of yacc.c  */
 #line 11282 "gram.y"
     { (yyval.str) = "second"; ;}
     break;
 
   case 1726:
-
-/* Line 1455 of yacc.c  */
 #line 11283 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1727:
-
-/* Line 1455 of yacc.c  */
 #line 11294 "gram.y"
     {
 					(yyval.list) = list_make4((yyvsp[(1) - (4)].node), (yyvsp[(2) - (4)].node), (yyvsp[(3) - (4)].node), (yyvsp[(4) - (4)].node));
@@ -35074,8 +32284,6 @@
     break;
 
   case 1728:
-
-/* Line 1455 of yacc.c  */
 #line 11298 "gram.y"
     {
 					(yyval.list) = list_make3((yyvsp[(1) - (3)].node), (yyvsp[(2) - (3)].node), (yyvsp[(3) - (3)].node));
@@ -35083,29 +32291,21 @@
     break;
 
   case 1729:
-
-/* Line 1455 of yacc.c  */
 #line 11305 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (2)].node); ;}
     break;
 
   case 1730:
-
-/* Line 1455 of yacc.c  */
 #line 11311 "gram.y"
     { (yyval.list) = list_make2((yyvsp[(3) - (3)].node), (yyvsp[(1) - (3)].node)); ;}
     break;
 
   case 1731:
-
-/* Line 1455 of yacc.c  */
 #line 11312 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1732:
-
-/* Line 1455 of yacc.c  */
 #line 11329 "gram.y"
     {
 					(yyval.list) = list_make3((yyvsp[(1) - (3)].node), (yyvsp[(2) - (3)].node), (yyvsp[(3) - (3)].node));
@@ -35113,8 +32313,6 @@
     break;
 
   case 1733:
-
-/* Line 1455 of yacc.c  */
 #line 11333 "gram.y"
     {
 					/* not legal per SQL99, but might as well allow it */
@@ -35123,8 +32321,6 @@
     break;
 
   case 1734:
-
-/* Line 1455 of yacc.c  */
 #line 11338 "gram.y"
     {
 					(yyval.list) = list_make2((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].node));
@@ -35132,8 +32328,6 @@
     break;
 
   case 1735:
-
-/* Line 1455 of yacc.c  */
 #line 11342 "gram.y"
     {
 					/*
@@ -35152,8 +32346,6 @@
     break;
 
   case 1736:
-
-/* Line 1455 of yacc.c  */
 #line 11357 "gram.y"
     {
 					(yyval.list) = (yyvsp[(1) - (1)].list);
@@ -35161,50 +32353,36 @@
     break;
 
   case 1737:
-
-/* Line 1455 of yacc.c  */
 #line 11361 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1738:
-
-/* Line 1455 of yacc.c  */
 #line 11365 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (2)].node); ;}
     break;
 
   case 1739:
-
-/* Line 1455 of yacc.c  */
 #line 11368 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (2)].node); ;}
     break;
 
   case 1740:
-
-/* Line 1455 of yacc.c  */
 #line 11371 "gram.y"
     { (yyval.list) = lappend((yyvsp[(3) - (3)].list), (yyvsp[(1) - (3)].node)); ;}
     break;
 
   case 1741:
-
-/* Line 1455 of yacc.c  */
 #line 11372 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (2)].list); ;}
     break;
 
   case 1742:
-
-/* Line 1455 of yacc.c  */
 #line 11373 "gram.y"
     { (yyval.list) = (yyvsp[(1) - (1)].list); ;}
     break;
 
   case 1743:
-
-/* Line 1455 of yacc.c  */
 #line 11377 "gram.y"
     {
 					SubLink *n = makeNode(SubLink);
@@ -35215,15 +32393,11 @@
     break;
 
   case 1744:
-
-/* Line 1455 of yacc.c  */
 #line 11383 "gram.y"
     { (yyval.node) = (Node *)(yyvsp[(2) - (3)].list); ;}
     break;
 
   case 1745:
-
-/* Line 1455 of yacc.c  */
 #line 11394 "gram.y"
     {
 					CaseExpr *c = makeNode(CaseExpr);
@@ -35237,22 +32411,16 @@
     break;
 
   case 1746:
-
-/* Line 1455 of yacc.c  */
 #line 11407 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 1747:
-
-/* Line 1455 of yacc.c  */
 #line 11408 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].node)); ;}
     break;
 
   case 1748:
-
-/* Line 1455 of yacc.c  */
 #line 11413 "gram.y"
     {
 					CaseWhen *w = makeNode(CaseWhen);
@@ -35264,36 +32432,26 @@
     break;
 
   case 1749:
-
-/* Line 1455 of yacc.c  */
 #line 11423 "gram.y"
     { (yyval.node) = (yyvsp[(2) - (2)].node); ;}
     break;
 
   case 1750:
-
-/* Line 1455 of yacc.c  */
 #line 11424 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 1751:
-
-/* Line 1455 of yacc.c  */
 #line 11427 "gram.y"
     { (yyval.node) = (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1752:
-
-/* Line 1455 of yacc.c  */
 #line 11428 "gram.y"
     { (yyval.node) = NULL; ;}
     break;
 
   case 1753:
-
-/* Line 1455 of yacc.c  */
 #line 11432 "gram.y"
     {
 					(yyval.node) = makeColumnRef((yyvsp[(1) - (1)].str), NIL, (yylsp[(1) - (1)]), yyscanner);
@@ -35301,8 +32459,6 @@
     break;
 
   case 1754:
-
-/* Line 1455 of yacc.c  */
 #line 11436 "gram.y"
     {
 					(yyval.node) = makeColumnRef((yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].list), (yylsp[(1) - (2)]), yyscanner);
@@ -35310,8 +32466,6 @@
     break;
 
   case 1755:
-
-/* Line 1455 of yacc.c  */
 #line 11443 "gram.y"
     {
 					(yyval.node) = (Node *) makeString((yyvsp[(2) - (2)].str));
@@ -35319,8 +32473,6 @@
     break;
 
   case 1756:
-
-/* Line 1455 of yacc.c  */
 #line 11447 "gram.y"
     {
 					(yyval.node) = (Node *) makeNode(A_Star);
@@ -35328,8 +32480,6 @@
     break;
 
   case 1757:
-
-/* Line 1455 of yacc.c  */
 #line 11451 "gram.y"
     {
 					A_Indices *ai = makeNode(A_Indices);
@@ -35340,8 +32490,6 @@
     break;
 
   case 1758:
-
-/* Line 1455 of yacc.c  */
 #line 11458 "gram.y"
     {
 					A_Indices *ai = makeNode(A_Indices);
@@ -35352,43 +32500,31 @@
     break;
 
   case 1759:
-
-/* Line 1455 of yacc.c  */
 #line 11467 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 1760:
-
-/* Line 1455 of yacc.c  */
 #line 11468 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].node)); ;}
     break;
 
   case 1761:
-
-/* Line 1455 of yacc.c  */
 #line 11472 "gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 1762:
-
-/* Line 1455 of yacc.c  */
 #line 11473 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].node)); ;}
     break;
 
   case 1765:
-
-/* Line 1455 of yacc.c  */
 #line 11488 "gram.y"
     { (yyval.node) = (Node *) (yyvsp[(1) - (1)].node); ;}
     break;
 
   case 1766:
-
-/* Line 1455 of yacc.c  */
 #line 11490 "gram.y"
     {
 					SetToDefault *n = makeNode(SetToDefault);
@@ -35398,43 +32534,31 @@
     break;
 
   case 1767:
-
-/* Line 1455 of yacc.c  */
 #line 11498 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].node)); ;}
     break;
 
   case 1768:
-
-/* Line 1455 of yacc.c  */
 #line 11499 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].node)); ;}
     break;
 
   case 1769:
-
-/* Line 1455 of yacc.c  */
 #line 11507 "gram.y"
     { (yyval.list) = (yyvsp[(2) - (3)].list); ;}
     break;
 
   case 1770:
-
-/* Line 1455 of yacc.c  */
 #line 11518 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].target)); ;}
     break;
 
   case 1771:
-
-/* Line 1455 of yacc.c  */
 #line 11519 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].target)); ;}
     break;
 
   case 1772:
-
-/* Line 1455 of yacc.c  */
 #line 11523 "gram.y"
     {
 					(yyval.target) = makeNode(ResTarget);
@@ -35446,8 +32570,6 @@
     break;
 
   case 1773:
-
-/* Line 1455 of yacc.c  */
 #line 11539 "gram.y"
     {
 					(yyval.target) = makeNode(ResTarget);
@@ -35459,8 +32581,6 @@
     break;
 
   case 1774:
-
-/* Line 1455 of yacc.c  */
 #line 11547 "gram.y"
     {
 					(yyval.target) = makeNode(ResTarget);
@@ -35472,8 +32592,6 @@
     break;
 
   case 1775:
-
-/* Line 1455 of yacc.c  */
 #line 11555 "gram.y"
     {
 					ColumnRef *n = makeNode(ColumnRef);
@@ -35489,22 +32607,16 @@
     break;
 
   case 1776:
-
-/* Line 1455 of yacc.c  */
 #line 11576 "gram.y"
     { (yyval.list) = list_make1((yyvsp[(1) - (1)].range)); ;}
     break;
 
   case 1777:
-
-/* Line 1455 of yacc.c  */
 #line 11577 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].range)); ;}
     break;
 
   case 1778:
-
-/* Line 1455 of yacc.c  */
 #line 11589 "gram.y"
     {
 					(yyval.range) = makeRangeVar(NULL, (yyvsp[(1) - (1)].str), (yylsp[(1) - (1)]));
@@ -35512,8 +32624,6 @@
     break;
 
   case 1779:
-
-/* Line 1455 of yacc.c  */
 #line 11593 "gram.y"
     {
 					check_qualified_name((yyvsp[(2) - (2)].list), yyscanner);
@@ -35542,71 +32652,51 @@
     break;
 
   case 1780:
-
-/* Line 1455 of yacc.c  */
 #line 11620 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 1781:
-
-/* Line 1455 of yacc.c  */
 #line 11622 "gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (3)].list), makeString((yyvsp[(3) - (3)].str))); ;}
     break;
 
   case 1782:
-
-/* Line 1455 of yacc.c  */
 #line 11626 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1783:
-
-/* Line 1455 of yacc.c  */
 #line 11629 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1784:
-
-/* Line 1455 of yacc.c  */
 #line 11632 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1785:
-
-/* Line 1455 of yacc.c  */
 #line 11634 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1786:
-
-/* Line 1455 of yacc.c  */
 #line 11636 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1787:
-
-/* Line 1455 of yacc.c  */
 #line 11638 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1788:
-
-/* Line 1455 of yacc.c  */
 #line 11649 "gram.y"
     { (yyval.list) = list_make1(makeString((yyvsp[(1) - (1)].str))); ;}
     break;
 
   case 1789:
-
-/* Line 1455 of yacc.c  */
 #line 11651 "gram.y"
     {
 						(yyval.list) = check_func_name(lcons(makeString((yyvsp[(1) - (2)].str)), (yyvsp[(2) - (2)].list)),
@@ -35615,8 +32705,6 @@
     break;
 
   case 1790:
-
-/* Line 1455 of yacc.c  */
 #line 11662 "gram.y"
     {
 					(yyval.node) = makeIntConst((yyvsp[(1) - (1)].ival), (yylsp[(1) - (1)]));
@@ -35624,8 +32712,6 @@
     break;
 
   case 1791:
-
-/* Line 1455 of yacc.c  */
 #line 11666 "gram.y"
     {
 					(yyval.node) = makeFloatConst((yyvsp[(1) - (1)].str), (yylsp[(1) - (1)]));
@@ -35633,8 +32719,6 @@
     break;
 
   case 1792:
-
-/* Line 1455 of yacc.c  */
 #line 11670 "gram.y"
     {
 					(yyval.node) = makeStringConst((yyvsp[(1) - (1)].str), (yylsp[(1) - (1)]));
@@ -35642,8 +32726,6 @@
     break;
 
   case 1793:
-
-/* Line 1455 of yacc.c  */
 #line 11674 "gram.y"
     {
 					(yyval.node) = makeBitStringConst((yyvsp[(1) - (1)].str), (yylsp[(1) - (1)]));
@@ -35651,8 +32733,6 @@
     break;
 
   case 1794:
-
-/* Line 1455 of yacc.c  */
 #line 11678 "gram.y"
     {
 					/* This is a bit constant per SQL99:
@@ -35665,8 +32745,6 @@
     break;
 
   case 1795:
-
-/* Line 1455 of yacc.c  */
 #line 11687 "gram.y"
     {
 					/* generic type 'literal' syntax */
@@ -35677,8 +32755,6 @@
     break;
 
   case 1796:
-
-/* Line 1455 of yacc.c  */
 #line 11694 "gram.y"
     {
 					/* generic syntax with a type modifier */
@@ -35707,8 +32783,6 @@
     break;
 
   case 1797:
-
-/* Line 1455 of yacc.c  */
 #line 11719 "gram.y"
     {
 					(yyval.node) = makeStringConstCast((yyvsp[(2) - (2)].str), (yylsp[(2) - (2)]), (yyvsp[(1) - (2)].typnam));
@@ -35716,8 +32790,6 @@
     break;
 
   case 1798:
-
-/* Line 1455 of yacc.c  */
 #line 11723 "gram.y"
     {
 					TypeName *t = (yyvsp[(1) - (3)].typnam);
@@ -35727,8 +32799,6 @@
     break;
 
   case 1799:
-
-/* Line 1455 of yacc.c  */
 #line 11729 "gram.y"
     {
 					TypeName *t = (yyvsp[(1) - (6)].typnam);
@@ -35749,8 +32819,6 @@
     break;
 
   case 1800:
-
-/* Line 1455 of yacc.c  */
 #line 11746 "gram.y"
     {
 					(yyval.node) = makeBoolAConst(TRUE, (yylsp[(1) - (1)]));
@@ -35758,8 +32826,6 @@
     break;
 
   case 1801:
-
-/* Line 1455 of yacc.c  */
 #line 11750 "gram.y"
     {
 					(yyval.node) = makeBoolAConst(FALSE, (yylsp[(1) - (1)]));
@@ -35767,8 +32833,6 @@
     break;
 
   case 1802:
-
-/* Line 1455 of yacc.c  */
 #line 11754 "gram.y"
     {
 					(yyval.node) = makeNullAConst((yylsp[(1) - (1)]));
@@ -35776,128 +32840,93 @@
     break;
 
   case 1803:
-
-/* Line 1455 of yacc.c  */
 #line 11759 "gram.y"
     { (yyval.ival) = (yyvsp[(1) - (1)].ival); ;}
     break;
 
   case 1804:
-
-/* Line 1455 of yacc.c  */
 #line 11760 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1805:
-
-/* Line 1455 of yacc.c  */
 #line 11761 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1806:
-
-/* Line 1455 of yacc.c  */
 #line 11763 "gram.y"
     { (yyval.ival) = (yyvsp[(1) - (1)].ival); ;}
     break;
 
   case 1807:
-
-/* Line 1455 of yacc.c  */
 #line 11764 "gram.y"
     { (yyval.ival) = + (yyvsp[(2) - (2)].ival); ;}
     break;
 
   case 1808:
-
-/* Line 1455 of yacc.c  */
 #line 11765 "gram.y"
     { (yyval.ival) = - (yyvsp[(2) - (2)].ival); ;}
     break;
 
   case 1809:
-
-/* Line 1455 of yacc.c  */
 #line 11781 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1810:
-
-/* Line 1455 of yacc.c  */
 #line 11782 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 1811:
-
-/* Line 1455 of yacc.c  */
 #line 11783 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 1812:
-
-/* Line 1455 of yacc.c  */
 #line 11788 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1813:
-
-/* Line 1455 of yacc.c  */
 #line 11789 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 1814:
-
-/* Line 1455 of yacc.c  */
 #line 11790 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 1815:
-
-/* Line 1455 of yacc.c  */
 #line 11796 "gram.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1816:
-
-/* Line 1455 of yacc.c  */
 #line 11797 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 1817:
-
-/* Line 1455 of yacc.c  */
 #line 11798 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 1818:
-
-/* Line 1455 of yacc.c  */
 #line 11799 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
   case 1819:
-
-/* Line 1455 of yacc.c  */
 #line 11800 "gram.y"
     { (yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword)); ;}
     break;
 
 
-
-/* Line 1455 of yacc.c  */
-#line 35901 "gram.c"
+/* Line 1267 of yacc.c.  */
+#line 32930 "gram.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -35973,7 +33002,7 @@
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
@@ -35990,7 +33019,7 @@
 	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -36048,11 +33077,14 @@
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   *++yyvsp = yylval;
 
   yyerror_range[1] = yylloc;
   /* Using YYLLOC is tempting, but would change the location of
-     the lookahead.  YYLOC is available though.  */
+     the look-ahead.  YYLOC is available though.  */
   YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
   *++yylsp = yyloc;
 
@@ -36077,7 +33109,7 @@
   yyresult = 1;
   goto yyreturn;
 
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -36088,7 +33120,7 @@
 #endif
 
 yyreturn:
-  if (yychar != YYEMPTY)
+  if (yychar != YYEOF && yychar != YYEMPTY)
      yydestruct ("Cleanup: discarding lookahead",
 		 yytoken, &yylval, &yylloc, yyscanner);
   /* Do not reclaim the symbols of the rule which action triggered
@@ -36114,8 +33146,6 @@
 }
 
 
-
-/* Line 1675 of yacc.c  */
 #line 12250 "gram.y"
 
 
--- postgresql-9.1.2/src/backend/parser/gram.h	2011-12-01 14:09:58.000000000 -0800
+++ postgresql/src/backend/parser/gram.h	2012-01-06 14:58:40.000000000 -0800
@@ -1,23 +1,24 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
+
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -28,11 +29,10 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -450,16 +450,424 @@
      UMINUS = 666
    };
 #endif
+/* Tokens.  */
+#define IDENT 258
+#define FCONST 259
+#define SCONST 260
+#define BCONST 261
+#define XCONST 262
+#define Op 263
+#define ICONST 264
+#define PARAM 265
+#define TYPECAST 266
+#define DOT_DOT 267
+#define COLON_EQUALS 268
+#define ABORT_P 269
+#define ABSOLUTE_P 270
+#define ACCESS 271
+#define ACTION 272
+#define ADD_P 273
+#define ADMIN 274
+#define AFTER 275
+#define AGGREGATE 276
+#define ALL 277
+#define ALSO 278
+#define ALTER 279
+#define ALWAYS 280
+#define ANALYSE 281
+#define ANALYZE 282
+#define AND 283
+#define ANY 284
+#define ARRAY 285
+#define AS 286
+#define ASC 287
+#define ASSERTION 288
+#define ASSIGNMENT 289
+#define ASYMMETRIC 290
+#define AT 291
+#define ATTRIBUTE 292
+#define AUTHORIZATION 293
+#define BACKWARD 294
+#define BEFORE 295
+#define BEGIN_P 296
+#define BETWEEN 297
+#define BIGINT 298
+#define BINARY 299
+#define BIT 300
+#define BOOLEAN_P 301
+#define BOTH 302
+#define BY 303
+#define CACHE 304
+#define CALLED 305
+#define CASCADE 306
+#define CASCADED 307
+#define CASE 308
+#define CAST 309
+#define CATALOG_P 310
+#define CHAIN 311
+#define CHAR_P 312
+#define CHARACTER 313
+#define CHARACTERISTICS 314
+#define CHECK 315
+#define CHECKPOINT 316
+#define CLASS 317
+#define CLOSE 318
+#define CLUSTER 319
+#define COALESCE 320
+#define COLLATE 321
+#define COLLATION 322
+#define COLUMN 323
+#define COMMENT 324
+#define COMMENTS 325
+#define COMMIT 326
+#define COMMITTED 327
+#define CONCURRENTLY 328
+#define CONFIGURATION 329
+#define CONNECTION 330
+#define CONSTRAINT 331
+#define CONSTRAINTS 332
+#define CONTENT_P 333
+#define CONTINUE_P 334
+#define CONVERSION_P 335
+#define COPY 336
+#define COST 337
+#define CREATE 338
+#define CROSS 339
+#define CSV 340
+#define CURRENT_P 341
+#define CURRENT_CATALOG 342
+#define CURRENT_DATE 343
+#define CURRENT_ROLE 344
+#define CURRENT_SCHEMA 345
+#define CURRENT_TIME 346
+#define CURRENT_TIMESTAMP 347
+#define CURRENT_USER 348
+#define CURSOR 349
+#define CYCLE 350
+#define DATA_P 351
+#define DATABASE 352
+#define DAY_P 353
+#define DEALLOCATE 354
+#define DEC 355
+#define DECIMAL_P 356
+#define DECLARE 357
+#define DEFAULT 358
+#define DEFAULTS 359
+#define DEFERRABLE 360
+#define DEFERRED 361
+#define DEFINER 362
+#define DELETE_P 363
+#define DELIMITER 364
+#define DELIMITERS 365
+#define DESC 366
+#define DICTIONARY 367
+#define DISABLE_P 368
+#define DISCARD 369
+#define DISTINCT 370
+#define DO 371
+#define DOCUMENT_P 372
+#define DOMAIN_P 373
+#define DOUBLE_P 374
+#define DROP 375
+#define EACH 376
+#define ELSE 377
+#define ENABLE_P 378
+#define ENCODING 379
+#define ENCRYPTED 380
+#define END_P 381
+#define ENUM_P 382
+#define ESCAPE 383
+#define EXCEPT 384
+#define EXCLUDE 385
+#define EXCLUDING 386
+#define EXCLUSIVE 387
+#define EXECUTE 388
+#define EXISTS 389
+#define EXPLAIN 390
+#define EXTENSION 391
+#define EXTERNAL 392
+#define EXTRACT 393
+#define FALSE_P 394
+#define FAMILY 395
+#define FETCH 396
+#define FIRST_P 397
+#define FLOAT_P 398
+#define FOLLOWING 399
+#define FOR 400
+#define FORCE 401
+#define FOREIGN 402
+#define FORWARD 403
+#define FREEZE 404
+#define FROM 405
+#define FULL 406
+#define FUNCTION 407
+#define FUNCTIONS 408
+#define GLOBAL 409
+#define GRANT 410
+#define GRANTED 411
+#define GREATEST 412
+#define GROUP_P 413
+#define HANDLER 414
+#define HAVING 415
+#define HEADER_P 416
+#define HOLD 417
+#define HOUR_P 418
+#define IDENTITY_P 419
+#define IF_P 420
+#define ILIKE 421
+#define IMMEDIATE 422
+#define IMMUTABLE 423
+#define IMPLICIT_P 424
+#define IN_P 425
+#define INCLUDING 426
+#define INCREMENT 427
+#define INDEX 428
+#define INDEXES 429
+#define INHERIT 430
+#define INHERITS 431
+#define INITIALLY 432
+#define INLINE_P 433
+#define INNER_P 434
+#define INOUT 435
+#define INPUT_P 436
+#define INSENSITIVE 437
+#define INSERT 438
+#define INSTEAD 439
+#define INT_P 440
+#define INTEGER 441
+#define INTERSECT 442
+#define INTERVAL 443
+#define INTO 444
+#define INVOKER 445
+#define IS 446
+#define ISNULL 447
+#define ISOLATION 448
+#define JOIN 449
+#define KEY 450
+#define LABEL 451
+#define LANGUAGE 452
+#define LARGE_P 453
+#define LAST_P 454
+#define LC_COLLATE_P 455
+#define LC_CTYPE_P 456
+#define LEADING 457
+#define LEAST 458
+#define LEFT 459
+#define LEVEL 460
+#define LIKE 461
+#define LIMIT 462
+#define LISTEN 463
+#define LOAD 464
+#define LOCAL 465
+#define LOCALTIME 466
+#define LOCALTIMESTAMP 467
+#define LOCATION 468
+#define LOCK_P 469
+#define MAPPING 470
+#define MATCH 471
+#define MAXVALUE 472
+#define MINUTE_P 473
+#define MINVALUE 474
+#define MODE 475
+#define MONTH_P 476
+#define MOVE 477
+#define NAME_P 478
+#define NAMES 479
+#define NATIONAL 480
+#define NATURAL 481
+#define NCHAR 482
+#define NEXT 483
+#define NO 484
+#define NONE 485
+#define NOT 486
+#define NOTHING 487
+#define NOTIFY 488
+#define NOTNULL 489
+#define NOWAIT 490
+#define NULL_P 491
+#define NULLIF 492
+#define NULLS_P 493
+#define NUMERIC 494
+#define OBJECT_P 495
+#define OF 496
+#define OFF 497
+#define OFFSET 498
+#define OIDS 499
+#define ON 500
+#define ONLY 501
+#define OPERATOR 502
+#define OPTION 503
+#define OPTIONS 504
+#define OR 505
+#define ORDER 506
+#define OUT_P 507
+#define OUTER_P 508
+#define OVER 509
+#define OVERLAPS 510
+#define OVERLAY 511
+#define OWNED 512
+#define OWNER 513
+#define PARSER 514
+#define PARTIAL 515
+#define PARTITION 516
+#define PASSING 517
+#define PASSWORD 518
+#define PLACING 519
+#define PLANS 520
+#define POSITION 521
+#define PRECEDING 522
+#define PRECISION 523
+#define PRESERVE 524
+#define PREPARE 525
+#define PREPARED 526
+#define PRIMARY 527
+#define PRIOR 528
+#define PRIVILEGES 529
+#define PROCEDURAL 530
+#define PROCEDURE 531
+#define QUOTE 532
+#define RANGE 533
+#define READ 534
+#define REAL 535
+#define REASSIGN 536
+#define RECHECK 537
+#define RECURSIVE 538
+#define REF 539
+#define REFERENCES 540
+#define REINDEX 541
+#define RELATIVE_P 542
+#define RELEASE 543
+#define RENAME 544
+#define REPEATABLE 545
+#define REPLACE 546
+#define REPLICA 547
+#define RESET 548
+#define RESTART 549
+#define RESTRICT 550
+#define RETURNING 551
+#define RETURNS 552
+#define REVOKE 553
+#define RIGHT 554
+#define ROLE 555
+#define ROLLBACK 556
+#define ROW 557
+#define ROWS 558
+#define RULE 559
+#define SAVEPOINT 560
+#define SCHEMA 561
+#define SCROLL 562
+#define SEARCH 563
+#define SECOND_P 564
+#define SECURITY 565
+#define SELECT 566
+#define SEQUENCE 567
+#define SEQUENCES 568
+#define SERIALIZABLE 569
+#define SERVER 570
+#define SESSION 571
+#define SESSION_USER 572
+#define SET 573
+#define SETOF 574
+#define SHARE 575
+#define SHOW 576
+#define SIMILAR 577
+#define SIMPLE 578
+#define SMALLINT 579
+#define SOME 580
+#define STABLE 581
+#define STANDALONE_P 582
+#define START 583
+#define STATEMENT 584
+#define STATISTICS 585
+#define STDIN 586
+#define STDOUT 587
+#define STORAGE 588
+#define STRICT_P 589
+#define STRIP_P 590
+#define SUBSTRING 591
+#define SYMMETRIC 592
+#define SYSID 593
+#define SYSTEM_P 594
+#define TABLE 595
+#define TABLES 596
+#define TABLESPACE 597
+#define TEMP 598
+#define TEMPLATE 599
+#define TEMPORARY 600
+#define TEXT_P 601
+#define THEN 602
+#define TIME 603
+#define TIMESTAMP 604
+#define TO 605
+#define TRAILING 606
+#define TRANSACTION 607
+#define TREAT 608
+#define TRIGGER 609
+#define TRIM 610
+#define TRUE_P 611
+#define TRUNCATE 612
+#define TRUSTED 613
+#define TYPE_P 614
+#define UNBOUNDED 615
+#define UNCOMMITTED 616
+#define UNENCRYPTED 617
+#define UNION 618
+#define UNIQUE 619
+#define UNKNOWN 620
+#define UNLISTEN 621
+#define UNLOGGED 622
+#define UNTIL 623
+#define UPDATE 624
+#define USER 625
+#define USING 626
+#define VACUUM 627
+#define VALID 628
+#define VALIDATE 629
+#define VALIDATOR 630
+#define VALUE_P 631
+#define VALUES 632
+#define VARCHAR 633
+#define VARIADIC 634
+#define VARYING 635
+#define VERBOSE 636
+#define VERSION_P 637
+#define VIEW 638
+#define VOLATILE 639
+#define WHEN 640
+#define WHERE 641
+#define WHITESPACE_P 642
+#define WINDOW 643
+#define WITH 644
+#define WITHOUT 645
+#define WORK 646
+#define WRAPPER 647
+#define WRITE 648
+#define XML_P 649
+#define XMLATTRIBUTES 650
+#define XMLCONCAT 651
+#define XMLELEMENT 652
+#define XMLEXISTS 653
+#define XMLFOREST 654
+#define XMLPARSE 655
+#define XMLPI 656
+#define XMLROOT 657
+#define XMLSERIALIZE 658
+#define YEAR_P 659
+#define YES_P 660
+#define ZONE 661
+#define NULLS_FIRST 662
+#define NULLS_LAST 663
+#define WITH_TIME 664
+#define POSTFIXOP 665
+#define UMINUS 666
+
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-{
-
-/* Line 1676 of yacc.c  */
 #line 160 "gram.y"
-
+{
 	core_YYSTYPE		core_yystype;
 	/* these fields must match core_YYSTYPE: */
 	int					ival;
@@ -494,15 +902,13 @@
 	AccessPriv			*accesspriv;
 	InsertStmt			*istmt;
 	VariableSetStmt		*vsetstmt;
-
-
-
-/* Line 1676 of yacc.c  */
-#line 502 "gram.h"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 1529 of yacc.c.  */
+#line 908 "gram.tab.h"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
@@ -521,4 +927,3 @@
 #endif
 
 
-
--- postgresql-9.1.2/src/backend/replication/repl_gram.c	2011-12-01 14:09:58.000000000 -0800
+++ postgresql/src/backend/replication/repl_gram.c	2012-01-06 15:00:18.000000000 -0800
@@ -1,23 +1,24 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
+
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -28,7 +29,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -46,7 +47,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -54,28 +55,53 @@
 /* Pure parsers.  */
 #define YYPURE 0
 
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
-#define yyparse         replication_yyparse
-#define yylex           replication_yylex
-#define yyerror         replication_yyerror
-#define yylval          replication_yylval
-#define yychar          replication_yychar
-#define yydebug         replication_yydebug
-#define yynerrs         replication_yynerrs
+#define yyparse replication_yyparse
+#define yylex   replication_yylex
+#define yyerror replication_yyerror
+#define yylval  replication_yylval
+#define yychar  replication_yychar
+#define yydebug replication_yydebug
+#define yynerrs replication_yynerrs
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     SCONST = 258,
+     RECPTR = 259,
+     K_BASE_BACKUP = 260,
+     K_IDENTIFY_SYSTEM = 261,
+     K_LABEL = 262,
+     K_PROGRESS = 263,
+     K_FAST = 264,
+     K_NOWAIT = 265,
+     K_WAL = 266,
+     K_START_REPLICATION = 267
+   };
+#endif
+/* Tokens.  */
+#define SCONST 258
+#define RECPTR 259
+#define K_BASE_BACKUP 260
+#define K_IDENTIFY_SYSTEM 261
+#define K_LABEL 262
+#define K_PROGRESS 263
+#define K_FAST 264
+#define K_NOWAIT 265
+#define K_WAL 266
+#define K_START_REPLICATION 267
 
 
-/* Copy the first part of user declarations.  */
 
-/* Line 189 of yacc.c  */
+
+/* Copy the first part of user declarations.  */
 #line 1 "repl_gram.y"
 
 /*-------------------------------------------------------------------------
@@ -127,9 +153,6 @@
 
 
 
-/* Line 189 of yacc.c  */
-#line 132 "repl_gram.c"
-
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -148,35 +171,10 @@
 # define YYTOKEN_TABLE 0
 #endif
 
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     SCONST = 258,
-     RECPTR = 259,
-     K_BASE_BACKUP = 260,
-     K_IDENTIFY_SYSTEM = 261,
-     K_LABEL = 262,
-     K_PROGRESS = 263,
-     K_FAST = 264,
-     K_NOWAIT = 265,
-     K_WAL = 266,
-     K_START_REPLICATION = 267
-   };
-#endif
-
-
-
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-{
-
-/* Line 214 of yacc.c  */
 #line 54 "repl_gram.y"
-
+{
 		char					*str;
 		bool					boolval;
 
@@ -184,23 +182,22 @@
 		Node					*node;
 		List					*list;
 		DefElem					*defelt;
-
-
-
-/* Line 214 of yacc.c  */
-#line 192 "repl_gram.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 193 of yacc.c.  */
+#line 188 "repl_gram.tab.c"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
+
 /* Copy the second part of user declarations.  */
 
 
-/* Line 264 of yacc.c  */
-#line 204 "repl_gram.c"
+/* Line 216 of yacc.c.  */
+#line 201 "repl_gram.tab.c"
 
 #ifdef short
 # undef short
@@ -250,7 +247,7 @@
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -275,14 +272,14 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int yyi)
+YYID (int i)
 #else
 static int
-YYID (yyi)
-    int yyi;
+YYID (i)
+    int i;
 #endif
 {
-  return yyi;
+  return i;
 }
 #endif
 
@@ -363,9 +360,9 @@
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-};
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+  };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -399,12 +396,12 @@
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+# define YYSTACK_RELOCATE(Stack)					\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -657,7 +654,7 @@
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -768,20 +765,17 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
 
@@ -815,11 +809,11 @@
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       		       );
-      YYFPRINTF (stderr, "\n");
+      fprintf (stderr, "\n");
     }
 }
 
@@ -1099,8 +1093,10 @@
 	break;
     }
 }
+
 
 /* Prevent warnings from -Wmissing-prototypes.  */
+
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
@@ -1116,10 +1112,11 @@
 #endif /* ! YYPARSE_PARAM */
 
 
-/* The lookahead symbol.  */
+
+/* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -1127,9 +1124,9 @@
 
 
 
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+/*----------.
+| yyparse.  |
+`----------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1153,39 +1150,14 @@
 #endif
 #endif
 {
-
-
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-
-       Refer to the stacks thru separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    YYSIZE_T yystacksize;
-
+  
+  int yystate;
   int yyn;
   int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
@@ -1193,28 +1165,51 @@
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
+
   yyssp = yyss;
   yyvsp = yyvs;
 
@@ -1244,6 +1239,7 @@
 	YYSTYPE *yyvs1 = yyvs;
 	yytype_int16 *yyss1 = yyss;
 
+
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
@@ -1251,6 +1247,7 @@
 	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
+
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -1273,8 +1270,9 @@
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -1285,6 +1283,7 @@
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
+
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -1294,9 +1293,6 @@
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
   goto yybackup;
 
 /*-----------.
@@ -1305,16 +1301,16 @@
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
+     look-ahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1346,16 +1342,20 @@
       goto yyreduce;
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the lookahead token.  */
+  /* Shift the look-ahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
 
   yystate = yyn;
   *++yyvsp = yylval;
@@ -1395,8 +1395,6 @@
   switch (yyn)
     {
         case 2:
-
-/* Line 1455 of yacc.c  */
 #line 85 "repl_gram.y"
     {
 					replication_parse_result = (yyvsp[(1) - (2)].node);
@@ -1404,8 +1402,6 @@
     break;
 
   case 8:
-
-/* Line 1455 of yacc.c  */
 #line 105 "repl_gram.y"
     {
 					(yyval.node) = (Node *) makeNode(IdentifySystemCmd);
@@ -1413,8 +1409,6 @@
     break;
 
   case 9:
-
-/* Line 1455 of yacc.c  */
 #line 115 "repl_gram.y"
     {
 					BaseBackupCmd *cmd = (BaseBackupCmd *) makeNode(BaseBackupCmd);
@@ -1424,22 +1418,16 @@
     break;
 
   case 10:
-
-/* Line 1455 of yacc.c  */
 #line 122 "repl_gram.y"
     { (yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].defelt)); ;}
     break;
 
   case 11:
-
-/* Line 1455 of yacc.c  */
 #line 123 "repl_gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 12:
-
-/* Line 1455 of yacc.c  */
 #line 127 "repl_gram.y"
     {
 				  (yyval.defelt) = makeDefElem("label",
@@ -1448,8 +1436,6 @@
     break;
 
   case 13:
-
-/* Line 1455 of yacc.c  */
 #line 132 "repl_gram.y"
     {
 				  (yyval.defelt) = makeDefElem("progress",
@@ -1458,8 +1444,6 @@
     break;
 
   case 14:
-
-/* Line 1455 of yacc.c  */
 #line 137 "repl_gram.y"
     {
 				  (yyval.defelt) = makeDefElem("fast",
@@ -1468,8 +1452,6 @@
     break;
 
   case 15:
-
-/* Line 1455 of yacc.c  */
 #line 142 "repl_gram.y"
     {
 				  (yyval.defelt) = makeDefElem("wal",
@@ -1478,8 +1460,6 @@
     break;
 
   case 16:
-
-/* Line 1455 of yacc.c  */
 #line 147 "repl_gram.y"
     {
 				  (yyval.defelt) = makeDefElem("nowait",
@@ -1488,8 +1468,6 @@
     break;
 
   case 17:
-
-/* Line 1455 of yacc.c  */
 #line 158 "repl_gram.y"
     {
 					StartReplicationCmd *cmd;
@@ -1502,9 +1480,8 @@
     break;
 
 
-
-/* Line 1455 of yacc.c  */
-#line 1508 "repl_gram.c"
+/* Line 1267 of yacc.c.  */
+#line 1485 "repl_gram.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1515,6 +1492,7 @@
 
   *++yyvsp = yyval;
 
+
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -1579,7 +1557,7 @@
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
@@ -1596,7 +1574,7 @@
 	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -1653,6 +1631,9 @@
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   *++yyvsp = yylval;
 
 
@@ -1677,7 +1658,7 @@
   yyresult = 1;
   goto yyreturn;
 
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#ifndef yyoverflow
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -1688,7 +1669,7 @@
 #endif
 
 yyreturn:
-  if (yychar != YYEMPTY)
+  if (yychar != YYEOF && yychar != YYEMPTY)
      yydestruct ("Cleanup: discarding lookahead",
 		 yytoken, &yylval);
   /* Do not reclaim the symbols of the rule which action triggered
@@ -1714,8 +1695,6 @@
 }
 
 
-
-/* Line 1675 of yacc.c  */
 #line 167 "repl_gram.y"
 
 
--- postgresql-9.1.2/src/backend/replication/repl_gram.h	2011-12-01 14:09:58.000000000 -0800
+++ postgresql/src/backend/replication/repl_gram.h	2012-01-06 15:00:18.000000000 -0800
@@ -1,23 +1,24 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
+
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -28,11 +29,10 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -51,16 +51,25 @@
      K_START_REPLICATION = 267
    };
 #endif
+/* Tokens.  */
+#define SCONST 258
+#define RECPTR 259
+#define K_BASE_BACKUP 260
+#define K_IDENTIFY_SYSTEM 261
+#define K_LABEL 262
+#define K_PROGRESS 263
+#define K_FAST 264
+#define K_NOWAIT 265
+#define K_WAL 266
+#define K_START_REPLICATION 267
+
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-{
-
-/* Line 1676 of yacc.c  */
 #line 54 "repl_gram.y"
-
+{
 		char					*str;
 		bool					boolval;
 
@@ -68,17 +77,14 @@
 		Node					*node;
 		List					*list;
 		DefElem					*defelt;
-
-
-
-/* Line 1676 of yacc.c  */
-#line 76 "repl_gram.h"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 1529 of yacc.c.  */
+#line 83 "repl_gram.tab.h"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 extern YYSTYPE replication_yylval;
 
-
--- postgresql-9.1.3/src/interfaces/ecpg/preproc/preproc.c	2012-02-23 15:11:01.000000000 -0800
+++ postgresql/src/interfaces/ecpg/preproc/preproc.c	2012-03-20 15:29:50.000000000 -0700
@@ -1,15 +1,14 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
       Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
    
-   This program is free software: you can redistribute it and/or modify
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
    
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +16,9 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -46,7 +47,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -54,12 +55,6 @@
 /* Pure parsers.  */
 #define YYPURE 0
 
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
@@ -73,486 +68,6 @@
 #define yynerrs         base_yynerrs
 #define yylloc          base_yylloc
 
-/* Copy the first part of user declarations.  */
-
-/* Line 189 of yacc.c  */
-#line 5 "preproc.y"
-
-#include "postgres_fe.h"
-
-#include "extern.h"
-#include "ecpg_config.h"
-#include <unistd.h>
-
-/* Location tracking support --- simpler than bison's default */
-#define YYLLOC_DEFAULT(Current, Rhs, N) \
-	do { \
-                if (N) \
-			(Current) = (Rhs)[1]; \
-		else \
-		        (Current) = (Rhs)[0]; \
-	} while (0)
-
-/*
- * The %name-prefix option below will make bison call base_yylex, but we
- * really want it to call filtered_base_yylex (see parser.c).
- */
-#define base_yylex filtered_base_yylex
-
-/*
- * This is only here so the string gets into the POT.  Bison uses it
- * internally.
- */
-#define bison_gettext_dummy gettext_noop("syntax error")
-
-/*
- * Variables containing simple states.
- */
-int struct_level = 0;
-int braces_open; /* brace level counter */
-char *current_function;
-int ecpg_internal_var = 0;
-char	*connection = NULL;
-char	*input_filename = NULL;
-
-static int	FoundInto = 0;
-static int	initializer = 0;
-static int	pacounter = 1;
-static char     pacounter_buffer[sizeof(int) * CHAR_BIT * 10 / 3]; /* a rough guess at the size we need */
-static struct this_type actual_type[STRUCT_DEPTH];
-static char *actual_startline[STRUCT_DEPTH];
-static int 	varchar_counter = 1;
-
-/* temporarily store struct members while creating the data structure */
-struct ECPGstruct_member *struct_member_list[STRUCT_DEPTH] = { NULL };
-
-/* also store struct type so we can do a sizeof() later */
-static char *ECPGstruct_sizeof = NULL;
-
-/* for forward declarations we have to store some data as well */
-static char *forward_name = NULL;
-
-struct ECPGtype ecpg_no_indicator = {ECPGt_NO_INDICATOR, NULL, NULL, NULL, {NULL}, 0};
-struct variable no_indicator = {"no_indicator", &ecpg_no_indicator, 0, NULL};
-
-struct ECPGtype ecpg_query = {ECPGt_char_variable, NULL, NULL, NULL, {NULL}, 0};
-
-/*
- * Handle parsing errors and warnings
- */
-void
-mmerror(int error_code, enum errortype type, const char *error, ...)
-{
-	va_list ap;
-
-	/* internationalize the error message string */
-	error = _(error);
-
-	fprintf(stderr, "%s:%d: ", input_filename, yylineno);
-
-	switch(type)
-	{
-		case ET_WARNING:
-			fprintf(stderr, _("WARNING: "));
-			break;
-		case ET_ERROR:
-		case ET_FATAL:
-			fprintf(stderr, _("ERROR: "));
-			break;
-	}
-
-	va_start(ap, error);
-	vfprintf(stderr, error, ap);
-	va_end(ap);
-
-	fprintf(stderr, "\n");
-
-	switch(type)
-	{
-		case ET_WARNING:
-			break;
-		case ET_ERROR:
-			ret_value = error_code;
-			break;
-		case ET_FATAL:
-			if (yyin)
-				fclose(yyin);
-			if (yyout)
-				fclose(yyout);
-
-			if (strcmp(output_filename, "-") != 0 && unlink(output_filename) != 0)
-			        fprintf(stderr, _("could not remove output file \"%s\"\n"), output_filename);
-			exit(error_code);
-	}
-}
-
-/*
- * string concatenation
- */
-
-static char *
-cat2_str(char *str1, char *str2)
-{
-	char * res_str	= (char *)mm_alloc(strlen(str1) + strlen(str2) + 2);
-
-	strcpy(res_str, str1);
-	if (strlen(str1) != 0 && strlen(str2) != 0)
-		strcat(res_str, " ");
-	strcat(res_str, str2);
-	free(str1);
-	free(str2);
-	return(res_str);
-}
-
-static char *
-cat_str(int count, ...)
-{
-	va_list		args;
-	int			i;
-	char		*res_str;
-
-	va_start(args, count);
-
-	res_str = va_arg(args, char *);
-
-	/* now add all other strings */
-	for (i = 1; i < count; i++)
-		res_str = cat2_str(res_str, va_arg(args, char *));
-
-	va_end(args);
-
-	return(res_str);
-}
-
-static char *
-make2_str(char *str1, char *str2)
-{
-	char * res_str	= (char *)mm_alloc(strlen(str1) + strlen(str2) + 1);
-
-	strcpy(res_str, str1);
-	strcat(res_str, str2);
-	free(str1);
-	free(str2);
-	return(res_str);
-}
-
-static char *
-make3_str(char *str1, char *str2, char *str3)
-{
-	char * res_str	= (char *)mm_alloc(strlen(str1) + strlen(str2) +strlen(str3) + 1);
-
-	strcpy(res_str, str1);
-	strcat(res_str, str2);
-	strcat(res_str, str3);
-	free(str1);
-	free(str2);
-	free(str3);
-	return(res_str);
-}
-
-/* and the rest */
-static char *
-make_name(void)
-{
-	return mm_strdup(yytext);
-}
-
-static char *
-create_questionmarks(char *name, bool array)
-{
-	struct variable *p = find_variable(name);
-	int count;
-	char *result = EMPTY;
-
-	/* In case we have a struct, we have to print as many "?" as there are attributes in the struct
-	 * An array is only allowed together with an element argument
-	 * This is essantially only used for inserts, but using a struct as input parameter is an error anywhere else
-	 * so we don't have to worry here. */
-
-	if (p->type->type == ECPGt_struct || (array && p->type->type == ECPGt_array && p->type->u.element->type == ECPGt_struct))
-	{
-		struct ECPGstruct_member *m;
-
-		if (p->type->type == ECPGt_struct)
-			m = p->type->u.members;
-		else
-			m = p->type->u.element->u.members;
-
-		for (count = 0; m != NULL; m=m->next, count++);
-	}
-	else
-		count = 1;
-
-	for (; count > 0; count --)
-	{
-		sprintf(pacounter_buffer, "$%d", pacounter++);
-		result = cat_str(3, result, mm_strdup(pacounter_buffer), mm_strdup(" , "));
-	}
-
-	/* removed the trailing " ," */
-
-	result[strlen(result)-3] = '\0';
-	return(result);
-}
-
-static char *
-adjust_outofscope_cursor_vars(struct cursor *cur)
-{
-	/* Informix accepts DECLARE with variables that are out of scope when OPEN is called.
-	 * For instance you can DECLARE a cursor in one function, and OPEN/FETCH/CLOSE
-	 * it in other functions. This is very useful for e.g. event-driver programming,
-	 * but may also lead to dangerous programming. The limitation when this is allowed
-	 * and doesn's cause problems have to be documented, like the allocated variables
-	 * must not be realloc()'ed.
-	 *
-	 * We have to change the variables to our own struct and just store the pointer
-	 * instead of the variable. Do it only for local variables, not for globals.
-	 */
-
-	char *result = mm_strdup("");
-	int insert;
-
-	for (insert = 1; insert >= 0; insert--)
-	{
-		struct arguments *list;
-		struct arguments *ptr;
-		struct arguments *newlist = NULL;
-		struct variable *newvar, *newind;
-
-		list = (insert ? cur->argsinsert : cur->argsresult);
-
-		for (ptr = list; ptr != NULL; ptr = ptr->next)
-		{
-			char temp[20];
-			char *original_var;
-			bool skip_set_var = false;
-
-			/* change variable name to "ECPGget_var(<counter>)" */
-			original_var = ptr->variable->name;
-			sprintf(temp, "%d))", ecpg_internal_var);
-
-			/* Don't emit ECPGset_var() calls for global variables */
-			if (ptr->variable->brace_level == 0)
-			{
-				newvar = ptr->variable;
-				skip_set_var = true;
-			}
-			else if ((ptr->variable->type->type == ECPGt_char_variable) && (!strncmp(ptr->variable->name, "ECPGprepared_statement", strlen("ECPGprepared_statement"))))
-			{
-				newvar = ptr->variable;
-				skip_set_var = true;
-			}
-			else if ((ptr->variable->type->type != ECPGt_varchar && ptr->variable->type->type != ECPGt_char && ptr->variable->type->type != ECPGt_unsigned_char && ptr->variable->type->type != ECPGt_string) && atoi(ptr->variable->type->size) > 1)
-			{
-				newvar = new_variable(cat_str(4, mm_strdup("("), mm_strdup(ecpg_type_name(ptr->variable->type->u.element->type)), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_array_type(ECPGmake_simple_type(ptr->variable->type->u.element->type, mm_strdup("1"), ptr->variable->type->u.element->counter), ptr->variable->type->size), 0);
-				sprintf(temp, "%d, (", ecpg_internal_var++);
-			}
-			else if ((ptr->variable->type->type == ECPGt_varchar || ptr->variable->type->type == ECPGt_char || ptr->variable->type->type == ECPGt_unsigned_char || ptr->variable->type->type == ECPGt_string) && atoi(ptr->variable->type->size) > 1)
-			{
-				newvar = new_variable(cat_str(4, mm_strdup("("), mm_strdup(ecpg_type_name(ptr->variable->type->type)), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_simple_type(ptr->variable->type->type, ptr->variable->type->size, ptr->variable->type->counter), 0);
-				if (ptr->variable->type->type == ECPGt_varchar)
-					sprintf(temp, "%d, &(", ecpg_internal_var++);
-				else
-					sprintf(temp, "%d, (", ecpg_internal_var++);
-			}
-			else if (ptr->variable->type->type == ECPGt_struct || ptr->variable->type->type == ECPGt_union)
-			{
-				sprintf(temp, "%d)))", ecpg_internal_var);
-				newvar = new_variable(cat_str(4, mm_strdup("(*("), mm_strdup(ptr->variable->type->type_name), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_struct_type(ptr->variable->type->u.members, ptr->variable->type->type, ptr->variable->type->type_name, ptr->variable->type->struct_sizeof), 0);
-				sprintf(temp, "%d, &(", ecpg_internal_var++);
-			}
-			else if (ptr->variable->type->type == ECPGt_array)
-			{
-				if (ptr->variable->type->u.element->type == ECPGt_struct || ptr->variable->type->u.element->type == ECPGt_union)
-				{
-					sprintf(temp, "%d)))", ecpg_internal_var);
-					newvar = new_variable(cat_str(4, mm_strdup("(*("), mm_strdup(ptr->variable->type->u.element->type_name), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_struct_type(ptr->variable->type->u.element->u.members, ptr->variable->type->u.element->type, ptr->variable->type->u.element->type_name, ptr->variable->type->u.element->struct_sizeof), 0);
-					sprintf(temp, "%d, (", ecpg_internal_var++);
-				}
-				else
-				{
-					newvar = new_variable(cat_str(4, mm_strdup("("), mm_strdup(ecpg_type_name(ptr->variable->type->type)), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_array_type(ECPGmake_simple_type(ptr->variable->type->u.element->type, ptr->variable->type->u.element->size, ptr->variable->type->u.element->counter), ptr->variable->type->size), 0);
-					sprintf(temp, "%d, &(", ecpg_internal_var++);
-				}
-			}
-			else
-			{
-				newvar = new_variable(cat_str(4, mm_strdup("*("), mm_strdup(ecpg_type_name(ptr->variable->type->type)), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_simple_type(ptr->variable->type->type, ptr->variable->type->size, ptr->variable->type->counter), 0);
-				sprintf(temp, "%d, &(", ecpg_internal_var++);
-			}
-
-			/* create call to "ECPGset_var(<counter>, <pointer>. <line number>)" */
-			if (!skip_set_var)
-				result = cat_str(5, result, mm_strdup("ECPGset_var("), mm_strdup(temp), mm_strdup(original_var), mm_strdup("), __LINE__);\n"));
-
-			/* now the indicator if there is one and it's not a global variable */
-			if ((ptr->indicator->type->type == ECPGt_NO_INDICATOR) || (ptr->indicator->brace_level == 0))
-			{
-				newind = ptr->indicator;
-			}
-			else
-			{
-				/* change variable name to "ECPGget_var(<counter>)" */
-				original_var = ptr->indicator->name;
-				sprintf(temp, "%d))", ecpg_internal_var);
-
-				if (ptr->indicator->type->type == ECPGt_struct || ptr->indicator->type->type == ECPGt_union)
-				{
-					sprintf(temp, "%d)))", ecpg_internal_var);
-					newind = new_variable(cat_str(4, mm_strdup("(*("), mm_strdup(ptr->indicator->type->type_name), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_struct_type(ptr->indicator->type->u.members, ptr->indicator->type->type, ptr->indicator->type->type_name, ptr->indicator->type->struct_sizeof), 0);
-					sprintf(temp, "%d, &(", ecpg_internal_var++);
-				}
-				else if (ptr->indicator->type->type == ECPGt_array)
-				{
-					if (ptr->indicator->type->u.element->type == ECPGt_struct || ptr->indicator->type->u.element->type == ECPGt_union)
-					{
-						sprintf(temp, "%d)))", ecpg_internal_var);
-						newind = new_variable(cat_str(4, mm_strdup("(*("), mm_strdup(ptr->indicator->type->u.element->type_name), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_struct_type(ptr->indicator->type->u.element->u.members, ptr->indicator->type->u.element->type, ptr->indicator->type->u.element->type_name, ptr->indicator->type->u.element->struct_sizeof), 0);
-						sprintf(temp, "%d, (", ecpg_internal_var++);
-					}
-					else
-					{
-						newind = new_variable(cat_str(4, mm_strdup("("), mm_strdup(ecpg_type_name(ptr->indicator->type->u.element->type)), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_array_type(ECPGmake_simple_type(ptr->indicator->type->u.element->type, ptr->indicator->type->u.element->size, ptr->indicator->type->u.element->counter), ptr->indicator->type->size), 0);
-						sprintf(temp, "%d, &(", ecpg_internal_var++);
-					}
-				}
-				else if (atoi(ptr->indicator->type->size) > 1)
-				{
-					newind = new_variable(cat_str(4, mm_strdup("("), mm_strdup(ecpg_type_name(ptr->indicator->type->type)), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_simple_type(ptr->indicator->type->type, ptr->indicator->type->size, ptr->variable->type->counter), 0);
-					sprintf(temp, "%d, (", ecpg_internal_var++);
-				}
-				else
-				{
-					newind = new_variable(cat_str(4, mm_strdup("*("), mm_strdup(ecpg_type_name(ptr->indicator->type->type)), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_simple_type(ptr->indicator->type->type, ptr->indicator->type->size, ptr->variable->type->counter), 0);
-					sprintf(temp, "%d, &(", ecpg_internal_var++);
-				}
-
-				/* create call to "ECPGset_var(<counter>, <pointer>. <line number>)" */
-				result = cat_str(5, result, mm_strdup("ECPGset_var("), mm_strdup(temp), mm_strdup(original_var), mm_strdup("), __LINE__);\n"));
-			}
-
-			add_variable_to_tail(&newlist, newvar, newind);
-		}
-
-		if (insert)
-			cur->argsinsert_oos = newlist;
-		else
-			cur->argsresult_oos = newlist;
-	}
-
-	return result;
-}
-
-/* This tests whether the cursor was declared and opened in the same function. */
-#define SAMEFUNC(cur)	\
-	((cur->function == NULL) ||		\
-	 (cur->function != NULL && !strcmp(cur->function, current_function)))
-
-static struct cursor *
-add_additional_variables(char *name, bool insert)
-{
-	struct cursor *ptr;
-	struct arguments *p;
-	int (* strcmp_fn)(const char *, const char *) = (name[0] == ':' ? strcmp : pg_strcasecmp);
-
-	for (ptr = cur; ptr != NULL; ptr=ptr->next)
-	{
-		if (strcmp_fn(ptr->name, name) == 0)
-			break;
-	}
-
-	if (ptr == NULL)
-	{
-		mmerror(PARSE_ERROR, ET_ERROR, "cursor \"%s\" does not exist", name);
-		return NULL;
-	}
-
-	if (insert)
-	{
-		/* add all those input variables that were given earlier
-		 * note that we have to append here but have to keep the existing order */
-		for (p = (SAMEFUNC(ptr) ? ptr->argsinsert : ptr->argsinsert_oos); p; p = p->next)
-			add_variable_to_tail(&argsinsert, p->variable, p->indicator);
-	}
-
-	/* add all those output variables that were given earlier */
-	for (p = (SAMEFUNC(ptr) ? ptr->argsresult : ptr->argsresult_oos); p; p = p->next)
-		add_variable_to_tail(&argsresult, p->variable, p->indicator);
-
-	return ptr;
-}
-
-static void
-add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enum, char *type_dimension, char *type_index, int initializer, int array)
-{
-	/* add entry to list */
-	struct typedefs *ptr, *this;
-
-	if ((type_enum == ECPGt_struct ||
-	     type_enum == ECPGt_union) &&
-	    initializer == 1)
-		mmerror(PARSE_ERROR, ET_ERROR, "initializer not allowed in type definition");
-	else if (INFORMIX_MODE && strcmp(name, "string") == 0)
-		mmerror(PARSE_ERROR, ET_ERROR, "type name \"string\" is reserved in Informix mode");
-	else
-	{
-		for (ptr = types; ptr != NULL; ptr = ptr->next)
-		{
-			if (strcmp(name, ptr->name) == 0)
-				/* re-definition is a bug */
-				mmerror(PARSE_ERROR, ET_ERROR, "type \"%s\" is already defined", name);
-		}
-		adjust_array(type_enum, &dimension, &length, type_dimension, type_index, array, true);
-
-		this = (struct typedefs *) mm_alloc(sizeof(struct typedefs));
-
-		/* initial definition */
-		this->next = types;
-		this->name = name;
-		this->brace_level = braces_open;
-		this->type = (struct this_type *) mm_alloc(sizeof(struct this_type));
-		this->type->type_enum = type_enum;
-		this->type->type_str = mm_strdup(name);
-		this->type->type_dimension = dimension; /* dimension of array */
-		this->type->type_index = length;	/* length of string */
-		this->type->type_sizeof = ECPGstruct_sizeof;
-		this->struct_member_list = (type_enum == ECPGt_struct || type_enum == ECPGt_union) ?
-		ECPGstruct_member_dup(struct_member_list[struct_level]) : NULL;
-
-		if (type_enum != ECPGt_varchar &&
-			type_enum != ECPGt_char &&
-			type_enum != ECPGt_unsigned_char &&
-			type_enum != ECPGt_string &&
-			atoi(this->type->type_index) >= 0)
-			mmerror(PARSE_ERROR, ET_ERROR, "multidimensional arrays for simple data types are not supported");
-
-		types = this;
-	}
-}
-
-
-/* Line 189 of yacc.c  */
-#line 536 "preproc.c"
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
-
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -1047,16 +562,975 @@ add_typedef(char *name, char * dimension
      UMINUS = 743
    };
 #endif
+/* Tokens.  */
+#define SQL_ALLOCATE 258
+#define SQL_AUTOCOMMIT 259
+#define SQL_BOOL 260
+#define SQL_BREAK 261
+#define SQL_CALL 262
+#define SQL_CARDINALITY 263
+#define SQL_CONNECT 264
+#define SQL_COUNT 265
+#define SQL_DATETIME_INTERVAL_CODE 266
+#define SQL_DATETIME_INTERVAL_PRECISION 267
+#define SQL_DESCRIBE 268
+#define SQL_DESCRIPTOR 269
+#define SQL_DISCONNECT 270
+#define SQL_FOUND 271
+#define SQL_FREE 272
+#define SQL_GET 273
+#define SQL_GO 274
+#define SQL_GOTO 275
+#define SQL_IDENTIFIED 276
+#define SQL_INDICATOR 277
+#define SQL_KEY_MEMBER 278
+#define SQL_LENGTH 279
+#define SQL_LONG 280
+#define SQL_NULLABLE 281
+#define SQL_OCTET_LENGTH 282
+#define SQL_OPEN 283
+#define SQL_OUTPUT 284
+#define SQL_REFERENCE 285
+#define SQL_RETURNED_LENGTH 286
+#define SQL_RETURNED_OCTET_LENGTH 287
+#define SQL_SCALE 288
+#define SQL_SECTION 289
+#define SQL_SHORT 290
+#define SQL_SIGNED 291
+#define SQL_SQL 292
+#define SQL_SQLERROR 293
+#define SQL_SQLPRINT 294
+#define SQL_SQLWARNING 295
+#define SQL_START 296
+#define SQL_STOP 297
+#define SQL_STRUCT 298
+#define SQL_UNSIGNED 299
+#define SQL_VAR 300
+#define SQL_WHENEVER 301
+#define S_ADD 302
+#define S_AND 303
+#define S_ANYTHING 304
+#define S_AUTO 305
+#define S_CONST 306
+#define S_DEC 307
+#define S_DIV 308
+#define S_DOTPOINT 309
+#define S_EQUAL 310
+#define S_EXTERN 311
+#define S_INC 312
+#define S_LSHIFT 313
+#define S_MEMPOINT 314
+#define S_MEMBER 315
+#define S_MOD 316
+#define S_MUL 317
+#define S_NEQUAL 318
+#define S_OR 319
+#define S_REGISTER 320
+#define S_RSHIFT 321
+#define S_STATIC 322
+#define S_SUB 323
+#define S_VOLATILE 324
+#define S_TYPEDEF 325
+#define CSTRING 326
+#define CVARIABLE 327
+#define CPP_LINE 328
+#define IP 329
+#define DOLCONST 330
+#define ECONST 331
+#define NCONST 332
+#define UCONST 333
+#define UIDENT 334
+#define IDENT 335
+#define FCONST 336
+#define SCONST 337
+#define BCONST 338
+#define XCONST 339
+#define Op 340
+#define ICONST 341
+#define PARAM 342
+#define TYPECAST 343
+#define DOT_DOT 344
+#define COLON_EQUALS 345
+#define ABORT_P 346
+#define ABSOLUTE_P 347
+#define ACCESS 348
+#define ACTION 349
+#define ADD_P 350
+#define ADMIN 351
+#define AFTER 352
+#define AGGREGATE 353
+#define ALL 354
+#define ALSO 355
+#define ALTER 356
+#define ALWAYS 357
+#define ANALYSE 358
+#define ANALYZE 359
+#define AND 360
+#define ANY 361
+#define ARRAY 362
+#define AS 363
+#define ASC 364
+#define ASSERTION 365
+#define ASSIGNMENT 366
+#define ASYMMETRIC 367
+#define AT 368
+#define ATTRIBUTE 369
+#define AUTHORIZATION 370
+#define BACKWARD 371
+#define BEFORE 372
+#define BEGIN_P 373
+#define BETWEEN 374
+#define BIGINT 375
+#define BINARY 376
+#define BIT 377
+#define BOOLEAN_P 378
+#define BOTH 379
+#define BY 380
+#define CACHE 381
+#define CALLED 382
+#define CASCADE 383
+#define CASCADED 384
+#define CASE 385
+#define CAST 386
+#define CATALOG_P 387
+#define CHAIN 388
+#define CHAR_P 389
+#define CHARACTER 390
+#define CHARACTERISTICS 391
+#define CHECK 392
+#define CHECKPOINT 393
+#define CLASS 394
+#define CLOSE 395
+#define CLUSTER 396
+#define COALESCE 397
+#define COLLATE 398
+#define COLLATION 399
+#define COLUMN 400
+#define COMMENT 401
+#define COMMENTS 402
+#define COMMIT 403
+#define COMMITTED 404
+#define CONCURRENTLY 405
+#define CONFIGURATION 406
+#define CONNECTION 407
+#define CONSTRAINT 408
+#define CONSTRAINTS 409
+#define CONTENT_P 410
+#define CONTINUE_P 411
+#define CONVERSION_P 412
+#define COPY 413
+#define COST 414
+#define CREATE 415
+#define CROSS 416
+#define CSV 417
+#define CURRENT_P 418
+#define CURRENT_CATALOG 419
+#define CURRENT_DATE 420
+#define CURRENT_ROLE 421
+#define CURRENT_SCHEMA 422
+#define CURRENT_TIME 423
+#define CURRENT_TIMESTAMP 424
+#define CURRENT_USER 425
+#define CURSOR 426
+#define CYCLE 427
+#define DATA_P 428
+#define DATABASE 429
+#define DAY_P 430
+#define DEALLOCATE 431
+#define DEC 432
+#define DECIMAL_P 433
+#define DECLARE 434
+#define DEFAULT 435
+#define DEFAULTS 436
+#define DEFERRABLE 437
+#define DEFERRED 438
+#define DEFINER 439
+#define DELETE_P 440
+#define DELIMITER 441
+#define DELIMITERS 442
+#define DESC 443
+#define DICTIONARY 444
+#define DISABLE_P 445
+#define DISCARD 446
+#define DISTINCT 447
+#define DO 448
+#define DOCUMENT_P 449
+#define DOMAIN_P 450
+#define DOUBLE_P 451
+#define DROP 452
+#define EACH 453
+#define ELSE 454
+#define ENABLE_P 455
+#define ENCODING 456
+#define ENCRYPTED 457
+#define END_P 458
+#define ENUM_P 459
+#define ESCAPE 460
+#define EXCEPT 461
+#define EXCLUDE 462
+#define EXCLUDING 463
+#define EXCLUSIVE 464
+#define EXECUTE 465
+#define EXISTS 466
+#define EXPLAIN 467
+#define EXTENSION 468
+#define EXTERNAL 469
+#define EXTRACT 470
+#define FALSE_P 471
+#define FAMILY 472
+#define FETCH 473
+#define FIRST_P 474
+#define FLOAT_P 475
+#define FOLLOWING 476
+#define FOR 477
+#define FORCE 478
+#define FOREIGN 479
+#define FORWARD 480
+#define FREEZE 481
+#define FROM 482
+#define FULL 483
+#define FUNCTION 484
+#define FUNCTIONS 485
+#define GLOBAL 486
+#define GRANT 487
+#define GRANTED 488
+#define GREATEST 489
+#define GROUP_P 490
+#define HANDLER 491
+#define HAVING 492
+#define HEADER_P 493
+#define HOLD 494
+#define HOUR_P 495
+#define IDENTITY_P 496
+#define IF_P 497
+#define ILIKE 498
+#define IMMEDIATE 499
+#define IMMUTABLE 500
+#define IMPLICIT_P 501
+#define IN_P 502
+#define INCLUDING 503
+#define INCREMENT 504
+#define INDEX 505
+#define INDEXES 506
+#define INHERIT 507
+#define INHERITS 508
+#define INITIALLY 509
+#define INLINE_P 510
+#define INNER_P 511
+#define INOUT 512
+#define INPUT_P 513
+#define INSENSITIVE 514
+#define INSERT 515
+#define INSTEAD 516
+#define INT_P 517
+#define INTEGER 518
+#define INTERSECT 519
+#define INTERVAL 520
+#define INTO 521
+#define INVOKER 522
+#define IS 523
+#define ISNULL 524
+#define ISOLATION 525
+#define JOIN 526
+#define KEY 527
+#define LABEL 528
+#define LANGUAGE 529
+#define LARGE_P 530
+#define LAST_P 531
+#define LC_COLLATE_P 532
+#define LC_CTYPE_P 533
+#define LEADING 534
+#define LEAST 535
+#define LEFT 536
+#define LEVEL 537
+#define LIKE 538
+#define LIMIT 539
+#define LISTEN 540
+#define LOAD 541
+#define LOCAL 542
+#define LOCALTIME 543
+#define LOCALTIMESTAMP 544
+#define LOCATION 545
+#define LOCK_P 546
+#define MAPPING 547
+#define MATCH 548
+#define MAXVALUE 549
+#define MINUTE_P 550
+#define MINVALUE 551
+#define MODE 552
+#define MONTH_P 553
+#define MOVE 554
+#define NAME_P 555
+#define NAMES 556
+#define NATIONAL 557
+#define NATURAL 558
+#define NCHAR 559
+#define NEXT 560
+#define NO 561
+#define NONE 562
+#define NOT 563
+#define NOTHING 564
+#define NOTIFY 565
+#define NOTNULL 566
+#define NOWAIT 567
+#define NULL_P 568
+#define NULLIF 569
+#define NULLS_P 570
+#define NUMERIC 571
+#define OBJECT_P 572
+#define OF 573
+#define OFF 574
+#define OFFSET 575
+#define OIDS 576
+#define ON 577
+#define ONLY 578
+#define OPERATOR 579
+#define OPTION 580
+#define OPTIONS 581
+#define OR 582
+#define ORDER 583
+#define OUT_P 584
+#define OUTER_P 585
+#define OVER 586
+#define OVERLAPS 587
+#define OVERLAY 588
+#define OWNED 589
+#define OWNER 590
+#define PARSER 591
+#define PARTIAL 592
+#define PARTITION 593
+#define PASSING 594
+#define PASSWORD 595
+#define PLACING 596
+#define PLANS 597
+#define POSITION 598
+#define PRECEDING 599
+#define PRECISION 600
+#define PRESERVE 601
+#define PREPARE 602
+#define PREPARED 603
+#define PRIMARY 604
+#define PRIOR 605
+#define PRIVILEGES 606
+#define PROCEDURAL 607
+#define PROCEDURE 608
+#define QUOTE 609
+#define RANGE 610
+#define READ 611
+#define REAL 612
+#define REASSIGN 613
+#define RECHECK 614
+#define RECURSIVE 615
+#define REF 616
+#define REFERENCES 617
+#define REINDEX 618
+#define RELATIVE_P 619
+#define RELEASE 620
+#define RENAME 621
+#define REPEATABLE 622
+#define REPLACE 623
+#define REPLICA 624
+#define RESET 625
+#define RESTART 626
+#define RESTRICT 627
+#define RETURNING 628
+#define RETURNS 629
+#define REVOKE 630
+#define RIGHT 631
+#define ROLE 632
+#define ROLLBACK 633
+#define ROW 634
+#define ROWS 635
+#define RULE 636
+#define SAVEPOINT 637
+#define SCHEMA 638
+#define SCROLL 639
+#define SEARCH 640
+#define SECOND_P 641
+#define SECURITY 642
+#define SELECT 643
+#define SEQUENCE 644
+#define SEQUENCES 645
+#define SERIALIZABLE 646
+#define SERVER 647
+#define SESSION 648
+#define SESSION_USER 649
+#define SET 650
+#define SETOF 651
+#define SHARE 652
+#define SHOW 653
+#define SIMILAR 654
+#define SIMPLE 655
+#define SMALLINT 656
+#define SOME 657
+#define STABLE 658
+#define STANDALONE_P 659
+#define START 660
+#define STATEMENT 661
+#define STATISTICS 662
+#define STDIN 663
+#define STDOUT 664
+#define STORAGE 665
+#define STRICT_P 666
+#define STRIP_P 667
+#define SUBSTRING 668
+#define SYMMETRIC 669
+#define SYSID 670
+#define SYSTEM_P 671
+#define TABLE 672
+#define TABLES 673
+#define TABLESPACE 674
+#define TEMP 675
+#define TEMPLATE 676
+#define TEMPORARY 677
+#define TEXT_P 678
+#define THEN 679
+#define TIME 680
+#define TIMESTAMP 681
+#define TO 682
+#define TRAILING 683
+#define TRANSACTION 684
+#define TREAT 685
+#define TRIGGER 686
+#define TRIM 687
+#define TRUE_P 688
+#define TRUNCATE 689
+#define TRUSTED 690
+#define TYPE_P 691
+#define UNBOUNDED 692
+#define UNCOMMITTED 693
+#define UNENCRYPTED 694
+#define UNION 695
+#define UNIQUE 696
+#define UNKNOWN 697
+#define UNLISTEN 698
+#define UNLOGGED 699
+#define UNTIL 700
+#define UPDATE 701
+#define USER 702
+#define USING 703
+#define VACUUM 704
+#define VALID 705
+#define VALIDATE 706
+#define VALIDATOR 707
+#define VALUE_P 708
+#define VALUES 709
+#define VARCHAR 710
+#define VARIADIC 711
+#define VARYING 712
+#define VERBOSE 713
+#define VERSION_P 714
+#define VIEW 715
+#define VOLATILE 716
+#define WHEN 717
+#define WHERE 718
+#define WHITESPACE_P 719
+#define WINDOW 720
+#define WITH 721
+#define WITHOUT 722
+#define WORK 723
+#define WRAPPER 724
+#define WRITE 725
+#define XML_P 726
+#define XMLATTRIBUTES 727
+#define XMLCONCAT 728
+#define XMLELEMENT 729
+#define XMLEXISTS 730
+#define XMLFOREST 731
+#define XMLPARSE 732
+#define XMLPI 733
+#define XMLROOT 734
+#define XMLSERIALIZE 735
+#define YEAR_P 736
+#define YES_P 737
+#define ZONE 738
+#define NULLS_FIRST 739
+#define NULLS_LAST 740
+#define WITH_TIME 741
+#define POSTFIXOP 742
+#define UMINUS 743
 
 
 
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+
+/* Copy the first part of user declarations.  */
+#line 5 "preproc.y"
+
+#include "postgres_fe.h"
+
+#include "extern.h"
+#include "ecpg_config.h"
+#include <unistd.h>
+
+/* Location tracking support --- simpler than bison's default */
+#define YYLLOC_DEFAULT(Current, Rhs, N) \
+	do { \
+                if (N) \
+			(Current) = (Rhs)[1]; \
+		else \
+		        (Current) = (Rhs)[0]; \
+	} while (0)
+
+/*
+ * The %name-prefix option below will make bison call base_yylex, but we
+ * really want it to call filtered_base_yylex (see parser.c).
+ */
+#define base_yylex filtered_base_yylex
+
+/*
+ * This is only here so the string gets into the POT.  Bison uses it
+ * internally.
+ */
+#define bison_gettext_dummy gettext_noop("syntax error")
+
+/*
+ * Variables containing simple states.
+ */
+int struct_level = 0;
+int braces_open; /* brace level counter */
+char *current_function;
+int ecpg_internal_var = 0;
+char	*connection = NULL;
+char	*input_filename = NULL;
+
+static int	FoundInto = 0;
+static int	initializer = 0;
+static int	pacounter = 1;
+static char     pacounter_buffer[sizeof(int) * CHAR_BIT * 10 / 3]; /* a rough guess at the size we need */
+static struct this_type actual_type[STRUCT_DEPTH];
+static char *actual_startline[STRUCT_DEPTH];
+static int 	varchar_counter = 1;
+
+/* temporarily store struct members while creating the data structure */
+struct ECPGstruct_member *struct_member_list[STRUCT_DEPTH] = { NULL };
+
+/* also store struct type so we can do a sizeof() later */
+static char *ECPGstruct_sizeof = NULL;
+
+/* for forward declarations we have to store some data as well */
+static char *forward_name = NULL;
+
+struct ECPGtype ecpg_no_indicator = {ECPGt_NO_INDICATOR, NULL, NULL, NULL, {NULL}, 0};
+struct variable no_indicator = {"no_indicator", &ecpg_no_indicator, 0, NULL};
+
+struct ECPGtype ecpg_query = {ECPGt_char_variable, NULL, NULL, NULL, {NULL}, 0};
+
+/*
+ * Handle parsing errors and warnings
+ */
+void
+mmerror(int error_code, enum errortype type, const char *error, ...)
 {
+	va_list ap;
 
-/* Line 214 of yacc.c  */
-#line 463 "preproc.y"
+	/* internationalize the error message string */
+	error = _(error);
+
+	fprintf(stderr, "%s:%d: ", input_filename, yylineno);
+
+	switch(type)
+	{
+		case ET_WARNING:
+			fprintf(stderr, _("WARNING: "));
+			break;
+		case ET_ERROR:
+		case ET_FATAL:
+			fprintf(stderr, _("ERROR: "));
+			break;
+	}
+
+	va_start(ap, error);
+	vfprintf(stderr, error, ap);
+	va_end(ap);
+
+	fprintf(stderr, "\n");
+
+	switch(type)
+	{
+		case ET_WARNING:
+			break;
+		case ET_ERROR:
+			ret_value = error_code;
+			break;
+		case ET_FATAL:
+			if (yyin)
+				fclose(yyin);
+			if (yyout)
+				fclose(yyout);
 
+			if (strcmp(output_filename, "-") != 0 && unlink(output_filename) != 0)
+			        fprintf(stderr, _("could not remove output file \"%s\"\n"), output_filename);
+			exit(error_code);
+	}
+}
+
+/*
+ * string concatenation
+ */
+
+static char *
+cat2_str(char *str1, char *str2)
+{
+	char * res_str	= (char *)mm_alloc(strlen(str1) + strlen(str2) + 2);
+
+	strcpy(res_str, str1);
+	if (strlen(str1) != 0 && strlen(str2) != 0)
+		strcat(res_str, " ");
+	strcat(res_str, str2);
+	free(str1);
+	free(str2);
+	return(res_str);
+}
+
+static char *
+cat_str(int count, ...)
+{
+	va_list		args;
+	int			i;
+	char		*res_str;
+
+	va_start(args, count);
+
+	res_str = va_arg(args, char *);
+
+	/* now add all other strings */
+	for (i = 1; i < count; i++)
+		res_str = cat2_str(res_str, va_arg(args, char *));
+
+	va_end(args);
+
+	return(res_str);
+}
+
+static char *
+make2_str(char *str1, char *str2)
+{
+	char * res_str	= (char *)mm_alloc(strlen(str1) + strlen(str2) + 1);
+
+	strcpy(res_str, str1);
+	strcat(res_str, str2);
+	free(str1);
+	free(str2);
+	return(res_str);
+}
+
+static char *
+make3_str(char *str1, char *str2, char *str3)
+{
+	char * res_str	= (char *)mm_alloc(strlen(str1) + strlen(str2) +strlen(str3) + 1);
+
+	strcpy(res_str, str1);
+	strcat(res_str, str2);
+	strcat(res_str, str3);
+	free(str1);
+	free(str2);
+	free(str3);
+	return(res_str);
+}
+
+/* and the rest */
+static char *
+make_name(void)
+{
+	return mm_strdup(yytext);
+}
+
+static char *
+create_questionmarks(char *name, bool array)
+{
+	struct variable *p = find_variable(name);
+	int count;
+	char *result = EMPTY;
+
+	/* In case we have a struct, we have to print as many "?" as there are attributes in the struct
+	 * An array is only allowed together with an element argument
+	 * This is essantially only used for inserts, but using a struct as input parameter is an error anywhere else
+	 * so we don't have to worry here. */
+
+	if (p->type->type == ECPGt_struct || (array && p->type->type == ECPGt_array && p->type->u.element->type == ECPGt_struct))
+	{
+		struct ECPGstruct_member *m;
+
+		if (p->type->type == ECPGt_struct)
+			m = p->type->u.members;
+		else
+			m = p->type->u.element->u.members;
+
+		for (count = 0; m != NULL; m=m->next, count++);
+	}
+	else
+		count = 1;
+
+	for (; count > 0; count --)
+	{
+		sprintf(pacounter_buffer, "$%d", pacounter++);
+		result = cat_str(3, result, mm_strdup(pacounter_buffer), mm_strdup(" , "));
+	}
+
+	/* removed the trailing " ," */
+
+	result[strlen(result)-3] = '\0';
+	return(result);
+}
+
+static char *
+adjust_outofscope_cursor_vars(struct cursor *cur)
+{
+	/* Informix accepts DECLARE with variables that are out of scope when OPEN is called.
+	 * For instance you can DECLARE a cursor in one function, and OPEN/FETCH/CLOSE
+	 * it in other functions. This is very useful for e.g. event-driver programming,
+	 * but may also lead to dangerous programming. The limitation when this is allowed
+	 * and doesn's cause problems have to be documented, like the allocated variables
+	 * must not be realloc()'ed.
+	 *
+	 * We have to change the variables to our own struct and just store the pointer
+	 * instead of the variable. Do it only for local variables, not for globals.
+	 */
+
+	char *result = mm_strdup("");
+	int insert;
+
+	for (insert = 1; insert >= 0; insert--)
+	{
+		struct arguments *list;
+		struct arguments *ptr;
+		struct arguments *newlist = NULL;
+		struct variable *newvar, *newind;
+
+		list = (insert ? cur->argsinsert : cur->argsresult);
+
+		for (ptr = list; ptr != NULL; ptr = ptr->next)
+		{
+			char temp[20];
+			char *original_var;
+			bool skip_set_var = false;
+
+			/* change variable name to "ECPGget_var(<counter>)" */
+			original_var = ptr->variable->name;
+			sprintf(temp, "%d))", ecpg_internal_var);
+
+			/* Don't emit ECPGset_var() calls for global variables */
+			if (ptr->variable->brace_level == 0)
+			{
+				newvar = ptr->variable;
+				skip_set_var = true;
+			}
+			else if ((ptr->variable->type->type == ECPGt_char_variable) && (!strncmp(ptr->variable->name, "ECPGprepared_statement", strlen("ECPGprepared_statement"))))
+			{
+				newvar = ptr->variable;
+				skip_set_var = true;
+			}
+			else if ((ptr->variable->type->type != ECPGt_varchar && ptr->variable->type->type != ECPGt_char && ptr->variable->type->type != ECPGt_unsigned_char && ptr->variable->type->type != ECPGt_string) && atoi(ptr->variable->type->size) > 1)
+			{
+				newvar = new_variable(cat_str(4, mm_strdup("("), mm_strdup(ecpg_type_name(ptr->variable->type->u.element->type)), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_array_type(ECPGmake_simple_type(ptr->variable->type->u.element->type, mm_strdup("1"), ptr->variable->type->u.element->counter), ptr->variable->type->size), 0);
+				sprintf(temp, "%d, (", ecpg_internal_var++);
+			}
+			else if ((ptr->variable->type->type == ECPGt_varchar || ptr->variable->type->type == ECPGt_char || ptr->variable->type->type == ECPGt_unsigned_char || ptr->variable->type->type == ECPGt_string) && atoi(ptr->variable->type->size) > 1)
+			{
+				newvar = new_variable(cat_str(4, mm_strdup("("), mm_strdup(ecpg_type_name(ptr->variable->type->type)), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_simple_type(ptr->variable->type->type, ptr->variable->type->size, ptr->variable->type->counter), 0);
+				if (ptr->variable->type->type == ECPGt_varchar)
+					sprintf(temp, "%d, &(", ecpg_internal_var++);
+				else
+					sprintf(temp, "%d, (", ecpg_internal_var++);
+			}
+			else if (ptr->variable->type->type == ECPGt_struct || ptr->variable->type->type == ECPGt_union)
+			{
+				sprintf(temp, "%d)))", ecpg_internal_var);
+				newvar = new_variable(cat_str(4, mm_strdup("(*("), mm_strdup(ptr->variable->type->type_name), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_struct_type(ptr->variable->type->u.members, ptr->variable->type->type, ptr->variable->type->type_name, ptr->variable->type->struct_sizeof), 0);
+				sprintf(temp, "%d, &(", ecpg_internal_var++);
+			}
+			else if (ptr->variable->type->type == ECPGt_array)
+			{
+				if (ptr->variable->type->u.element->type == ECPGt_struct || ptr->variable->type->u.element->type == ECPGt_union)
+				{
+					sprintf(temp, "%d)))", ecpg_internal_var);
+					newvar = new_variable(cat_str(4, mm_strdup("(*("), mm_strdup(ptr->variable->type->u.element->type_name), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_struct_type(ptr->variable->type->u.element->u.members, ptr->variable->type->u.element->type, ptr->variable->type->u.element->type_name, ptr->variable->type->u.element->struct_sizeof), 0);
+					sprintf(temp, "%d, (", ecpg_internal_var++);
+				}
+				else
+				{
+					newvar = new_variable(cat_str(4, mm_strdup("("), mm_strdup(ecpg_type_name(ptr->variable->type->type)), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_array_type(ECPGmake_simple_type(ptr->variable->type->u.element->type, ptr->variable->type->u.element->size, ptr->variable->type->u.element->counter), ptr->variable->type->size), 0);
+					sprintf(temp, "%d, &(", ecpg_internal_var++);
+				}
+			}
+			else
+			{
+				newvar = new_variable(cat_str(4, mm_strdup("*("), mm_strdup(ecpg_type_name(ptr->variable->type->type)), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_simple_type(ptr->variable->type->type, ptr->variable->type->size, ptr->variable->type->counter), 0);
+				sprintf(temp, "%d, &(", ecpg_internal_var++);
+			}
+
+			/* create call to "ECPGset_var(<counter>, <pointer>. <line number>)" */
+			if (!skip_set_var)
+				result = cat_str(5, result, mm_strdup("ECPGset_var("), mm_strdup(temp), mm_strdup(original_var), mm_strdup("), __LINE__);\n"));
+
+			/* now the indicator if there is one and it's not a global variable */
+			if ((ptr->indicator->type->type == ECPGt_NO_INDICATOR) || (ptr->indicator->brace_level == 0))
+			{
+				newind = ptr->indicator;
+			}
+			else
+			{
+				/* change variable name to "ECPGget_var(<counter>)" */
+				original_var = ptr->indicator->name;
+				sprintf(temp, "%d))", ecpg_internal_var);
+
+				if (ptr->indicator->type->type == ECPGt_struct || ptr->indicator->type->type == ECPGt_union)
+				{
+					sprintf(temp, "%d)))", ecpg_internal_var);
+					newind = new_variable(cat_str(4, mm_strdup("(*("), mm_strdup(ptr->indicator->type->type_name), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_struct_type(ptr->indicator->type->u.members, ptr->indicator->type->type, ptr->indicator->type->type_name, ptr->indicator->type->struct_sizeof), 0);
+					sprintf(temp, "%d, &(", ecpg_internal_var++);
+				}
+				else if (ptr->indicator->type->type == ECPGt_array)
+				{
+					if (ptr->indicator->type->u.element->type == ECPGt_struct || ptr->indicator->type->u.element->type == ECPGt_union)
+					{
+						sprintf(temp, "%d)))", ecpg_internal_var);
+						newind = new_variable(cat_str(4, mm_strdup("(*("), mm_strdup(ptr->indicator->type->u.element->type_name), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_struct_type(ptr->indicator->type->u.element->u.members, ptr->indicator->type->u.element->type, ptr->indicator->type->u.element->type_name, ptr->indicator->type->u.element->struct_sizeof), 0);
+						sprintf(temp, "%d, (", ecpg_internal_var++);
+					}
+					else
+					{
+						newind = new_variable(cat_str(4, mm_strdup("("), mm_strdup(ecpg_type_name(ptr->indicator->type->u.element->type)), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_array_type(ECPGmake_simple_type(ptr->indicator->type->u.element->type, ptr->indicator->type->u.element->size, ptr->indicator->type->u.element->counter), ptr->indicator->type->size), 0);
+						sprintf(temp, "%d, &(", ecpg_internal_var++);
+					}
+				}
+				else if (atoi(ptr->indicator->type->size) > 1)
+				{
+					newind = new_variable(cat_str(4, mm_strdup("("), mm_strdup(ecpg_type_name(ptr->indicator->type->type)), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_simple_type(ptr->indicator->type->type, ptr->indicator->type->size, ptr->variable->type->counter), 0);
+					sprintf(temp, "%d, (", ecpg_internal_var++);
+				}
+				else
+				{
+					newind = new_variable(cat_str(4, mm_strdup("*("), mm_strdup(ecpg_type_name(ptr->indicator->type->type)), mm_strdup(" *)(ECPGget_var("), mm_strdup(temp)), ECPGmake_simple_type(ptr->indicator->type->type, ptr->indicator->type->size, ptr->variable->type->counter), 0);
+					sprintf(temp, "%d, &(", ecpg_internal_var++);
+				}
+
+				/* create call to "ECPGset_var(<counter>, <pointer>. <line number>)" */
+				result = cat_str(5, result, mm_strdup("ECPGset_var("), mm_strdup(temp), mm_strdup(original_var), mm_strdup("), __LINE__);\n"));
+			}
+
+			add_variable_to_tail(&newlist, newvar, newind);
+		}
+
+		if (insert)
+			cur->argsinsert_oos = newlist;
+		else
+			cur->argsresult_oos = newlist;
+	}
+
+	return result;
+}
+
+/* This tests whether the cursor was declared and opened in the same function. */
+#define SAMEFUNC(cur)	\
+	((cur->function == NULL) ||		\
+	 (cur->function != NULL && !strcmp(cur->function, current_function)))
+
+static struct cursor *
+add_additional_variables(char *name, bool insert)
+{
+	struct cursor *ptr;
+	struct arguments *p;
+	int (* strcmp_fn)(const char *, const char *) = (name[0] == ':' ? strcmp : pg_strcasecmp);
+
+	for (ptr = cur; ptr != NULL; ptr=ptr->next)
+	{
+		if (strcmp_fn(ptr->name, name) == 0)
+			break;
+	}
+
+	if (ptr == NULL)
+	{
+		mmerror(PARSE_ERROR, ET_ERROR, "cursor \"%s\" does not exist", name);
+		return NULL;
+	}
+
+	if (insert)
+	{
+		/* add all those input variables that were given earlier
+		 * note that we have to append here but have to keep the existing order */
+		for (p = (SAMEFUNC(ptr) ? ptr->argsinsert : ptr->argsinsert_oos); p; p = p->next)
+			add_variable_to_tail(&argsinsert, p->variable, p->indicator);
+	}
+
+	/* add all those output variables that were given earlier */
+	for (p = (SAMEFUNC(ptr) ? ptr->argsresult : ptr->argsresult_oos); p; p = p->next)
+		add_variable_to_tail(&argsresult, p->variable, p->indicator);
+
+	return ptr;
+}
+
+static void
+add_typedef(char *name, char * dimension, char * length, enum ECPGttype type_enum, char *type_dimension, char *type_index, int initializer, int array)
+{
+	/* add entry to list */
+	struct typedefs *ptr, *this;
+
+	if ((type_enum == ECPGt_struct ||
+	     type_enum == ECPGt_union) &&
+	    initializer == 1)
+		mmerror(PARSE_ERROR, ET_ERROR, "initializer not allowed in type definition");
+	else if (INFORMIX_MODE && strcmp(name, "string") == 0)
+		mmerror(PARSE_ERROR, ET_ERROR, "type name \"string\" is reserved in Informix mode");
+	else
+	{
+		for (ptr = types; ptr != NULL; ptr = ptr->next)
+		{
+			if (strcmp(name, ptr->name) == 0)
+				/* re-definition is a bug */
+				mmerror(PARSE_ERROR, ET_ERROR, "type \"%s\" is already defined", name);
+		}
+		adjust_array(type_enum, &dimension, &length, type_dimension, type_index, array, true);
+
+		this = (struct typedefs *) mm_alloc(sizeof(struct typedefs));
+
+		/* initial definition */
+		this->next = types;
+		this->name = name;
+		this->brace_level = braces_open;
+		this->type = (struct this_type *) mm_alloc(sizeof(struct this_type));
+		this->type->type_enum = type_enum;
+		this->type->type_str = mm_strdup(name);
+		this->type->type_dimension = dimension; /* dimension of array */
+		this->type->type_index = length;	/* length of string */
+		this->type->type_sizeof = ECPGstruct_sizeof;
+		this->struct_member_list = (type_enum == ECPGt_struct || type_enum == ECPGt_union) ?
+		ECPGstruct_member_dup(struct_member_list[struct_level]) : NULL;
+
+		if (type_enum != ECPGt_varchar &&
+			type_enum != ECPGt_char &&
+			type_enum != ECPGt_unsigned_char &&
+			type_enum != ECPGt_string &&
+			atoi(this->type->type_index) >= 0)
+			mmerror(PARSE_ERROR, ET_ERROR, "multidimensional arrays for simple data types are not supported");
+
+		types = this;
+	}
+}
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 463 "preproc.y"
+{
 	double	dval;
 	char	*str;
 	int     ival;
@@ -1069,15 +1543,13 @@ typedef union YYSTYPE
 	struct	fetch_desc	descriptor;
 	struct  su_symbol	struct_union;
 	struct	prep		prep;
-
-
-
-/* Line 214 of yacc.c  */
-#line 1077 "preproc.c"
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 193 of yacc.c.  */
+#line 1549 "preproc.c"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
@@ -1097,8 +1569,8 @@ typedef struct YYLTYPE
 /* Copy the second part of user declarations.  */
 
 
-/* Line 264 of yacc.c  */
-#line 1102 "preproc.c"
+/* Line 216 of yacc.c.  */
+#line 1574 "preproc.c"
 
 #ifdef short
 # undef short
@@ -1148,7 +1620,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -1173,14 +1645,14 @@ typedef short int yytype_int16;
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int yyi)
+YYID (int i)
 #else
 static int
-YYID (yyi)
-    int yyi;
+YYID (i)
+    int i;
 #endif
 {
-  return yyi;
+  return i;
 }
 #endif
 
@@ -1262,9 +1734,9 @@ void free (void *); /* INFRINGES ON USER
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-  YYLTYPE yyls_alloc;
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+    YYLTYPE yyls;
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
@@ -1299,12 +1771,12 @@ union yyalloc
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+# define YYSTACK_RELOCATE(Stack)					\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -3094,24 +3566,23 @@ static const char *const yytname[] =
   "attr_name", "index_name", "file_name", "func_name", "AexprConst",
   "Iconst", "RoleId", "SignedIconst", "unreserved_keyword",
   "col_name_keyword", "type_func_name_keyword", "reserved_keyword",
-  "statements", "statement", "CreateAsStmt", "$@1", "at", "ECPGConnect",
+  "statements", "statement", "CreateAsStmt", "@1", "at", "ECPGConnect",
   "connection_target", "opt_database_name", "db_prefix", "server",
   "opt_server", "server_name", "opt_port", "opt_connection_name",
   "opt_user", "ora_user", "user_name", "char_variable", "opt_options",
   "connect_options", "opt_opt_value", "prepared_name", "ECPGCursorStmt",
   "ECPGExecuteImmediateStmt", "ECPGVarDeclaration",
   "single_vt_declaration", "precision", "opt_scale", "ecpg_interval",
-  "ECPGDeclaration", "$@2", "sql_startdeclare", "sql_enddeclare",
+  "ECPGDeclaration", "@2", "sql_startdeclare", "sql_enddeclare",
   "var_type_declarations", "vt_declarations", "variable_declarations",
-  "type_declaration", "$@3", "var_declaration", "$@4", "$@5",
-  "opt_bit_field", "storage_declaration", "storage_clause",
-  "storage_modifier", "var_type", "enum_type", "enum_definition",
-  "struct_union_type_with_symbol", "$@6", "struct_union_type", "$@7",
-  "s_struct_union_symbol", "s_struct_union", "simple_type",
-  "unsigned_type", "signed_type", "opt_signed", "variable_list",
-  "variable", "opt_initializer", "opt_pointer", "ECPGDeclare",
-  "ECPGDisconnect", "dis_name", "connection_object", "execstring",
-  "ECPGFree", "ECPGOpen", "opt_ecpg_using", "ecpg_using",
+  "type_declaration", "@3", "var_declaration", "@4", "@5", "opt_bit_field",
+  "storage_declaration", "storage_clause", "storage_modifier", "var_type",
+  "enum_type", "enum_definition", "struct_union_type_with_symbol", "@6",
+  "struct_union_type", "@7", "s_struct_union_symbol", "s_struct_union",
+  "simple_type", "unsigned_type", "signed_type", "opt_signed",
+  "variable_list", "variable", "opt_initializer", "opt_pointer",
+  "ECPGDeclare", "ECPGDisconnect", "dis_name", "connection_object",
+  "execstring", "ECPGFree", "ECPGOpen", "opt_ecpg_using", "ecpg_using",
   "using_descriptor", "into_descriptor", "into_sqlda", "using_list",
   "UsingValue", "UsingConst", "ECPGDescribe", "opt_output",
   "ECPGAllocateDescr", "ECPGDeallocateDescr", "ECPGGetDescriptorHeader",
@@ -3121,8 +3592,8 @@ static const char *const yytname[] =
   "ECPGGetDescriptor", "ECPGGetDescItems", "ECPGGetDescItem",
   "ECPGSetDescriptor", "ECPGSetDescItems", "ECPGSetDescItem",
   "AllConstVar", "descriptor_item", "ECPGSetAutocommit", "on_off",
-  "ECPGSetConnection", "ECPGTypedef", "$@8", "opt_reference", "ECPGVar",
-  "$@9", "ECPGWhenever", "action", "ECPGKeywords", "ECPGKeywords_vanames",
+  "ECPGSetConnection", "ECPGTypedef", "@8", "opt_reference", "ECPGVar",
+  "@9", "ECPGWhenever", "action", "ECPGKeywords", "ECPGKeywords_vanames",
   "ECPGKeywords_rest", "ECPGTypeName", "symbol", "ECPGColId", "ColId",
   "type_function_name", "ColLabel", "ECPGColLabel", "ECPGColLabelCommon",
   "ECPGCKeywords", "all_unreserved_keyword", "ECPGunreserved_interval",
@@ -25167,7 +25638,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -25283,20 +25754,17 @@ yy_symbol_print (yyoutput, yytype, yyval
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
 
@@ -25331,11 +25799,11 @@ yy_reduce_print (yyvsp, yylsp, yyrule)
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       , &(yylsp[(yyi + 1) - (yynrhs)])		       );
-      YYFPRINTF (stderr, "\n");
+      fprintf (stderr, "\n");
     }
 }
 
@@ -25618,7 +26086,9 @@ yydestruct (yymsg, yytype, yyvaluep, yyl
     }
 }
 
+
 /* Prevent warnings from -Wmissing-prototypes.  */
+
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
@@ -25634,23 +26104,23 @@ int yyparse ();
 #endif /* ! YYPARSE_PARAM */
 
 
-/* The lookahead symbol.  */
+
+/* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
-/* Location data for the lookahead symbol.  */
-YYLTYPE yylloc;
-
 /* Number of syntax errors so far.  */
 int yynerrs;
+/* Location data for the look-ahead symbol.  */
+YYLTYPE yylloc;
 
 
 
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+/*----------.
+| yyparse.  |
+`----------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -25675,14 +26145,23 @@ yyparse ()
 #endif
 {
 
-
     int yystate;
+  int yyn;
+  int yyresult;
     /* Number of tokens to shift before error messages enabled.  */
     int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
 
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
        `yyls': related to locations.
 
        Refer to the stacks thru separate pointers, to allow yyoverflow
@@ -25690,52 +26169,34 @@ yyparse ()
 
     /* The state stack.  */
     yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
+  yytype_int16 *yyss = yyssa;
     yytype_int16 *yyssp;
 
     /* The semantic value stack.  */
     YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
+  YYSTYPE *yyvs = yyvsa;
     YYSTYPE *yyvsp;
 
     /* The location stack.  */
     YYLTYPE yylsa[YYINITDEPTH];
-    YYLTYPE *yyls;
+  YYLTYPE *yyls = yylsa;
     YYLTYPE *yylsp;
-
     /* The locations where the error started and ended.  */
     YYLTYPE yyerror_range[2];
 
-    YYSIZE_T yystacksize;
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+
+  YYSIZE_T yystacksize = YYINITDEPTH;
 
-  int yyn;
-  int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
   YYLTYPE yyloc;
 
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
-
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
-  yyls = yylsa;
-  yystacksize = YYINITDEPTH;
-
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
@@ -25747,14 +26208,14 @@ yyparse ()
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
+
   yyssp = yyss;
   yyvsp = yyvs;
   yylsp = yyls;
-
-#if YYLTYPE_IS_TRIVIAL
+#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
   /* Initialize the default location before parsing starts.  */
   yylloc.first_line   = yylloc.last_line   = 1;
-  yylloc.first_column = yylloc.last_column = 1;
+  yylloc.first_column = yylloc.last_column = 0;
 #endif
 
   goto yysetstate;
@@ -25793,7 +26254,6 @@ yyparse ()
 		    &yyvs1, yysize * sizeof (*yyvsp),
 		    &yyls1, yysize * sizeof (*yylsp),
 		    &yystacksize);
-
 	yyls = yyls1;
 	yyss = yyss1;
 	yyvs = yyvs1;
@@ -25815,9 +26275,9 @@ yyparse ()
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-	YYSTACK_RELOCATE (yyls_alloc, yyls);
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+	YYSTACK_RELOCATE (yyls);
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -25838,9 +26298,6 @@ yyparse ()
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
   goto yybackup;
 
 /*-----------.
@@ -25849,16 +26306,16 @@ yyparse ()
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
+     look-ahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -25890,15 +26347,19 @@ yybackup:
       goto yyreduce;
     }
 
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the lookahead token.  */
+  /* Shift the look-ahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token.  */
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
   yychar = YYEMPTY;
 
   yystate = yyn;
@@ -25940,190 +26401,136 @@ yyreduce:
   switch (yyn)
     {
         case 3:
-
-/* Line 1455 of yacc.c  */
 #line 1367 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 4:
-
-/* Line 1455 of yacc.c  */
 #line 1369 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 5:
-
-/* Line 1455 of yacc.c  */
 #line 1371 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 6:
-
-/* Line 1455 of yacc.c  */
 #line 1373 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 7:
-
-/* Line 1455 of yacc.c  */
 #line 1375 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 8:
-
-/* Line 1455 of yacc.c  */
 #line 1377 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 9:
-
-/* Line 1455 of yacc.c  */
 #line 1379 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 10:
-
-/* Line 1455 of yacc.c  */
 #line 1381 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 11:
-
-/* Line 1455 of yacc.c  */
 #line 1383 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 12:
-
-/* Line 1455 of yacc.c  */
 #line 1385 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 13:
-
-/* Line 1455 of yacc.c  */
 #line 1387 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 14:
-
-/* Line 1455 of yacc.c  */
 #line 1389 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 15:
-
-/* Line 1455 of yacc.c  */
 #line 1391 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 16:
-
-/* Line 1455 of yacc.c  */
 #line 1393 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 17:
-
-/* Line 1455 of yacc.c  */
 #line 1395 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 18:
-
-/* Line 1455 of yacc.c  */
 #line 1397 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 19:
-
-/* Line 1455 of yacc.c  */
 #line 1399 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 20:
-
-/* Line 1455 of yacc.c  */
 #line 1401 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 21:
-
-/* Line 1455 of yacc.c  */
 #line 1403 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 22:
-
-/* Line 1455 of yacc.c  */
 #line 1405 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 23:
-
-/* Line 1455 of yacc.c  */
 #line 1407 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 24:
-
-/* Line 1455 of yacc.c  */
 #line 1409 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 25:
-
-/* Line 1455 of yacc.c  */
 #line 1411 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 26:
-
-/* Line 1455 of yacc.c  */
 #line 1413 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 27:
-
-/* Line 1455 of yacc.c  */
 #line 1415 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 28:
-
-/* Line 1455 of yacc.c  */
 #line 1417 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 29:
-
-/* Line 1455 of yacc.c  */
 #line 1419 "preproc.y"
     {
 		if (INFORMIX_MODE)
@@ -26145,204 +26552,146 @@ yyreduce:
     break;
 
   case 30:
-
-/* Line 1455 of yacc.c  */
 #line 1437 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 31:
-
-/* Line 1455 of yacc.c  */
 #line 1439 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 32:
-
-/* Line 1455 of yacc.c  */
 #line 1441 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 33:
-
-/* Line 1455 of yacc.c  */
 #line 1443 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 34:
-
-/* Line 1455 of yacc.c  */
 #line 1445 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 35:
-
-/* Line 1455 of yacc.c  */
 #line 1447 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 36:
-
-/* Line 1455 of yacc.c  */
 #line 1449 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 37:
-
-/* Line 1455 of yacc.c  */
 #line 1451 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 38:
-
-/* Line 1455 of yacc.c  */
 #line 1453 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 39:
-
-/* Line 1455 of yacc.c  */
 #line 1455 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 40:
-
-/* Line 1455 of yacc.c  */
 #line 1457 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 41:
-
-/* Line 1455 of yacc.c  */
 #line 1459 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 42:
-
-/* Line 1455 of yacc.c  */
 #line 1461 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 43:
-
-/* Line 1455 of yacc.c  */
 #line 1463 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 44:
-
-/* Line 1455 of yacc.c  */
 #line 1465 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 45:
-
-/* Line 1455 of yacc.c  */
 #line 1467 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 46:
-
-/* Line 1455 of yacc.c  */
 #line 1469 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 47:
-
-/* Line 1455 of yacc.c  */
 #line 1471 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 48:
-
-/* Line 1455 of yacc.c  */
 #line 1473 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 49:
-
-/* Line 1455 of yacc.c  */
 #line 1475 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 50:
-
-/* Line 1455 of yacc.c  */
 #line 1477 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 51:
-
-/* Line 1455 of yacc.c  */
 #line 1479 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 52:
-
-/* Line 1455 of yacc.c  */
 #line 1481 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 53:
-
-/* Line 1455 of yacc.c  */
 #line 1483 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 54:
-
-/* Line 1455 of yacc.c  */
 #line 1485 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 55:
-
-/* Line 1455 of yacc.c  */
 #line 1487 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 56:
-
-/* Line 1455 of yacc.c  */
 #line 1489 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 57:
-
-/* Line 1455 of yacc.c  */
 #line 1491 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 58:
-
-/* Line 1455 of yacc.c  */
 #line 1493 "preproc.y"
     {
 		output_deallocate_prepare_statement((yyvsp[(1) - (1)].str));
@@ -26350,239 +26699,171 @@ yyreduce:
     break;
 
   case 59:
-
-/* Line 1455 of yacc.c  */
 #line 1497 "preproc.y"
     { output_simple_statement((yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 60:
-
-/* Line 1455 of yacc.c  */
 #line 1499 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 61:
-
-/* Line 1455 of yacc.c  */
 #line 1501 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 1, ECPGst_prepnormal); ;}
     break;
 
   case 62:
-
-/* Line 1455 of yacc.c  */
 #line 1503 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 1, ECPGst_normal); ;}
     break;
 
   case 63:
-
-/* Line 1455 of yacc.c  */
 #line 1505 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 64:
-
-/* Line 1455 of yacc.c  */
 #line 1507 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 65:
-
-/* Line 1455 of yacc.c  */
 #line 1509 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 66:
-
-/* Line 1455 of yacc.c  */
 #line 1511 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 67:
-
-/* Line 1455 of yacc.c  */
 #line 1513 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 68:
-
-/* Line 1455 of yacc.c  */
 #line 1515 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 69:
-
-/* Line 1455 of yacc.c  */
 #line 1517 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 70:
-
-/* Line 1455 of yacc.c  */
 #line 1519 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 71:
-
-/* Line 1455 of yacc.c  */
 #line 1521 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 72:
-
-/* Line 1455 of yacc.c  */
 #line 1523 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 73:
-
-/* Line 1455 of yacc.c  */
 #line 1525 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 74:
-
-/* Line 1455 of yacc.c  */
 #line 1527 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 75:
-
-/* Line 1455 of yacc.c  */
 #line 1529 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 76:
-
-/* Line 1455 of yacc.c  */
 #line 1531 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 77:
-
-/* Line 1455 of yacc.c  */
 #line 1533 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 78:
-
-/* Line 1455 of yacc.c  */
 #line 1535 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 79:
-
-/* Line 1455 of yacc.c  */
 #line 1537 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 80:
-
-/* Line 1455 of yacc.c  */
 #line 1539 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 81:
-
-/* Line 1455 of yacc.c  */
 #line 1541 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 1, ECPGst_execute); ;}
     break;
 
   case 82:
-
-/* Line 1455 of yacc.c  */
 #line 1543 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 83:
-
-/* Line 1455 of yacc.c  */
 #line 1545 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 1, ECPGst_normal); ;}
     break;
 
   case 84:
-
-/* Line 1455 of yacc.c  */
 #line 1547 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 85:
-
-/* Line 1455 of yacc.c  */
 #line 1549 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 86:
-
-/* Line 1455 of yacc.c  */
 #line 1551 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 87:
-
-/* Line 1455 of yacc.c  */
 #line 1553 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 1, ECPGst_prepnormal); ;}
     break;
 
   case 88:
-
-/* Line 1455 of yacc.c  */
 #line 1555 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 89:
-
-/* Line 1455 of yacc.c  */
 #line 1557 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 90:
-
-/* Line 1455 of yacc.c  */
 #line 1559 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 91:
-
-/* Line 1455 of yacc.c  */
 #line 1561 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 92:
-
-/* Line 1455 of yacc.c  */
 #line 1563 "preproc.y"
     {
 		if ((yyvsp[(1) - (1)].prep).type == NULL || strlen((yyvsp[(1) - (1)].prep).type) == 0)
@@ -26593,85 +26874,61 @@ yyreduce:
     break;
 
   case 93:
-
-/* Line 1455 of yacc.c  */
 #line 1570 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 94:
-
-/* Line 1455 of yacc.c  */
 #line 1572 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 95:
-
-/* Line 1455 of yacc.c  */
 #line 1574 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 96:
-
-/* Line 1455 of yacc.c  */
 #line 1576 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 97:
-
-/* Line 1455 of yacc.c  */
 #line 1578 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 98:
-
-/* Line 1455 of yacc.c  */
 #line 1580 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 99:
-
-/* Line 1455 of yacc.c  */
 #line 1582 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 100:
-
-/* Line 1455 of yacc.c  */
 #line 1584 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 101:
-
-/* Line 1455 of yacc.c  */
 #line 1586 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 102:
-
-/* Line 1455 of yacc.c  */
 #line 1588 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 103:
-
-/* Line 1455 of yacc.c  */
 #line 1590 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 1, ECPGst_prepnormal); ;}
     break;
 
   case 104:
-
-/* Line 1455 of yacc.c  */
 #line 1592 "preproc.y"
     {
 		fprintf(yyout, "{ ECPGtrans(__LINE__, %s, \"%s\");", connection ? connection : "NULL", (yyvsp[(1) - (1)].str));
@@ -26681,64 +26938,46 @@ yyreduce:
     break;
 
   case 105:
-
-/* Line 1455 of yacc.c  */
 #line 1598 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 106:
-
-/* Line 1455 of yacc.c  */
 #line 1600 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 107:
-
-/* Line 1455 of yacc.c  */
 #line 1602 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 1, ECPGst_prepnormal); ;}
     break;
 
   case 108:
-
-/* Line 1455 of yacc.c  */
 #line 1604 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 109:
-
-/* Line 1455 of yacc.c  */
 #line 1606 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 110:
-
-/* Line 1455 of yacc.c  */
 #line 1608 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 111:
-
-/* Line 1455 of yacc.c  */
 #line 1610 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 112:
-
-/* Line 1455 of yacc.c  */
 #line 1612 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_normal); ;}
     break;
 
   case 113:
-
-/* Line 1455 of yacc.c  */
 #line 1614 "preproc.y"
     {
 		fprintf(yyout,"ECPGallocate_desc(__LINE__, %s);",(yyvsp[(1) - (1)].str));
@@ -26748,8 +26987,6 @@ yyreduce:
     break;
 
   case 114:
-
-/* Line 1455 of yacc.c  */
 #line 1620 "preproc.y"
     {
 		if (connection)
@@ -26763,8 +27000,6 @@ yyreduce:
     break;
 
   case 115:
-
-/* Line 1455 of yacc.c  */
 #line 1630 "preproc.y"
     {
 		output_simple_statement((yyvsp[(1) - (1)].str));
@@ -26772,8 +27007,6 @@ yyreduce:
     break;
 
   case 116:
-
-/* Line 1455 of yacc.c  */
 #line 1634 "preproc.y"
     {
 		fprintf(yyout,"ECPGdeallocate_desc(__LINE__, %s);",(yyvsp[(1) - (1)].str));
@@ -26783,8 +27016,6 @@ yyreduce:
     break;
 
   case 117:
-
-/* Line 1455 of yacc.c  */
 #line 1640 "preproc.y"
     {
 		output_simple_statement((yyvsp[(1) - (1)].str));
@@ -26792,8 +27023,6 @@ yyreduce:
     break;
 
   case 118:
-
-/* Line 1455 of yacc.c  */
 #line 1644 "preproc.y"
     {
 		fprintf(yyout, "{ ECPGdescribe(__LINE__, %d, %s,", compat, (yyvsp[(1) - (1)].str));
@@ -26807,8 +27036,6 @@ yyreduce:
     break;
 
   case 119:
-
-/* Line 1455 of yacc.c  */
 #line 1654 "preproc.y"
     {
 		if (connection)
@@ -26822,15 +27049,11 @@ yyreduce:
     break;
 
   case 120:
-
-/* Line 1455 of yacc.c  */
 #line 1663 "preproc.y"
     { output_statement((yyvsp[(1) - (1)].str), 0, ECPGst_exec_immediate); ;}
     break;
 
   case 121:
-
-/* Line 1455 of yacc.c  */
 #line 1665 "preproc.y"
     {
 		const char *con = connection ? connection : "NULL";
@@ -26848,8 +27071,6 @@ yyreduce:
     break;
 
   case 122:
-
-/* Line 1455 of yacc.c  */
 #line 1679 "preproc.y"
     {
 		lookup_descriptor((yyvsp[(1) - (1)].descriptor).name, connection);
@@ -26860,8 +27081,6 @@ yyreduce:
     break;
 
   case 123:
-
-/* Line 1455 of yacc.c  */
 #line 1686 "preproc.y"
     {
 		lookup_descriptor((yyvsp[(1) - (1)].str), connection);
@@ -26871,8 +27090,6 @@ yyreduce:
     break;
 
   case 124:
-
-/* Line 1455 of yacc.c  */
 #line 1692 "preproc.y"
     {
 		struct cursor *ptr;
@@ -26887,8 +27104,6 @@ yyreduce:
     break;
 
   case 125:
-
-/* Line 1455 of yacc.c  */
 #line 1703 "preproc.y"
     {
 		fprintf(yyout, "{ ECPGsetcommit(__LINE__, \"%s\", %s);", (yyvsp[(1) - (1)].str), connection ? connection : "NULL");
@@ -26898,8 +27113,6 @@ yyreduce:
     break;
 
   case 126:
-
-/* Line 1455 of yacc.c  */
 #line 1709 "preproc.y"
     {
 		if (connection)
@@ -26912,8 +27125,6 @@ yyreduce:
     break;
 
   case 127:
-
-/* Line 1455 of yacc.c  */
 #line 1718 "preproc.y"
     {
 		lookup_descriptor((yyvsp[(1) - (1)].descriptor).name, connection);
@@ -26924,8 +27135,6 @@ yyreduce:
     break;
 
   case 128:
-
-/* Line 1455 of yacc.c  */
 #line 1725 "preproc.y"
     {
 		lookup_descriptor((yyvsp[(1) - (1)].str), connection);
@@ -26935,8 +27144,6 @@ yyreduce:
     break;
 
   case 129:
-
-/* Line 1455 of yacc.c  */
 #line 1731 "preproc.y"
     {
 		if (connection)
@@ -26949,8 +27156,6 @@ yyreduce:
     break;
 
   case 130:
-
-/* Line 1455 of yacc.c  */
 #line 1740 "preproc.y"
     {
 		if (connection)
@@ -26961,8 +27166,6 @@ yyreduce:
     break;
 
   case 131:
-
-/* Line 1455 of yacc.c  */
 #line 1747 "preproc.y"
     {
 		if (connection)
@@ -26973,15 +27176,11 @@ yyreduce:
     break;
 
   case 132:
-
-/* Line 1455 of yacc.c  */
 #line 1754 "preproc.y"
     { (yyval.str) = NULL; ;}
     break;
 
   case 133:
-
-/* Line 1455 of yacc.c  */
 #line 1760 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("create role"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -26989,8 +27188,6 @@ yyreduce:
     break;
 
   case 134:
-
-/* Line 1455 of yacc.c  */
 #line 1768 "preproc.y"
     { 
  (yyval.str) = mm_strdup("with");
@@ -26998,16 +27195,12 @@ yyreduce:
     break;
 
   case 135:
-
-/* Line 1455 of yacc.c  */
 #line 1772 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 136:
-
-/* Line 1455 of yacc.c  */
 #line 1779 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -27015,16 +27208,12 @@ yyreduce:
     break;
 
   case 137:
-
-/* Line 1455 of yacc.c  */
 #line 1783 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 138:
-
-/* Line 1455 of yacc.c  */
 #line 1790 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -27032,16 +27221,12 @@ yyreduce:
     break;
 
   case 139:
-
-/* Line 1455 of yacc.c  */
 #line 1794 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 140:
-
-/* Line 1455 of yacc.c  */
 #line 1801 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("password"),(yyvsp[(2) - (2)].str));
@@ -27049,8 +27234,6 @@ yyreduce:
     break;
 
   case 141:
-
-/* Line 1455 of yacc.c  */
 #line 1805 "preproc.y"
     { 
  (yyval.str) = mm_strdup("password null");
@@ -27058,8 +27241,6 @@ yyreduce:
     break;
 
   case 142:
-
-/* Line 1455 of yacc.c  */
 #line 1809 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("encrypted password"),(yyvsp[(3) - (3)].str));
@@ -27067,8 +27248,6 @@ yyreduce:
     break;
 
   case 143:
-
-/* Line 1455 of yacc.c  */
 #line 1813 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("unencrypted password"),(yyvsp[(3) - (3)].str));
@@ -27076,8 +27255,6 @@ yyreduce:
     break;
 
   case 144:
-
-/* Line 1455 of yacc.c  */
 #line 1817 "preproc.y"
     { 
  (yyval.str) = mm_strdup("inherit");
@@ -27085,8 +27262,6 @@ yyreduce:
     break;
 
   case 145:
-
-/* Line 1455 of yacc.c  */
 #line 1821 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("connection limit"),(yyvsp[(3) - (3)].str));
@@ -27094,8 +27269,6 @@ yyreduce:
     break;
 
   case 146:
-
-/* Line 1455 of yacc.c  */
 #line 1825 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("valid until"),(yyvsp[(3) - (3)].str));
@@ -27103,8 +27276,6 @@ yyreduce:
     break;
 
   case 147:
-
-/* Line 1455 of yacc.c  */
 #line 1829 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("user"),(yyvsp[(2) - (2)].str));
@@ -27112,8 +27283,6 @@ yyreduce:
     break;
 
   case 148:
-
-/* Line 1455 of yacc.c  */
 #line 1833 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27121,8 +27290,6 @@ yyreduce:
     break;
 
   case 149:
-
-/* Line 1455 of yacc.c  */
 #line 1841 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27130,8 +27297,6 @@ yyreduce:
     break;
 
   case 150:
-
-/* Line 1455 of yacc.c  */
 #line 1845 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("sysid"),(yyvsp[(2) - (2)].str));
@@ -27139,8 +27304,6 @@ yyreduce:
     break;
 
   case 151:
-
-/* Line 1455 of yacc.c  */
 #line 1849 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("admin"),(yyvsp[(2) - (2)].str));
@@ -27148,8 +27311,6 @@ yyreduce:
     break;
 
   case 152:
-
-/* Line 1455 of yacc.c  */
 #line 1853 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("role"),(yyvsp[(2) - (2)].str));
@@ -27157,8 +27318,6 @@ yyreduce:
     break;
 
   case 153:
-
-/* Line 1455 of yacc.c  */
 #line 1857 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("in role"),(yyvsp[(3) - (3)].str));
@@ -27166,8 +27325,6 @@ yyreduce:
     break;
 
   case 154:
-
-/* Line 1455 of yacc.c  */
 #line 1861 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("in group"),(yyvsp[(3) - (3)].str));
@@ -27175,8 +27332,6 @@ yyreduce:
     break;
 
   case 155:
-
-/* Line 1455 of yacc.c  */
 #line 1869 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("create user"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -27184,8 +27339,6 @@ yyreduce:
     break;
 
   case 156:
-
-/* Line 1455 of yacc.c  */
 #line 1877 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter role"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -27193,16 +27346,12 @@ yyreduce:
     break;
 
   case 157:
-
-/* Line 1455 of yacc.c  */
 #line 1885 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 158:
-
-/* Line 1455 of yacc.c  */
 #line 1888 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("in database"),(yyvsp[(3) - (3)].str));
@@ -27210,8 +27359,6 @@ yyreduce:
     break;
 
   case 159:
-
-/* Line 1455 of yacc.c  */
 #line 1896 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter role"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -27219,8 +27366,6 @@ yyreduce:
     break;
 
   case 160:
-
-/* Line 1455 of yacc.c  */
 #line 1904 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter user"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -27228,8 +27373,6 @@ yyreduce:
     break;
 
   case 161:
-
-/* Line 1455 of yacc.c  */
 #line 1912 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter user"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -27237,8 +27380,6 @@ yyreduce:
     break;
 
   case 162:
-
-/* Line 1455 of yacc.c  */
 #line 1920 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("drop role"),(yyvsp[(3) - (3)].str));
@@ -27246,8 +27387,6 @@ yyreduce:
     break;
 
   case 163:
-
-/* Line 1455 of yacc.c  */
 #line 1924 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("drop role if exists"),(yyvsp[(5) - (5)].str));
@@ -27255,8 +27394,6 @@ yyreduce:
     break;
 
   case 164:
-
-/* Line 1455 of yacc.c  */
 #line 1932 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("drop user"),(yyvsp[(3) - (3)].str));
@@ -27264,8 +27401,6 @@ yyreduce:
     break;
 
   case 165:
-
-/* Line 1455 of yacc.c  */
 #line 1936 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("drop user if exists"),(yyvsp[(5) - (5)].str));
@@ -27273,8 +27408,6 @@ yyreduce:
     break;
 
   case 166:
-
-/* Line 1455 of yacc.c  */
 #line 1944 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("create group"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -27282,8 +27415,6 @@ yyreduce:
     break;
 
   case 167:
-
-/* Line 1455 of yacc.c  */
 #line 1952 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter group"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("user"),(yyvsp[(6) - (6)].str));
@@ -27291,8 +27422,6 @@ yyreduce:
     break;
 
   case 168:
-
-/* Line 1455 of yacc.c  */
 #line 1960 "preproc.y"
     { 
  (yyval.str) = mm_strdup("add");
@@ -27300,8 +27429,6 @@ yyreduce:
     break;
 
   case 169:
-
-/* Line 1455 of yacc.c  */
 #line 1964 "preproc.y"
     { 
  (yyval.str) = mm_strdup("drop");
@@ -27309,8 +27436,6 @@ yyreduce:
     break;
 
   case 170:
-
-/* Line 1455 of yacc.c  */
 #line 1972 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("drop group"),(yyvsp[(3) - (3)].str));
@@ -27318,8 +27443,6 @@ yyreduce:
     break;
 
   case 171:
-
-/* Line 1455 of yacc.c  */
 #line 1976 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("drop group if exists"),(yyvsp[(5) - (5)].str));
@@ -27327,8 +27450,6 @@ yyreduce:
     break;
 
   case 172:
-
-/* Line 1455 of yacc.c  */
 #line 1984 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("create schema"),(yyvsp[(3) - (6)].str),mm_strdup("authorization"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -27336,8 +27457,6 @@ yyreduce:
     break;
 
   case 173:
-
-/* Line 1455 of yacc.c  */
 #line 1988 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("create schema"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -27345,8 +27464,6 @@ yyreduce:
     break;
 
   case 174:
-
-/* Line 1455 of yacc.c  */
 #line 1996 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27354,16 +27471,12 @@ yyreduce:
     break;
 
   case 175:
-
-/* Line 1455 of yacc.c  */
 #line 2000 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 176:
-
-/* Line 1455 of yacc.c  */
 #line 2007 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -27371,16 +27484,12 @@ yyreduce:
     break;
 
   case 177:
-
-/* Line 1455 of yacc.c  */
 #line 2011 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 178:
-
-/* Line 1455 of yacc.c  */
 #line 2018 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27388,8 +27497,6 @@ yyreduce:
     break;
 
   case 179:
-
-/* Line 1455 of yacc.c  */
 #line 2022 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27397,8 +27504,6 @@ yyreduce:
     break;
 
   case 180:
-
-/* Line 1455 of yacc.c  */
 #line 2026 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27406,8 +27511,6 @@ yyreduce:
     break;
 
   case 181:
-
-/* Line 1455 of yacc.c  */
 #line 2030 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27415,8 +27518,6 @@ yyreduce:
     break;
 
   case 182:
-
-/* Line 1455 of yacc.c  */
 #line 2034 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27424,8 +27525,6 @@ yyreduce:
     break;
 
   case 183:
-
-/* Line 1455 of yacc.c  */
 #line 2038 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27433,8 +27532,6 @@ yyreduce:
     break;
 
   case 184:
-
-/* Line 1455 of yacc.c  */
 #line 2046 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[(2) - (2)].str));
@@ -27442,8 +27539,6 @@ yyreduce:
     break;
 
   case 185:
-
-/* Line 1455 of yacc.c  */
 #line 2050 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("set local"),(yyvsp[(3) - (3)].str));
@@ -27451,8 +27546,6 @@ yyreduce:
     break;
 
   case 186:
-
-/* Line 1455 of yacc.c  */
 #line 2054 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("set session"),(yyvsp[(3) - (3)].str));
@@ -27460,8 +27553,6 @@ yyreduce:
     break;
 
   case 187:
-
-/* Line 1455 of yacc.c  */
 #line 2062 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("to"),(yyvsp[(3) - (3)].str));
@@ -27469,8 +27560,6 @@ yyreduce:
     break;
 
   case 188:
-
-/* Line 1455 of yacc.c  */
 #line 2066 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("="),(yyvsp[(3) - (3)].str));
@@ -27478,8 +27567,6 @@ yyreduce:
     break;
 
   case 189:
-
-/* Line 1455 of yacc.c  */
 #line 2070 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (3)].str),mm_strdup("to default"));
@@ -27487,8 +27574,6 @@ yyreduce:
     break;
 
   case 190:
-
-/* Line 1455 of yacc.c  */
 #line 2074 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (3)].str),mm_strdup("= default"));
@@ -27496,8 +27581,6 @@ yyreduce:
     break;
 
   case 191:
-
-/* Line 1455 of yacc.c  */
 #line 2078 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (3)].str),mm_strdup("from current"));
@@ -27505,8 +27588,6 @@ yyreduce:
     break;
 
   case 192:
-
-/* Line 1455 of yacc.c  */
 #line 2082 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("time zone"),(yyvsp[(3) - (3)].str));
@@ -27514,8 +27595,6 @@ yyreduce:
     break;
 
   case 193:
-
-/* Line 1455 of yacc.c  */
 #line 2086 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("transaction"),(yyvsp[(2) - (2)].str));
@@ -27523,8 +27602,6 @@ yyreduce:
     break;
 
   case 194:
-
-/* Line 1455 of yacc.c  */
 #line 2090 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("session characteristics as transaction"),(yyvsp[(5) - (5)].str));
@@ -27532,8 +27609,6 @@ yyreduce:
     break;
 
   case 195:
-
-/* Line 1455 of yacc.c  */
 #line 2094 "preproc.y"
     { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
@@ -27542,8 +27617,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 196:
-
-/* Line 1455 of yacc.c  */
 #line 2099 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("schema"),(yyvsp[(2) - (2)].str));
@@ -27551,8 +27624,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 197:
-
-/* Line 1455 of yacc.c  */
 #line 2103 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("names"),(yyvsp[(2) - (2)].str));
@@ -27560,8 +27631,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 198:
-
-/* Line 1455 of yacc.c  */
 #line 2107 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("role"),(yyvsp[(2) - (2)].str));
@@ -27569,8 +27638,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 199:
-
-/* Line 1455 of yacc.c  */
 #line 2111 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("session authorization"),(yyvsp[(3) - (3)].str));
@@ -27578,8 +27645,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 200:
-
-/* Line 1455 of yacc.c  */
 #line 2115 "preproc.y"
     { 
  (yyval.str) = mm_strdup("session authorization default");
@@ -27587,8 +27652,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 201:
-
-/* Line 1455 of yacc.c  */
 #line 2119 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("xml option"),(yyvsp[(3) - (3)].str));
@@ -27596,8 +27659,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 202:
-
-/* Line 1455 of yacc.c  */
 #line 2127 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27605,8 +27666,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 203:
-
-/* Line 1455 of yacc.c  */
 #line 2131 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("."),(yyvsp[(3) - (3)].str));
@@ -27614,8 +27673,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 204:
-
-/* Line 1455 of yacc.c  */
 #line 2139 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27623,8 +27680,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 205:
-
-/* Line 1455 of yacc.c  */
 #line 2143 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -27632,8 +27687,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 206:
-
-/* Line 1455 of yacc.c  */
 #line 2151 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27641,8 +27694,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 207:
-
-/* Line 1455 of yacc.c  */
 #line 2155 "preproc.y"
     { 
 		if ((yyvsp[(1) - (1)].str)[0] == '$')
@@ -27656,8 +27707,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 208:
-
-/* Line 1455 of yacc.c  */
 #line 2169 "preproc.y"
     { 
  (yyval.str) = mm_strdup("read uncommitted");
@@ -27665,8 +27714,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 209:
-
-/* Line 1455 of yacc.c  */
 #line 2173 "preproc.y"
     { 
  (yyval.str) = mm_strdup("read committed");
@@ -27674,8 +27721,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 210:
-
-/* Line 1455 of yacc.c  */
 #line 2177 "preproc.y"
     { 
  (yyval.str) = mm_strdup("repeatable read");
@@ -27683,8 +27728,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 211:
-
-/* Line 1455 of yacc.c  */
 #line 2181 "preproc.y"
     { 
  (yyval.str) = mm_strdup("serializable");
@@ -27692,8 +27735,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 212:
-
-/* Line 1455 of yacc.c  */
 #line 2189 "preproc.y"
     { 
  (yyval.str) = mm_strdup("true");
@@ -27701,8 +27742,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 213:
-
-/* Line 1455 of yacc.c  */
 #line 2193 "preproc.y"
     { 
  (yyval.str) = mm_strdup("false");
@@ -27710,8 +27749,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 214:
-
-/* Line 1455 of yacc.c  */
 #line 2197 "preproc.y"
     { 
  (yyval.str) = mm_strdup("on");
@@ -27719,8 +27756,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 215:
-
-/* Line 1455 of yacc.c  */
 #line 2201 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27728,8 +27763,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 216:
-
-/* Line 1455 of yacc.c  */
 #line 2209 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27737,8 +27770,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 217:
-
-/* Line 1455 of yacc.c  */
 #line 2213 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27746,8 +27777,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 218:
-
-/* Line 1455 of yacc.c  */
 #line 2217 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -27755,8 +27784,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 219:
-
-/* Line 1455 of yacc.c  */
 #line 2221 "preproc.y"
     { 
  (yyval.str) = cat_str(6,(yyvsp[(1) - (6)].str),mm_strdup("("),(yyvsp[(3) - (6)].str),mm_strdup(")"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -27764,8 +27791,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 220:
-
-/* Line 1455 of yacc.c  */
 #line 2225 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27773,8 +27798,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 221:
-
-/* Line 1455 of yacc.c  */
 #line 2229 "preproc.y"
     { 
  (yyval.str) = mm_strdup("default");
@@ -27782,8 +27805,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 222:
-
-/* Line 1455 of yacc.c  */
 #line 2233 "preproc.y"
     { 
  (yyval.str) = mm_strdup("local");
@@ -27791,8 +27812,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 223:
-
-/* Line 1455 of yacc.c  */
 #line 2241 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27800,8 +27819,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 224:
-
-/* Line 1455 of yacc.c  */
 #line 2245 "preproc.y"
     { 
  (yyval.str) = mm_strdup("default");
@@ -27809,16 +27826,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 225:
-
-/* Line 1455 of yacc.c  */
 #line 2249 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 226:
-
-/* Line 1455 of yacc.c  */
 #line 2256 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27826,8 +27839,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 227:
-
-/* Line 1455 of yacc.c  */
 #line 2260 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27835,8 +27846,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 228:
-
-/* Line 1455 of yacc.c  */
 #line 2268 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("reset"),(yyvsp[(2) - (2)].str));
@@ -27844,8 +27853,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 229:
-
-/* Line 1455 of yacc.c  */
 #line 2272 "preproc.y"
     { 
  (yyval.str) = mm_strdup("reset time zone");
@@ -27853,8 +27860,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 230:
-
-/* Line 1455 of yacc.c  */
 #line 2276 "preproc.y"
     { 
  (yyval.str) = mm_strdup("reset transaction isolation level");
@@ -27862,8 +27867,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 231:
-
-/* Line 1455 of yacc.c  */
 #line 2280 "preproc.y"
     { 
  (yyval.str) = mm_strdup("reset session authorization");
@@ -27871,8 +27874,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 232:
-
-/* Line 1455 of yacc.c  */
 #line 2284 "preproc.y"
     { 
  (yyval.str) = mm_strdup("reset all");
@@ -27880,8 +27881,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 233:
-
-/* Line 1455 of yacc.c  */
 #line 2292 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[(2) - (2)].str));
@@ -27889,8 +27888,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 234:
-
-/* Line 1455 of yacc.c  */
 #line 2296 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27898,8 +27895,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 235:
-
-/* Line 1455 of yacc.c  */
 #line 2304 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("show"),(yyvsp[(2) - (3)].str));
@@ -27907,8 +27902,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 236:
-
-/* Line 1455 of yacc.c  */
 #line 2308 "preproc.y"
     { 
  (yyval.str) = mm_strdup("show time zone");
@@ -27916,8 +27909,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 237:
-
-/* Line 1455 of yacc.c  */
 #line 2312 "preproc.y"
     { 
  (yyval.str) = mm_strdup("show transaction isolation level");
@@ -27925,8 +27916,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 238:
-
-/* Line 1455 of yacc.c  */
 #line 2316 "preproc.y"
     { 
  (yyval.str) = mm_strdup("show session authorization");
@@ -27934,8 +27923,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 239:
-
-/* Line 1455 of yacc.c  */
 #line 2320 "preproc.y"
     {
 		mmerror(PARSE_ERROR, ET_ERROR, "SHOW ALL is not implemented");
@@ -27944,8 +27931,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 240:
-
-/* Line 1455 of yacc.c  */
 #line 2329 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("set constraints"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -27953,8 +27938,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 241:
-
-/* Line 1455 of yacc.c  */
 #line 2337 "preproc.y"
     { 
  (yyval.str) = mm_strdup("all");
@@ -27962,8 +27945,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 242:
-
-/* Line 1455 of yacc.c  */
 #line 2341 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -27971,8 +27952,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 243:
-
-/* Line 1455 of yacc.c  */
 #line 2349 "preproc.y"
     { 
  (yyval.str) = mm_strdup("deferred");
@@ -27980,8 +27959,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 244:
-
-/* Line 1455 of yacc.c  */
 #line 2353 "preproc.y"
     { 
  (yyval.str) = mm_strdup("immediate");
@@ -27989,8 +27966,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 245:
-
-/* Line 1455 of yacc.c  */
 #line 2361 "preproc.y"
     { 
  (yyval.str) = mm_strdup("checkpoint");
@@ -27998,8 +27973,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 246:
-
-/* Line 1455 of yacc.c  */
 #line 2369 "preproc.y"
     { 
  (yyval.str) = mm_strdup("discard all");
@@ -28007,8 +27980,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 247:
-
-/* Line 1455 of yacc.c  */
 #line 2373 "preproc.y"
     { 
  (yyval.str) = mm_strdup("discard temp");
@@ -28016,8 +27987,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 248:
-
-/* Line 1455 of yacc.c  */
 #line 2377 "preproc.y"
     { 
  (yyval.str) = mm_strdup("discard temporary");
@@ -28025,8 +27994,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 249:
-
-/* Line 1455 of yacc.c  */
 #line 2381 "preproc.y"
     { 
  (yyval.str) = mm_strdup("discard plans");
@@ -28034,8 +28001,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 250:
-
-/* Line 1455 of yacc.c  */
 #line 2389 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter table"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -28043,8 +28008,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 251:
-
-/* Line 1455 of yacc.c  */
 #line 2393 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter index"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -28052,8 +28015,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 252:
-
-/* Line 1455 of yacc.c  */
 #line 2397 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter sequence"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -28061,8 +28022,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 253:
-
-/* Line 1455 of yacc.c  */
 #line 2401 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter view"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -28070,8 +28029,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 254:
-
-/* Line 1455 of yacc.c  */
 #line 2409 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -28079,8 +28036,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 255:
-
-/* Line 1455 of yacc.c  */
 #line 2413 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -28088,8 +28043,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 256:
-
-/* Line 1455 of yacc.c  */
 #line 2421 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("add"),(yyvsp[(2) - (2)].str));
@@ -28097,8 +28050,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 257:
-
-/* Line 1455 of yacc.c  */
 #line 2425 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("add column"),(yyvsp[(3) - (3)].str));
@@ -28106,8 +28057,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 258:
-
-/* Line 1455 of yacc.c  */
 #line 2429 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -28115,8 +28064,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 259:
-
-/* Line 1455 of yacc.c  */
 #line 2433 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[(2) - (6)].str),(yyvsp[(3) - (6)].str),mm_strdup("drop not null"));
@@ -28124,8 +28071,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 260:
-
-/* Line 1455 of yacc.c  */
 #line 2437 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter"),(yyvsp[(2) - (6)].str),(yyvsp[(3) - (6)].str),mm_strdup("set not null"));
@@ -28133,8 +28078,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 261:
-
-/* Line 1455 of yacc.c  */
 #line 2441 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[(2) - (6)].str),(yyvsp[(3) - (6)].str),mm_strdup("set statistics"),(yyvsp[(6) - (6)].str));
@@ -28142,8 +28085,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 262:
-
-/* Line 1455 of yacc.c  */
 #line 2445 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),mm_strdup("set"),(yyvsp[(5) - (5)].str));
@@ -28151,8 +28092,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 263:
-
-/* Line 1455 of yacc.c  */
 #line 2449 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),mm_strdup("reset"),(yyvsp[(5) - (5)].str));
@@ -28160,8 +28099,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 264:
-
-/* Line 1455 of yacc.c  */
 #line 2453 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter"),(yyvsp[(2) - (6)].str),(yyvsp[(3) - (6)].str),mm_strdup("set storage"),(yyvsp[(6) - (6)].str));
@@ -28169,8 +28106,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 265:
-
-/* Line 1455 of yacc.c  */
 #line 2457 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("drop"),(yyvsp[(2) - (6)].str),mm_strdup("if exists"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -28178,8 +28113,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 266:
-
-/* Line 1455 of yacc.c  */
 #line 2461 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("drop"),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -28187,8 +28120,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 267:
-
-/* Line 1455 of yacc.c  */
 #line 2465 "preproc.y"
     { 
  (yyval.str) = cat_str(8,mm_strdup("alter"),(yyvsp[(2) - (8)].str),(yyvsp[(3) - (8)].str),(yyvsp[(4) - (8)].str),mm_strdup("type"),(yyvsp[(6) - (8)].str),(yyvsp[(7) - (8)].str),(yyvsp[(8) - (8)].str));
@@ -28196,8 +28127,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 268:
-
-/* Line 1455 of yacc.c  */
 #line 2469 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("add"),(yyvsp[(2) - (2)].str));
@@ -28205,8 +28134,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 269:
-
-/* Line 1455 of yacc.c  */
 #line 2473 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("validate constraint"),(yyvsp[(3) - (3)].str));
@@ -28214,8 +28141,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 270:
-
-/* Line 1455 of yacc.c  */
 #line 2477 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("drop constraint if exists"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -28223,8 +28148,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 271:
-
-/* Line 1455 of yacc.c  */
 #line 2481 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("drop constraint"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -28232,8 +28155,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 272:
-
-/* Line 1455 of yacc.c  */
 #line 2485 "preproc.y"
     { 
  (yyval.str) = mm_strdup("set with oids");
@@ -28241,8 +28162,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 273:
-
-/* Line 1455 of yacc.c  */
 #line 2489 "preproc.y"
     { 
  (yyval.str) = mm_strdup("set without oids");
@@ -28250,8 +28169,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 274:
-
-/* Line 1455 of yacc.c  */
 #line 2493 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("cluster on"),(yyvsp[(3) - (3)].str));
@@ -28259,8 +28176,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 275:
-
-/* Line 1455 of yacc.c  */
 #line 2497 "preproc.y"
     { 
  (yyval.str) = mm_strdup("set without cluster");
@@ -28268,8 +28183,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 276:
-
-/* Line 1455 of yacc.c  */
 #line 2501 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("enable trigger"),(yyvsp[(3) - (3)].str));
@@ -28277,8 +28190,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 277:
-
-/* Line 1455 of yacc.c  */
 #line 2505 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("enable always trigger"),(yyvsp[(4) - (4)].str));
@@ -28286,8 +28197,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 278:
-
-/* Line 1455 of yacc.c  */
 #line 2509 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("enable replica trigger"),(yyvsp[(4) - (4)].str));
@@ -28295,8 +28204,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 279:
-
-/* Line 1455 of yacc.c  */
 #line 2513 "preproc.y"
     { 
  (yyval.str) = mm_strdup("enable trigger all");
@@ -28304,8 +28211,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 280:
-
-/* Line 1455 of yacc.c  */
 #line 2517 "preproc.y"
     { 
  (yyval.str) = mm_strdup("enable trigger user");
@@ -28313,8 +28218,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 281:
-
-/* Line 1455 of yacc.c  */
 #line 2521 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("disable trigger"),(yyvsp[(3) - (3)].str));
@@ -28322,8 +28225,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 282:
-
-/* Line 1455 of yacc.c  */
 #line 2525 "preproc.y"
     { 
  (yyval.str) = mm_strdup("disable trigger all");
@@ -28331,8 +28232,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 283:
-
-/* Line 1455 of yacc.c  */
 #line 2529 "preproc.y"
     { 
  (yyval.str) = mm_strdup("disable trigger user");
@@ -28340,8 +28239,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 284:
-
-/* Line 1455 of yacc.c  */
 #line 2533 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("enable rule"),(yyvsp[(3) - (3)].str));
@@ -28349,8 +28246,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 285:
-
-/* Line 1455 of yacc.c  */
 #line 2537 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("enable always rule"),(yyvsp[(4) - (4)].str));
@@ -28358,8 +28253,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 286:
-
-/* Line 1455 of yacc.c  */
 #line 2541 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("enable replica rule"),(yyvsp[(4) - (4)].str));
@@ -28367,8 +28260,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 287:
-
-/* Line 1455 of yacc.c  */
 #line 2545 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("disable rule"),(yyvsp[(3) - (3)].str));
@@ -28376,8 +28267,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 288:
-
-/* Line 1455 of yacc.c  */
 #line 2549 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("inherit"),(yyvsp[(2) - (2)].str));
@@ -28385,8 +28274,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 289:
-
-/* Line 1455 of yacc.c  */
 #line 2553 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("no inherit"),(yyvsp[(3) - (3)].str));
@@ -28394,8 +28281,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 290:
-
-/* Line 1455 of yacc.c  */
 #line 2557 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("of"),(yyvsp[(2) - (2)].str));
@@ -28403,8 +28288,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 291:
-
-/* Line 1455 of yacc.c  */
 #line 2561 "preproc.y"
     { 
  (yyval.str) = mm_strdup("not of");
@@ -28412,8 +28295,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 292:
-
-/* Line 1455 of yacc.c  */
 #line 2565 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("owner to"),(yyvsp[(3) - (3)].str));
@@ -28421,8 +28302,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 293:
-
-/* Line 1455 of yacc.c  */
 #line 2569 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("set tablespace"),(yyvsp[(3) - (3)].str));
@@ -28430,8 +28309,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 294:
-
-/* Line 1455 of yacc.c  */
 #line 2573 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[(2) - (2)].str));
@@ -28439,8 +28316,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 295:
-
-/* Line 1455 of yacc.c  */
 #line 2577 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("reset"),(yyvsp[(2) - (2)].str));
@@ -28448,8 +28323,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 296:
-
-/* Line 1455 of yacc.c  */
 #line 2581 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -28457,8 +28330,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 297:
-
-/* Line 1455 of yacc.c  */
 #line 2589 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("set default"),(yyvsp[(3) - (3)].str));
@@ -28466,8 +28337,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 298:
-
-/* Line 1455 of yacc.c  */
 #line 2593 "preproc.y"
     { 
  (yyval.str) = mm_strdup("drop default");
@@ -28475,8 +28344,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 299:
-
-/* Line 1455 of yacc.c  */
 #line 2601 "preproc.y"
     { 
  (yyval.str) = mm_strdup("cascade");
@@ -28484,8 +28351,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 300:
-
-/* Line 1455 of yacc.c  */
 #line 2605 "preproc.y"
     { 
  (yyval.str) = mm_strdup("restrict");
@@ -28493,16 +28358,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 301:
-
-/* Line 1455 of yacc.c  */
 #line 2609 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 302:
-
-/* Line 1455 of yacc.c  */
 #line 2616 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("collate"),(yyvsp[(2) - (2)].str));
@@ -28510,16 +28371,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 303:
-
-/* Line 1455 of yacc.c  */
 #line 2620 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 304:
-
-/* Line 1455 of yacc.c  */
 #line 2627 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[(2) - (2)].str));
@@ -28527,16 +28384,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 305:
-
-/* Line 1455 of yacc.c  */
 #line 2631 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 306:
-
-/* Line 1455 of yacc.c  */
 #line 2638 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -28544,8 +28397,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 307:
-
-/* Line 1455 of yacc.c  */
 #line 2646 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[(2) - (2)].str));
@@ -28553,16 +28404,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 308:
-
-/* Line 1455 of yacc.c  */
 #line 2650 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 309:
-
-/* Line 1455 of yacc.c  */
 #line 2657 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -28570,8 +28417,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 310:
-
-/* Line 1455 of yacc.c  */
 #line 2661 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -28579,8 +28424,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 311:
-
-/* Line 1455 of yacc.c  */
 #line 2669 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("="),(yyvsp[(3) - (3)].str));
@@ -28588,8 +28431,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 312:
-
-/* Line 1455 of yacc.c  */
 #line 2673 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -28597,8 +28438,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 313:
-
-/* Line 1455 of yacc.c  */
 #line 2677 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),mm_strdup("."),(yyvsp[(3) - (5)].str),mm_strdup("="),(yyvsp[(5) - (5)].str));
@@ -28606,8 +28445,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 314:
-
-/* Line 1455 of yacc.c  */
 #line 2681 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("."),(yyvsp[(3) - (3)].str));
@@ -28615,8 +28452,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 315:
-
-/* Line 1455 of yacc.c  */
 #line 2689 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter type"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -28624,8 +28459,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 316:
-
-/* Line 1455 of yacc.c  */
 #line 2697 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -28633,8 +28466,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 317:
-
-/* Line 1455 of yacc.c  */
 #line 2701 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -28642,8 +28473,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 318:
-
-/* Line 1455 of yacc.c  */
 #line 2709 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("add attribute"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -28651,8 +28480,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 319:
-
-/* Line 1455 of yacc.c  */
 #line 2713 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("drop attribute if exists"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -28660,8 +28487,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 320:
-
-/* Line 1455 of yacc.c  */
 #line 2717 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("drop attribute"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -28669,8 +28494,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 321:
-
-/* Line 1455 of yacc.c  */
 #line 2721 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("alter attribute"),(yyvsp[(3) - (8)].str),(yyvsp[(4) - (8)].str),mm_strdup("type"),(yyvsp[(6) - (8)].str),(yyvsp[(7) - (8)].str),(yyvsp[(8) - (8)].str));
@@ -28678,8 +28501,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 322:
-
-/* Line 1455 of yacc.c  */
 #line 2729 "preproc.y"
     {
 		char *cursor_marker = (yyvsp[(2) - (2)].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[(2) - (2)].str);
@@ -28688,8 +28509,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 323:
-
-/* Line 1455 of yacc.c  */
 #line 2734 "preproc.y"
     { 
  (yyval.str) = mm_strdup("close all");
@@ -28697,8 +28516,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 324:
-
-/* Line 1455 of yacc.c  */
 #line 2742 "preproc.y"
     { 
 			if (strcmp((yyvsp[(6) - (10)].str), "to") == 0 && strcmp((yyvsp[(7) - (10)].str), "stdin") == 0)
@@ -28713,8 +28530,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 325:
-
-/* Line 1455 of yacc.c  */
 #line 2753 "preproc.y"
     { 
 			if (strcmp((yyvsp[(4) - (6)].str), "stdin") == 0)
@@ -28725,8 +28540,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 326:
-
-/* Line 1455 of yacc.c  */
 #line 2764 "preproc.y"
     { 
  (yyval.str) = mm_strdup("from");
@@ -28734,8 +28547,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 327:
-
-/* Line 1455 of yacc.c  */
 #line 2768 "preproc.y"
     { 
  (yyval.str) = mm_strdup("to");
@@ -28743,8 +28554,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 328:
-
-/* Line 1455 of yacc.c  */
 #line 2776 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -28752,8 +28561,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 329:
-
-/* Line 1455 of yacc.c  */
 #line 2780 "preproc.y"
     { 
  (yyval.str) = mm_strdup("stdin");
@@ -28761,8 +28568,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 330:
-
-/* Line 1455 of yacc.c  */
 #line 2784 "preproc.y"
     { 
  (yyval.str) = mm_strdup("stdout");
@@ -28770,8 +28575,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 331:
-
-/* Line 1455 of yacc.c  */
 #line 2792 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -28779,8 +28582,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 332:
-
-/* Line 1455 of yacc.c  */
 #line 2796 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -28788,8 +28589,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 333:
-
-/* Line 1455 of yacc.c  */
 #line 2804 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -28797,16 +28596,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 334:
-
-/* Line 1455 of yacc.c  */
 #line 2808 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 335:
-
-/* Line 1455 of yacc.c  */
 #line 2815 "preproc.y"
     { 
  (yyval.str) = mm_strdup("binary");
@@ -28814,8 +28609,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 336:
-
-/* Line 1455 of yacc.c  */
 #line 2819 "preproc.y"
     { 
  (yyval.str) = mm_strdup("oids");
@@ -28823,8 +28616,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 337:
-
-/* Line 1455 of yacc.c  */
 #line 2823 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("delimiter"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -28832,8 +28623,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 338:
-
-/* Line 1455 of yacc.c  */
 #line 2827 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("null"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -28841,8 +28630,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 339:
-
-/* Line 1455 of yacc.c  */
 #line 2831 "preproc.y"
     { 
  (yyval.str) = mm_strdup("csv");
@@ -28850,8 +28637,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 340:
-
-/* Line 1455 of yacc.c  */
 #line 2835 "preproc.y"
     { 
  (yyval.str) = mm_strdup("header");
@@ -28859,8 +28644,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 341:
-
-/* Line 1455 of yacc.c  */
 #line 2839 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("quote"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -28868,8 +28651,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 342:
-
-/* Line 1455 of yacc.c  */
 #line 2843 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("escape"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -28877,8 +28658,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 343:
-
-/* Line 1455 of yacc.c  */
 #line 2847 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("force quote"),(yyvsp[(3) - (3)].str));
@@ -28886,8 +28665,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 344:
-
-/* Line 1455 of yacc.c  */
 #line 2851 "preproc.y"
     { 
  (yyval.str) = mm_strdup("force quote *");
@@ -28895,8 +28672,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 345:
-
-/* Line 1455 of yacc.c  */
 #line 2855 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("force not null"),(yyvsp[(4) - (4)].str));
@@ -28904,8 +28679,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 346:
-
-/* Line 1455 of yacc.c  */
 #line 2859 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("encoding"),(yyvsp[(2) - (2)].str));
@@ -28913,8 +28686,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 347:
-
-/* Line 1455 of yacc.c  */
 #line 2867 "preproc.y"
     { 
  (yyval.str) = mm_strdup("binary");
@@ -28922,16 +28693,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 348:
-
-/* Line 1455 of yacc.c  */
 #line 2871 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 349:
-
-/* Line 1455 of yacc.c  */
 #line 2878 "preproc.y"
     { 
  (yyval.str) = mm_strdup("with oids");
@@ -28939,16 +28706,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 350:
-
-/* Line 1455 of yacc.c  */
 #line 2882 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 351:
-
-/* Line 1455 of yacc.c  */
 #line 2889 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("delimiters"),(yyvsp[(3) - (3)].str));
@@ -28956,16 +28719,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 352:
-
-/* Line 1455 of yacc.c  */
 #line 2893 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 353:
-
-/* Line 1455 of yacc.c  */
 #line 2900 "preproc.y"
     { 
  (yyval.str) = mm_strdup("using");
@@ -28973,16 +28732,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 354:
-
-/* Line 1455 of yacc.c  */
 #line 2904 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 355:
-
-/* Line 1455 of yacc.c  */
 #line 2911 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -28990,8 +28745,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 356:
-
-/* Line 1455 of yacc.c  */
 #line 2915 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -28999,8 +28752,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 357:
-
-/* Line 1455 of yacc.c  */
 #line 2923 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -29008,8 +28759,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 358:
-
-/* Line 1455 of yacc.c  */
 #line 2931 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29017,8 +28766,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 359:
-
-/* Line 1455 of yacc.c  */
 #line 2935 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29026,8 +28773,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 360:
-
-/* Line 1455 of yacc.c  */
 #line 2939 "preproc.y"
     { 
  (yyval.str) = mm_strdup("*");
@@ -29035,8 +28780,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 361:
-
-/* Line 1455 of yacc.c  */
 #line 2943 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -29044,16 +28787,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 362:
-
-/* Line 1455 of yacc.c  */
 #line 2947 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 363:
-
-/* Line 1455 of yacc.c  */
 #line 2954 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29061,8 +28800,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 364:
-
-/* Line 1455 of yacc.c  */
 #line 2958 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -29070,8 +28807,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 365:
-
-/* Line 1455 of yacc.c  */
 #line 2966 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29079,8 +28814,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 366:
-
-/* Line 1455 of yacc.c  */
 #line 2974 "preproc.y"
     { 
  (yyval.str) = cat_str(11,mm_strdup("create"),(yyvsp[(2) - (11)].str),mm_strdup("table"),(yyvsp[(4) - (11)].str),mm_strdup("("),(yyvsp[(6) - (11)].str),mm_strdup(")"),(yyvsp[(8) - (11)].str),(yyvsp[(9) - (11)].str),(yyvsp[(10) - (11)].str),(yyvsp[(11) - (11)].str));
@@ -29088,8 +28821,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 367:
-
-/* Line 1455 of yacc.c  */
 #line 2978 "preproc.y"
     { 
  (yyval.str) = cat_str(11,mm_strdup("create"),(yyvsp[(2) - (14)].str),mm_strdup("table if not exists"),(yyvsp[(7) - (14)].str),mm_strdup("("),(yyvsp[(9) - (14)].str),mm_strdup(")"),(yyvsp[(11) - (14)].str),(yyvsp[(12) - (14)].str),(yyvsp[(13) - (14)].str),(yyvsp[(14) - (14)].str));
@@ -29097,8 +28828,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 368:
-
-/* Line 1455 of yacc.c  */
 #line 2982 "preproc.y"
     { 
  (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[(2) - (10)].str),mm_strdup("table"),(yyvsp[(4) - (10)].str),mm_strdup("of"),(yyvsp[(6) - (10)].str),(yyvsp[(7) - (10)].str),(yyvsp[(8) - (10)].str),(yyvsp[(9) - (10)].str),(yyvsp[(10) - (10)].str));
@@ -29106,8 +28835,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 369:
-
-/* Line 1455 of yacc.c  */
 #line 2986 "preproc.y"
     { 
  (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[(2) - (13)].str),mm_strdup("table if not exists"),(yyvsp[(7) - (13)].str),mm_strdup("of"),(yyvsp[(9) - (13)].str),(yyvsp[(10) - (13)].str),(yyvsp[(11) - (13)].str),(yyvsp[(12) - (13)].str),(yyvsp[(13) - (13)].str));
@@ -29115,8 +28842,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 370:
-
-/* Line 1455 of yacc.c  */
 #line 2994 "preproc.y"
     { 
  (yyval.str) = mm_strdup("temporary");
@@ -29124,8 +28849,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 371:
-
-/* Line 1455 of yacc.c  */
 #line 2998 "preproc.y"
     { 
  (yyval.str) = mm_strdup("temp");
@@ -29133,8 +28856,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 372:
-
-/* Line 1455 of yacc.c  */
 #line 3002 "preproc.y"
     { 
  (yyval.str) = mm_strdup("local temporary");
@@ -29142,8 +28863,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 373:
-
-/* Line 1455 of yacc.c  */
 #line 3006 "preproc.y"
     { 
  (yyval.str) = mm_strdup("local temp");
@@ -29151,8 +28870,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 374:
-
-/* Line 1455 of yacc.c  */
 #line 3010 "preproc.y"
     { 
  (yyval.str) = mm_strdup("global temporary");
@@ -29160,8 +28877,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 375:
-
-/* Line 1455 of yacc.c  */
 #line 3014 "preproc.y"
     { 
  (yyval.str) = mm_strdup("global temp");
@@ -29169,8 +28884,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 376:
-
-/* Line 1455 of yacc.c  */
 #line 3018 "preproc.y"
     { 
  (yyval.str) = mm_strdup("unlogged");
@@ -29178,16 +28891,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 377:
-
-/* Line 1455 of yacc.c  */
 #line 3022 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 378:
-
-/* Line 1455 of yacc.c  */
 #line 3029 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29195,16 +28904,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 379:
-
-/* Line 1455 of yacc.c  */
 #line 3033 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 380:
-
-/* Line 1455 of yacc.c  */
 #line 3040 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -29212,16 +28917,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 381:
-
-/* Line 1455 of yacc.c  */
 #line 3044 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 382:
-
-/* Line 1455 of yacc.c  */
 #line 3051 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29229,8 +28930,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 383:
-
-/* Line 1455 of yacc.c  */
 #line 3055 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -29238,8 +28937,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 384:
-
-/* Line 1455 of yacc.c  */
 #line 3063 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29247,8 +28944,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 385:
-
-/* Line 1455 of yacc.c  */
 #line 3067 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -29256,8 +28951,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 386:
-
-/* Line 1455 of yacc.c  */
 #line 3075 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29265,8 +28958,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 387:
-
-/* Line 1455 of yacc.c  */
 #line 3079 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29274,8 +28965,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 388:
-
-/* Line 1455 of yacc.c  */
 #line 3083 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29283,8 +28972,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 389:
-
-/* Line 1455 of yacc.c  */
 #line 3091 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29292,8 +28979,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 390:
-
-/* Line 1455 of yacc.c  */
 #line 3095 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29301,8 +28986,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 391:
-
-/* Line 1455 of yacc.c  */
 #line 3103 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -29310,8 +28993,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 392:
-
-/* Line 1455 of yacc.c  */
 #line 3111 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (4)].str),mm_strdup("with options"),(yyvsp[(4) - (4)].str));
@@ -29319,8 +29000,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 393:
-
-/* Line 1455 of yacc.c  */
 #line 3119 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -29328,16 +29007,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 394:
-
-/* Line 1455 of yacc.c  */
 #line 3123 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 395:
-
-/* Line 1455 of yacc.c  */
 #line 3130 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("constraint"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -29345,8 +29020,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 396:
-
-/* Line 1455 of yacc.c  */
 #line 3134 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29354,8 +29027,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 397:
-
-/* Line 1455 of yacc.c  */
 #line 3138 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29363,8 +29034,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 398:
-
-/* Line 1455 of yacc.c  */
 #line 3142 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("collate"),(yyvsp[(2) - (2)].str));
@@ -29372,8 +29041,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 399:
-
-/* Line 1455 of yacc.c  */
 #line 3150 "preproc.y"
     { 
  (yyval.str) = mm_strdup("not null");
@@ -29381,8 +29048,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 400:
-
-/* Line 1455 of yacc.c  */
 #line 3154 "preproc.y"
     { 
  (yyval.str) = mm_strdup("null");
@@ -29390,8 +29055,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 401:
-
-/* Line 1455 of yacc.c  */
 #line 3158 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("unique"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -29399,8 +29062,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 402:
-
-/* Line 1455 of yacc.c  */
 #line 3162 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("primary key"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -29408,8 +29069,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 403:
-
-/* Line 1455 of yacc.c  */
 #line 3166 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("check ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -29417,8 +29076,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 404:
-
-/* Line 1455 of yacc.c  */
 #line 3170 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("default"),(yyvsp[(2) - (2)].str));
@@ -29426,8 +29083,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 405:
-
-/* Line 1455 of yacc.c  */
 #line 3174 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("references"),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -29435,8 +29090,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 406:
-
-/* Line 1455 of yacc.c  */
 #line 3182 "preproc.y"
     { 
  (yyval.str) = mm_strdup("deferrable");
@@ -29444,8 +29097,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 407:
-
-/* Line 1455 of yacc.c  */
 #line 3186 "preproc.y"
     { 
  (yyval.str) = mm_strdup("not deferrable");
@@ -29453,8 +29104,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 408:
-
-/* Line 1455 of yacc.c  */
 #line 3190 "preproc.y"
     { 
  (yyval.str) = mm_strdup("initially deferred");
@@ -29462,8 +29111,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 409:
-
-/* Line 1455 of yacc.c  */
 #line 3194 "preproc.y"
     { 
  (yyval.str) = mm_strdup("initially immediate");
@@ -29471,8 +29118,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 410:
-
-/* Line 1455 of yacc.c  */
 #line 3202 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("like"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -29480,8 +29125,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 411:
-
-/* Line 1455 of yacc.c  */
 #line 3210 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("including"),(yyvsp[(3) - (3)].str));
@@ -29489,8 +29132,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 412:
-
-/* Line 1455 of yacc.c  */
 #line 3214 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("excluding"),(yyvsp[(3) - (3)].str));
@@ -29498,16 +29139,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 413:
-
-/* Line 1455 of yacc.c  */
 #line 3218 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 414:
-
-/* Line 1455 of yacc.c  */
 #line 3225 "preproc.y"
     { 
  (yyval.str) = mm_strdup("defaults");
@@ -29515,8 +29152,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 415:
-
-/* Line 1455 of yacc.c  */
 #line 3229 "preproc.y"
     { 
  (yyval.str) = mm_strdup("constraints");
@@ -29524,8 +29159,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 416:
-
-/* Line 1455 of yacc.c  */
 #line 3233 "preproc.y"
     { 
  (yyval.str) = mm_strdup("indexes");
@@ -29533,8 +29166,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 417:
-
-/* Line 1455 of yacc.c  */
 #line 3237 "preproc.y"
     { 
  (yyval.str) = mm_strdup("storage");
@@ -29542,8 +29173,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 418:
-
-/* Line 1455 of yacc.c  */
 #line 3241 "preproc.y"
     { 
  (yyval.str) = mm_strdup("comments");
@@ -29551,8 +29180,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 419:
-
-/* Line 1455 of yacc.c  */
 #line 3245 "preproc.y"
     { 
  (yyval.str) = mm_strdup("all");
@@ -29560,8 +29187,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 420:
-
-/* Line 1455 of yacc.c  */
 #line 3253 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("constraint"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -29569,8 +29194,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 421:
-
-/* Line 1455 of yacc.c  */
 #line 3257 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29578,8 +29201,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 422:
-
-/* Line 1455 of yacc.c  */
 #line 3265 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("check ("),(yyvsp[(3) - (5)].str),mm_strdup(")"),(yyvsp[(5) - (5)].str));
@@ -29587,8 +29208,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 423:
-
-/* Line 1455 of yacc.c  */
 #line 3269 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("unique ("),(yyvsp[(3) - (7)].str),mm_strdup(")"),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -29596,8 +29215,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 424:
-
-/* Line 1455 of yacc.c  */
 #line 3273 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("unique"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -29605,8 +29222,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 425:
-
-/* Line 1455 of yacc.c  */
 #line 3277 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("primary key ("),(yyvsp[(4) - (8)].str),mm_strdup(")"),(yyvsp[(6) - (8)].str),(yyvsp[(7) - (8)].str),(yyvsp[(8) - (8)].str));
@@ -29614,8 +29229,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 426:
-
-/* Line 1455 of yacc.c  */
 #line 3281 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("primary key"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -29623,8 +29236,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 427:
-
-/* Line 1455 of yacc.c  */
 #line 3285 "preproc.y"
     { 
  (yyval.str) = cat_str(9,mm_strdup("exclude"),(yyvsp[(2) - (9)].str),mm_strdup("("),(yyvsp[(4) - (9)].str),mm_strdup(")"),(yyvsp[(6) - (9)].str),(yyvsp[(7) - (9)].str),(yyvsp[(8) - (9)].str),(yyvsp[(9) - (9)].str));
@@ -29632,8 +29243,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 428:
-
-/* Line 1455 of yacc.c  */
 #line 3289 "preproc.y"
     { 
  (yyval.str) = cat_str(8,mm_strdup("foreign key ("),(yyvsp[(4) - (11)].str),mm_strdup(") references"),(yyvsp[(7) - (11)].str),(yyvsp[(8) - (11)].str),(yyvsp[(9) - (11)].str),(yyvsp[(10) - (11)].str),(yyvsp[(11) - (11)].str));
@@ -29641,8 +29250,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 429:
-
-/* Line 1455 of yacc.c  */
 #line 3297 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -29650,16 +29257,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 430:
-
-/* Line 1455 of yacc.c  */
 #line 3301 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 431:
-
-/* Line 1455 of yacc.c  */
 #line 3308 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29667,8 +29270,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 432:
-
-/* Line 1455 of yacc.c  */
 #line 3312 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -29676,8 +29277,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 433:
-
-/* Line 1455 of yacc.c  */
 #line 3320 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29685,8 +29284,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 434:
-
-/* Line 1455 of yacc.c  */
 #line 3328 "preproc.y"
     { 
  (yyval.str) = mm_strdup("match full");
@@ -29694,8 +29291,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 435:
-
-/* Line 1455 of yacc.c  */
 #line 3332 "preproc.y"
     { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
@@ -29704,8 +29299,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 436:
-
-/* Line 1455 of yacc.c  */
 #line 3337 "preproc.y"
     { 
  (yyval.str) = mm_strdup("match simple");
@@ -29713,16 +29306,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 437:
-
-/* Line 1455 of yacc.c  */
 #line 3341 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 438:
-
-/* Line 1455 of yacc.c  */
 #line 3348 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29730,8 +29319,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 439:
-
-/* Line 1455 of yacc.c  */
 #line 3352 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -29739,8 +29326,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 440:
-
-/* Line 1455 of yacc.c  */
 #line 3360 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("with"),(yyvsp[(3) - (3)].str));
@@ -29748,8 +29333,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 441:
-
-/* Line 1455 of yacc.c  */
 #line 3364 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (6)].str),mm_strdup("with operator ("),(yyvsp[(5) - (6)].str),mm_strdup(")"));
@@ -29757,8 +29340,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 442:
-
-/* Line 1455 of yacc.c  */
 #line 3372 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("where ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -29766,16 +29347,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 443:
-
-/* Line 1455 of yacc.c  */
 #line 3376 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 444:
-
-/* Line 1455 of yacc.c  */
 #line 3383 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29783,8 +29360,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 445:
-
-/* Line 1455 of yacc.c  */
 #line 3387 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -29792,8 +29367,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 446:
-
-/* Line 1455 of yacc.c  */
 #line 3391 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -29801,8 +29374,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 447:
-
-/* Line 1455 of yacc.c  */
 #line 3395 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -29810,16 +29381,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 448:
-
-/* Line 1455 of yacc.c  */
 #line 3399 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 449:
-
-/* Line 1455 of yacc.c  */
 #line 3406 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("on update"),(yyvsp[(3) - (3)].str));
@@ -29827,8 +29394,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 450:
-
-/* Line 1455 of yacc.c  */
 #line 3414 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("on delete"),(yyvsp[(3) - (3)].str));
@@ -29836,8 +29401,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 451:
-
-/* Line 1455 of yacc.c  */
 #line 3422 "preproc.y"
     { 
  (yyval.str) = mm_strdup("no action");
@@ -29845,8 +29408,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 452:
-
-/* Line 1455 of yacc.c  */
 #line 3426 "preproc.y"
     { 
  (yyval.str) = mm_strdup("restrict");
@@ -29854,8 +29415,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 453:
-
-/* Line 1455 of yacc.c  */
 #line 3430 "preproc.y"
     { 
  (yyval.str) = mm_strdup("cascade");
@@ -29863,8 +29422,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 454:
-
-/* Line 1455 of yacc.c  */
 #line 3434 "preproc.y"
     { 
  (yyval.str) = mm_strdup("set null");
@@ -29872,8 +29429,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 455:
-
-/* Line 1455 of yacc.c  */
 #line 3438 "preproc.y"
     { 
  (yyval.str) = mm_strdup("set default");
@@ -29881,8 +29436,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 456:
-
-/* Line 1455 of yacc.c  */
 #line 3446 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("inherits ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -29890,16 +29443,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 457:
-
-/* Line 1455 of yacc.c  */
 #line 3450 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 458:
-
-/* Line 1455 of yacc.c  */
 #line 3457 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[(2) - (2)].str));
@@ -29907,8 +29456,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 459:
-
-/* Line 1455 of yacc.c  */
 #line 3461 "preproc.y"
     { 
  (yyval.str) = mm_strdup("with oids");
@@ -29916,8 +29463,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 460:
-
-/* Line 1455 of yacc.c  */
 #line 3465 "preproc.y"
     { 
  (yyval.str) = mm_strdup("without oids");
@@ -29925,16 +29470,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 461:
-
-/* Line 1455 of yacc.c  */
 #line 3469 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 462:
-
-/* Line 1455 of yacc.c  */
 #line 3476 "preproc.y"
     { 
  (yyval.str) = mm_strdup("on commit drop");
@@ -29942,8 +29483,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 463:
-
-/* Line 1455 of yacc.c  */
 #line 3480 "preproc.y"
     { 
  (yyval.str) = mm_strdup("on commit delete rows");
@@ -29951,8 +29490,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 464:
-
-/* Line 1455 of yacc.c  */
 #line 3484 "preproc.y"
     { 
  (yyval.str) = mm_strdup("on commit preserve rows");
@@ -29960,16 +29497,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 465:
-
-/* Line 1455 of yacc.c  */
 #line 3488 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 466:
-
-/* Line 1455 of yacc.c  */
 #line 3495 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("tablespace"),(yyvsp[(2) - (2)].str));
@@ -29977,16 +29510,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 467:
-
-/* Line 1455 of yacc.c  */
 #line 3499 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 468:
-
-/* Line 1455 of yacc.c  */
 #line 3506 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("using index tablespace"),(yyvsp[(4) - (4)].str));
@@ -29994,16 +29523,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 469:
-
-/* Line 1455 of yacc.c  */
 #line 3510 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 470:
-
-/* Line 1455 of yacc.c  */
 #line 3517 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("using index"),(yyvsp[(3) - (3)].str));
@@ -30011,8 +29536,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 471:
-
-/* Line 1455 of yacc.c  */
 #line 3525 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -30020,8 +29543,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 472:
-
-/* Line 1455 of yacc.c  */
 #line 3533 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -30029,16 +29550,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 473:
-
-/* Line 1455 of yacc.c  */
 #line 3537 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 474:
-
-/* Line 1455 of yacc.c  */
 #line 3544 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -30046,8 +29563,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 475:
-
-/* Line 1455 of yacc.c  */
 #line 3548 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -30055,8 +29570,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 476:
-
-/* Line 1455 of yacc.c  */
 #line 3556 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -30064,8 +29577,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 477:
-
-/* Line 1455 of yacc.c  */
 #line 3564 "preproc.y"
     { 
  (yyval.str) = mm_strdup("with data");
@@ -30073,8 +29584,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 478:
-
-/* Line 1455 of yacc.c  */
 #line 3568 "preproc.y"
     { 
  (yyval.str) = mm_strdup("with no data");
@@ -30082,16 +29591,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 479:
-
-/* Line 1455 of yacc.c  */
 #line 3572 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 480:
-
-/* Line 1455 of yacc.c  */
 #line 3579 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("create"),(yyvsp[(2) - (5)].str),mm_strdup("sequence"),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -30099,8 +29604,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 481:
-
-/* Line 1455 of yacc.c  */
 #line 3587 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter sequence"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -30108,8 +29611,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 482:
-
-/* Line 1455 of yacc.c  */
 #line 3595 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -30117,16 +29618,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 483:
-
-/* Line 1455 of yacc.c  */
 #line 3599 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 484:
-
-/* Line 1455 of yacc.c  */
 #line 3606 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -30134,8 +29631,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 485:
-
-/* Line 1455 of yacc.c  */
 #line 3610 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -30143,8 +29638,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 486:
-
-/* Line 1455 of yacc.c  */
 #line 3618 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("cache"),(yyvsp[(2) - (2)].str));
@@ -30152,8 +29645,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 487:
-
-/* Line 1455 of yacc.c  */
 #line 3622 "preproc.y"
     { 
  (yyval.str) = mm_strdup("cycle");
@@ -30161,8 +29652,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 488:
-
-/* Line 1455 of yacc.c  */
 #line 3626 "preproc.y"
     { 
  (yyval.str) = mm_strdup("no cycle");
@@ -30170,8 +29659,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 489:
-
-/* Line 1455 of yacc.c  */
 #line 3630 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("increment"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -30179,8 +29666,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 490:
-
-/* Line 1455 of yacc.c  */
 #line 3634 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("maxvalue"),(yyvsp[(2) - (2)].str));
@@ -30188,8 +29673,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 491:
-
-/* Line 1455 of yacc.c  */
 #line 3638 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("minvalue"),(yyvsp[(2) - (2)].str));
@@ -30197,8 +29680,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 492:
-
-/* Line 1455 of yacc.c  */
 #line 3642 "preproc.y"
     { 
  (yyval.str) = mm_strdup("no maxvalue");
@@ -30206,8 +29687,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 493:
-
-/* Line 1455 of yacc.c  */
 #line 3646 "preproc.y"
     { 
  (yyval.str) = mm_strdup("no minvalue");
@@ -30215,8 +29694,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 494:
-
-/* Line 1455 of yacc.c  */
 #line 3650 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("owned by"),(yyvsp[(3) - (3)].str));
@@ -30224,8 +29701,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 495:
-
-/* Line 1455 of yacc.c  */
 #line 3654 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("start"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -30233,8 +29708,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 496:
-
-/* Line 1455 of yacc.c  */
 #line 3658 "preproc.y"
     { 
  (yyval.str) = mm_strdup("restart");
@@ -30242,8 +29715,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 497:
-
-/* Line 1455 of yacc.c  */
 #line 3662 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("restart"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -30251,8 +29722,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 498:
-
-/* Line 1455 of yacc.c  */
 #line 3670 "preproc.y"
     { 
  (yyval.str) = mm_strdup("by");
@@ -30260,16 +29729,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 499:
-
-/* Line 1455 of yacc.c  */
 #line 3674 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 500:
-
-/* Line 1455 of yacc.c  */
 #line 3681 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -30277,8 +29742,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 501:
-
-/* Line 1455 of yacc.c  */
 #line 3685 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[(2) - (2)].str));
@@ -30286,8 +29749,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 502:
-
-/* Line 1455 of yacc.c  */
 #line 3689 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -30295,8 +29756,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 503:
-
-/* Line 1455 of yacc.c  */
 #line 3697 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -30304,8 +29763,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 504:
-
-/* Line 1455 of yacc.c  */
 #line 3701 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -30313,8 +29770,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 505:
-
-/* Line 1455 of yacc.c  */
 #line 3709 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("create"),(yyvsp[(2) - (6)].str),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("language"),(yyvsp[(6) - (6)].str));
@@ -30322,8 +29777,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 506:
-
-/* Line 1455 of yacc.c  */
 #line 3713 "preproc.y"
     { 
  (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[(2) - (10)].str),(yyvsp[(3) - (10)].str),(yyvsp[(4) - (10)].str),mm_strdup("language"),(yyvsp[(6) - (10)].str),mm_strdup("handler"),(yyvsp[(8) - (10)].str),(yyvsp[(9) - (10)].str),(yyvsp[(10) - (10)].str));
@@ -30331,8 +29784,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 507:
-
-/* Line 1455 of yacc.c  */
 #line 3721 "preproc.y"
     { 
  (yyval.str) = mm_strdup("trusted");
@@ -30340,16 +29791,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 508:
-
-/* Line 1455 of yacc.c  */
 #line 3725 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 509:
-
-/* Line 1455 of yacc.c  */
 #line 3732 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -30357,8 +29804,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 510:
-
-/* Line 1455 of yacc.c  */
 #line 3736 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -30366,8 +29811,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 511:
-
-/* Line 1455 of yacc.c  */
 #line 3744 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("inline"),(yyvsp[(2) - (2)].str));
@@ -30375,16 +29818,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 512:
-
-/* Line 1455 of yacc.c  */
 #line 3748 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 513:
-
-/* Line 1455 of yacc.c  */
 #line 3755 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("validator"),(yyvsp[(2) - (2)].str));
@@ -30392,8 +29831,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 514:
-
-/* Line 1455 of yacc.c  */
 #line 3759 "preproc.y"
     { 
  (yyval.str) = mm_strdup("no validator");
@@ -30401,8 +29838,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 515:
-
-/* Line 1455 of yacc.c  */
 #line 3767 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -30410,16 +29845,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 516:
-
-/* Line 1455 of yacc.c  */
 #line 3771 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 517:
-
-/* Line 1455 of yacc.c  */
 #line 3778 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("drop"),(yyvsp[(2) - (5)].str),mm_strdup("language"),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -30427,8 +29858,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 518:
-
-/* Line 1455 of yacc.c  */
 #line 3782 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("drop"),(yyvsp[(2) - (7)].str),mm_strdup("language if exists"),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -30436,8 +29865,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 519:
-
-/* Line 1455 of yacc.c  */
 #line 3790 "preproc.y"
     { 
  (yyval.str) = mm_strdup("procedural");
@@ -30445,16 +29872,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 520:
-
-/* Line 1455 of yacc.c  */
 #line 3794 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 521:
-
-/* Line 1455 of yacc.c  */
 #line 3801 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("create tablespace"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("location"),(yyvsp[(6) - (6)].str));
@@ -30462,8 +29885,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 522:
-
-/* Line 1455 of yacc.c  */
 #line 3809 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("owner"),(yyvsp[(2) - (2)].str));
@@ -30471,16 +29892,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 523:
-
-/* Line 1455 of yacc.c  */
 #line 3813 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 524:
-
-/* Line 1455 of yacc.c  */
 #line 3820 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("drop tablespace"),(yyvsp[(3) - (3)].str));
@@ -30488,8 +29905,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 525:
-
-/* Line 1455 of yacc.c  */
 #line 3824 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("drop tablespace if exists"),(yyvsp[(5) - (5)].str));
@@ -30497,8 +29912,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 526:
-
-/* Line 1455 of yacc.c  */
 #line 3832 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("create extension"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -30506,8 +29919,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 527:
-
-/* Line 1455 of yacc.c  */
 #line 3836 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("create extension if not exists"),(yyvsp[(6) - (8)].str),(yyvsp[(7) - (8)].str),(yyvsp[(8) - (8)].str));
@@ -30515,8 +29926,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 528:
-
-/* Line 1455 of yacc.c  */
 #line 3844 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -30524,16 +29933,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 529:
-
-/* Line 1455 of yacc.c  */
 #line 3848 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 530:
-
-/* Line 1455 of yacc.c  */
 #line 3855 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("schema"),(yyvsp[(2) - (2)].str));
@@ -30541,8 +29946,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 531:
-
-/* Line 1455 of yacc.c  */
 #line 3859 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("version"),(yyvsp[(2) - (2)].str));
@@ -30550,8 +29953,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 532:
-
-/* Line 1455 of yacc.c  */
 #line 3863 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[(2) - (2)].str));
@@ -30559,8 +29960,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 533:
-
-/* Line 1455 of yacc.c  */
 #line 3871 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter extension"),(yyvsp[(3) - (5)].str),mm_strdup("update"),(yyvsp[(5) - (5)].str));
@@ -30568,8 +29967,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 534:
-
-/* Line 1455 of yacc.c  */
 #line 3879 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -30577,16 +29974,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 535:
-
-/* Line 1455 of yacc.c  */
 #line 3883 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 536:
-
-/* Line 1455 of yacc.c  */
 #line 3890 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("to"),(yyvsp[(2) - (2)].str));
@@ -30594,8 +29987,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 537:
-
-/* Line 1455 of yacc.c  */
 #line 3898 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter extension"),(yyvsp[(3) - (7)].str),(yyvsp[(4) - (7)].str),mm_strdup("aggregate"),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -30603,8 +29994,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 538:
-
-/* Line 1455 of yacc.c  */
 #line 3902 "preproc.y"
     { 
  (yyval.str) = cat_str(8,mm_strdup("alter extension"),(yyvsp[(3) - (10)].str),(yyvsp[(4) - (10)].str),mm_strdup("cast ("),(yyvsp[(7) - (10)].str),mm_strdup("as"),(yyvsp[(9) - (10)].str),mm_strdup(")"));
@@ -30612,8 +30001,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 539:
-
-/* Line 1455 of yacc.c  */
 #line 3906 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("collation"),(yyvsp[(6) - (6)].str));
@@ -30621,8 +30008,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 540:
-
-/* Line 1455 of yacc.c  */
 #line 3910 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("conversion"),(yyvsp[(6) - (6)].str));
@@ -30630,8 +30015,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 541:
-
-/* Line 1455 of yacc.c  */
 #line 3914 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("domain"),(yyvsp[(6) - (6)].str));
@@ -30639,8 +30022,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 542:
-
-/* Line 1455 of yacc.c  */
 #line 3918 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("function"),(yyvsp[(6) - (6)].str));
@@ -30648,8 +30029,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 543:
-
-/* Line 1455 of yacc.c  */
 #line 3922 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter extension"),(yyvsp[(3) - (7)].str),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),mm_strdup("language"),(yyvsp[(7) - (7)].str));
@@ -30657,8 +30036,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 544:
-
-/* Line 1455 of yacc.c  */
 #line 3926 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter extension"),(yyvsp[(3) - (7)].str),(yyvsp[(4) - (7)].str),mm_strdup("operator"),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -30666,8 +30043,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 545:
-
-/* Line 1455 of yacc.c  */
 #line 3930 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("alter extension"),(yyvsp[(3) - (9)].str),(yyvsp[(4) - (9)].str),mm_strdup("operator class"),(yyvsp[(7) - (9)].str),mm_strdup("using"),(yyvsp[(9) - (9)].str));
@@ -30675,8 +30050,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 546:
-
-/* Line 1455 of yacc.c  */
 #line 3934 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("alter extension"),(yyvsp[(3) - (9)].str),(yyvsp[(4) - (9)].str),mm_strdup("operator family"),(yyvsp[(7) - (9)].str),mm_strdup("using"),(yyvsp[(9) - (9)].str));
@@ -30684,8 +30057,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 547:
-
-/* Line 1455 of yacc.c  */
 #line 3938 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("schema"),(yyvsp[(6) - (6)].str));
@@ -30693,8 +30064,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 548:
-
-/* Line 1455 of yacc.c  */
 #line 3942 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("table"),(yyvsp[(6) - (6)].str));
@@ -30702,8 +30071,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 549:
-
-/* Line 1455 of yacc.c  */
 #line 3946 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (8)].str),(yyvsp[(4) - (8)].str),mm_strdup("text search parser"),(yyvsp[(8) - (8)].str));
@@ -30711,8 +30078,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 550:
-
-/* Line 1455 of yacc.c  */
 #line 3950 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (8)].str),(yyvsp[(4) - (8)].str),mm_strdup("text search dictionary"),(yyvsp[(8) - (8)].str));
@@ -30720,8 +30085,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 551:
-
-/* Line 1455 of yacc.c  */
 #line 3954 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (8)].str),(yyvsp[(4) - (8)].str),mm_strdup("text search template"),(yyvsp[(8) - (8)].str));
@@ -30729,8 +30092,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 552:
-
-/* Line 1455 of yacc.c  */
 #line 3958 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (8)].str),(yyvsp[(4) - (8)].str),mm_strdup("text search configuration"),(yyvsp[(8) - (8)].str));
@@ -30738,8 +30099,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 553:
-
-/* Line 1455 of yacc.c  */
 #line 3962 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("sequence"),(yyvsp[(6) - (6)].str));
@@ -30747,8 +30106,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 554:
-
-/* Line 1455 of yacc.c  */
 #line 3966 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("view"),(yyvsp[(6) - (6)].str));
@@ -30756,8 +30113,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 555:
-
-/* Line 1455 of yacc.c  */
 #line 3970 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (7)].str),(yyvsp[(4) - (7)].str),mm_strdup("foreign table"),(yyvsp[(7) - (7)].str));
@@ -30765,8 +30120,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 556:
-
-/* Line 1455 of yacc.c  */
 #line 3974 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (8)].str),(yyvsp[(4) - (8)].str),mm_strdup("foreign data wrapper"),(yyvsp[(8) - (8)].str));
@@ -30774,8 +30127,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 557:
-
-/* Line 1455 of yacc.c  */
 #line 3978 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("server"),(yyvsp[(6) - (6)].str));
@@ -30783,8 +30134,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 558:
-
-/* Line 1455 of yacc.c  */
 #line 3982 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter extension"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("type"),(yyvsp[(6) - (6)].str));
@@ -30792,8 +30141,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 559:
-
-/* Line 1455 of yacc.c  */
 #line 3990 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("create foreign data wrapper"),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -30801,8 +30148,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 560:
-
-/* Line 1455 of yacc.c  */
 #line 3998 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("handler"),(yyvsp[(2) - (2)].str));
@@ -30810,8 +30155,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 561:
-
-/* Line 1455 of yacc.c  */
 #line 4002 "preproc.y"
     { 
  (yyval.str) = mm_strdup("no handler");
@@ -30819,8 +30162,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 562:
-
-/* Line 1455 of yacc.c  */
 #line 4006 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("validator"),(yyvsp[(2) - (2)].str));
@@ -30828,8 +30169,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 563:
-
-/* Line 1455 of yacc.c  */
 #line 4010 "preproc.y"
     { 
  (yyval.str) = mm_strdup("no validator");
@@ -30837,8 +30176,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 564:
-
-/* Line 1455 of yacc.c  */
 #line 4018 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -30846,8 +30183,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 565:
-
-/* Line 1455 of yacc.c  */
 #line 4022 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -30855,8 +30190,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 566:
-
-/* Line 1455 of yacc.c  */
 #line 4030 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -30864,16 +30197,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 567:
-
-/* Line 1455 of yacc.c  */
 #line 4034 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 568:
-
-/* Line 1455 of yacc.c  */
 #line 4041 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("drop foreign data wrapper"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -30881,8 +30210,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 569:
-
-/* Line 1455 of yacc.c  */
 #line 4045 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("drop foreign data wrapper if exists"),(yyvsp[(7) - (8)].str),(yyvsp[(8) - (8)].str));
@@ -30890,8 +30217,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 570:
-
-/* Line 1455 of yacc.c  */
 #line 4053 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter foreign data wrapper"),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -30899,8 +30224,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 571:
-
-/* Line 1455 of yacc.c  */
 #line 4057 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter foreign data wrapper"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -30908,8 +30231,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 572:
-
-/* Line 1455 of yacc.c  */
 #line 4065 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("options ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -30917,16 +30238,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 573:
-
-/* Line 1455 of yacc.c  */
 #line 4069 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 574:
-
-/* Line 1455 of yacc.c  */
 #line 4076 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -30934,8 +30251,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 575:
-
-/* Line 1455 of yacc.c  */
 #line 4080 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -30943,8 +30258,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 576:
-
-/* Line 1455 of yacc.c  */
 #line 4088 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("options ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -30952,8 +30265,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 577:
-
-/* Line 1455 of yacc.c  */
 #line 4096 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -30961,8 +30272,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 578:
-
-/* Line 1455 of yacc.c  */
 #line 4100 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -30970,8 +30279,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 579:
-
-/* Line 1455 of yacc.c  */
 #line 4108 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -30979,8 +30286,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 580:
-
-/* Line 1455 of yacc.c  */
 #line 4112 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("set"),(yyvsp[(2) - (2)].str));
@@ -30988,8 +30293,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 581:
-
-/* Line 1455 of yacc.c  */
 #line 4116 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("add"),(yyvsp[(2) - (2)].str));
@@ -30997,8 +30300,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 582:
-
-/* Line 1455 of yacc.c  */
 #line 4120 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("drop"),(yyvsp[(2) - (2)].str));
@@ -31006,8 +30307,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 583:
-
-/* Line 1455 of yacc.c  */
 #line 4128 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -31015,8 +30314,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 584:
-
-/* Line 1455 of yacc.c  */
 #line 4136 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31024,8 +30321,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 585:
-
-/* Line 1455 of yacc.c  */
 #line 4144 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31033,8 +30328,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 586:
-
-/* Line 1455 of yacc.c  */
 #line 4152 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("create server"),(yyvsp[(3) - (10)].str),(yyvsp[(4) - (10)].str),(yyvsp[(5) - (10)].str),mm_strdup("foreign data wrapper"),(yyvsp[(9) - (10)].str),(yyvsp[(10) - (10)].str));
@@ -31042,8 +30335,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 587:
-
-/* Line 1455 of yacc.c  */
 #line 4160 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("type"),(yyvsp[(2) - (2)].str));
@@ -31051,16 +30342,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 588:
-
-/* Line 1455 of yacc.c  */
 #line 4164 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 589:
-
-/* Line 1455 of yacc.c  */
 #line 4171 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("version"),(yyvsp[(2) - (2)].str));
@@ -31068,8 +30355,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 590:
-
-/* Line 1455 of yacc.c  */
 #line 4175 "preproc.y"
     { 
  (yyval.str) = mm_strdup("version null");
@@ -31077,8 +30362,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 591:
-
-/* Line 1455 of yacc.c  */
 #line 4183 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31086,16 +30369,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 592:
-
-/* Line 1455 of yacc.c  */
 #line 4187 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 593:
-
-/* Line 1455 of yacc.c  */
 #line 4194 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("drop server"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -31103,8 +30382,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 594:
-
-/* Line 1455 of yacc.c  */
 #line 4198 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("drop server if exists"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -31112,8 +30389,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 595:
-
-/* Line 1455 of yacc.c  */
 #line 4206 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter server"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -31121,8 +30396,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 596:
-
-/* Line 1455 of yacc.c  */
 #line 4210 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter server"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -31130,8 +30403,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 597:
-
-/* Line 1455 of yacc.c  */
 #line 4214 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter server"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -31139,8 +30410,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 598:
-
-/* Line 1455 of yacc.c  */
 #line 4222 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("create foreign table"),(yyvsp[(4) - (8)].str),(yyvsp[(5) - (8)].str),mm_strdup("server"),(yyvsp[(7) - (8)].str),(yyvsp[(8) - (8)].str));
@@ -31148,8 +30417,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 599:
-
-/* Line 1455 of yacc.c  */
 #line 4226 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("create foreign table if not exists"),(yyvsp[(7) - (11)].str),(yyvsp[(8) - (11)].str),mm_strdup("server"),(yyvsp[(10) - (11)].str),(yyvsp[(11) - (11)].str));
@@ -31157,8 +30424,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 600:
-
-/* Line 1455 of yacc.c  */
 #line 4234 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -31166,8 +30431,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 601:
-
-/* Line 1455 of yacc.c  */
 #line 4238 "preproc.y"
     { 
  (yyval.str) = mm_strdup("( )");
@@ -31175,8 +30438,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 602:
-
-/* Line 1455 of yacc.c  */
 #line 4246 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31184,8 +30445,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 603:
-
-/* Line 1455 of yacc.c  */
 #line 4250 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -31193,8 +30452,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 604:
-
-/* Line 1455 of yacc.c  */
 #line 4258 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31202,8 +30459,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 605:
-
-/* Line 1455 of yacc.c  */
 #line 4266 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter foreign table"),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -31211,8 +30466,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 606:
-
-/* Line 1455 of yacc.c  */
 #line 4274 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("create user mapping for"),(yyvsp[(5) - (8)].str),mm_strdup("server"),(yyvsp[(7) - (8)].str),(yyvsp[(8) - (8)].str));
@@ -31220,8 +30473,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 607:
-
-/* Line 1455 of yacc.c  */
 #line 4282 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_user");
@@ -31229,8 +30480,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 608:
-
-/* Line 1455 of yacc.c  */
 #line 4286 "preproc.y"
     { 
  (yyval.str) = mm_strdup("user");
@@ -31238,8 +30487,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 609:
-
-/* Line 1455 of yacc.c  */
 #line 4290 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31247,8 +30494,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 610:
-
-/* Line 1455 of yacc.c  */
 #line 4298 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("drop user mapping for"),(yyvsp[(5) - (7)].str),mm_strdup("server"),(yyvsp[(7) - (7)].str));
@@ -31256,8 +30501,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 611:
-
-/* Line 1455 of yacc.c  */
 #line 4302 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("drop user mapping if exists for"),(yyvsp[(7) - (9)].str),mm_strdup("server"),(yyvsp[(9) - (9)].str));
@@ -31265,8 +30508,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 612:
-
-/* Line 1455 of yacc.c  */
 #line 4310 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter user mapping for"),(yyvsp[(5) - (8)].str),mm_strdup("server"),(yyvsp[(7) - (8)].str),(yyvsp[(8) - (8)].str));
@@ -31274,8 +30515,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 613:
-
-/* Line 1455 of yacc.c  */
 #line 4318 "preproc.y"
     { 
  (yyval.str) = cat_str(13,mm_strdup("create trigger"),(yyvsp[(3) - (15)].str),(yyvsp[(4) - (15)].str),(yyvsp[(5) - (15)].str),mm_strdup("on"),(yyvsp[(7) - (15)].str),(yyvsp[(8) - (15)].str),(yyvsp[(9) - (15)].str),mm_strdup("execute procedure"),(yyvsp[(12) - (15)].str),mm_strdup("("),(yyvsp[(14) - (15)].str),mm_strdup(")"));
@@ -31283,8 +30522,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 614:
-
-/* Line 1455 of yacc.c  */
 #line 4322 "preproc.y"
     { 
  (yyval.str) = cat_str(15,mm_strdup("create constraint trigger"),(yyvsp[(4) - (20)].str),mm_strdup("after"),(yyvsp[(6) - (20)].str),mm_strdup("on"),(yyvsp[(8) - (20)].str),(yyvsp[(9) - (20)].str),(yyvsp[(10) - (20)].str),mm_strdup("for each row"),(yyvsp[(14) - (20)].str),mm_strdup("execute procedure"),(yyvsp[(17) - (20)].str),mm_strdup("("),(yyvsp[(19) - (20)].str),mm_strdup(")"));
@@ -31292,8 +30529,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 615:
-
-/* Line 1455 of yacc.c  */
 #line 4330 "preproc.y"
     { 
  (yyval.str) = mm_strdup("before");
@@ -31301,8 +30536,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 616:
-
-/* Line 1455 of yacc.c  */
 #line 4334 "preproc.y"
     { 
  (yyval.str) = mm_strdup("after");
@@ -31310,8 +30543,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 617:
-
-/* Line 1455 of yacc.c  */
 #line 4338 "preproc.y"
     { 
  (yyval.str) = mm_strdup("instead of");
@@ -31319,8 +30550,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 618:
-
-/* Line 1455 of yacc.c  */
 #line 4346 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31328,8 +30557,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 619:
-
-/* Line 1455 of yacc.c  */
 #line 4350 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("or"),(yyvsp[(3) - (3)].str));
@@ -31337,8 +30564,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 620:
-
-/* Line 1455 of yacc.c  */
 #line 4358 "preproc.y"
     { 
  (yyval.str) = mm_strdup("insert");
@@ -31346,8 +30571,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 621:
-
-/* Line 1455 of yacc.c  */
 #line 4362 "preproc.y"
     { 
  (yyval.str) = mm_strdup("delete");
@@ -31355,8 +30578,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 622:
-
-/* Line 1455 of yacc.c  */
 #line 4366 "preproc.y"
     { 
  (yyval.str) = mm_strdup("update");
@@ -31364,8 +30585,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 623:
-
-/* Line 1455 of yacc.c  */
 #line 4370 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("update of"),(yyvsp[(3) - (3)].str));
@@ -31373,8 +30592,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 624:
-
-/* Line 1455 of yacc.c  */
 #line 4374 "preproc.y"
     { 
  (yyval.str) = mm_strdup("truncate");
@@ -31382,8 +30599,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 625:
-
-/* Line 1455 of yacc.c  */
 #line 4382 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("for"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -31391,16 +30606,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 626:
-
-/* Line 1455 of yacc.c  */
 #line 4386 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 627:
-
-/* Line 1455 of yacc.c  */
 #line 4393 "preproc.y"
     { 
  (yyval.str) = mm_strdup("each");
@@ -31408,16 +30619,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 628:
-
-/* Line 1455 of yacc.c  */
 #line 4397 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 629:
-
-/* Line 1455 of yacc.c  */
 #line 4404 "preproc.y"
     { 
  (yyval.str) = mm_strdup("row");
@@ -31425,8 +30632,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 630:
-
-/* Line 1455 of yacc.c  */
 #line 4408 "preproc.y"
     { 
  (yyval.str) = mm_strdup("statement");
@@ -31434,8 +30639,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 631:
-
-/* Line 1455 of yacc.c  */
 #line 4416 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("when ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -31443,16 +30646,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 632:
-
-/* Line 1455 of yacc.c  */
 #line 4420 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 633:
-
-/* Line 1455 of yacc.c  */
 #line 4427 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31460,8 +30659,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 634:
-
-/* Line 1455 of yacc.c  */
 #line 4431 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -31469,16 +30666,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 635:
-
-/* Line 1455 of yacc.c  */
 #line 4435 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 636:
-
-/* Line 1455 of yacc.c  */
 #line 4442 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31486,8 +30679,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 637:
-
-/* Line 1455 of yacc.c  */
 #line 4446 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31495,8 +30686,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 638:
-
-/* Line 1455 of yacc.c  */
 #line 4450 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31504,8 +30693,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 639:
-
-/* Line 1455 of yacc.c  */
 #line 4454 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31513,8 +30700,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 640:
-
-/* Line 1455 of yacc.c  */
 #line 4462 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[(2) - (2)].str));
@@ -31522,24 +30707,18 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 641:
-
-/* Line 1455 of yacc.c  */
 #line 4466 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 642:
-
-/* Line 1455 of yacc.c  */
 #line 4473 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 643:
-
-/* Line 1455 of yacc.c  */
 #line 4476 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -31547,8 +30726,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 644:
-
-/* Line 1455 of yacc.c  */
 #line 4484 "preproc.y"
     { 
  (yyval.str) = mm_strdup("not deferrable");
@@ -31556,8 +30733,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 645:
-
-/* Line 1455 of yacc.c  */
 #line 4488 "preproc.y"
     { 
  (yyval.str) = mm_strdup("deferrable");
@@ -31565,8 +30740,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 646:
-
-/* Line 1455 of yacc.c  */
 #line 4492 "preproc.y"
     { 
  (yyval.str) = mm_strdup("initially immediate");
@@ -31574,8 +30747,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 647:
-
-/* Line 1455 of yacc.c  */
 #line 4496 "preproc.y"
     { 
  (yyval.str) = mm_strdup("initially deferred");
@@ -31583,8 +30754,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 648:
-
-/* Line 1455 of yacc.c  */
 #line 4500 "preproc.y"
     { 
  (yyval.str) = mm_strdup("not valid");
@@ -31592,8 +30761,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 649:
-
-/* Line 1455 of yacc.c  */
 #line 4508 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("drop trigger"),(yyvsp[(3) - (6)].str),mm_strdup("on"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -31601,8 +30768,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 650:
-
-/* Line 1455 of yacc.c  */
 #line 4512 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("drop trigger if exists"),(yyvsp[(5) - (8)].str),mm_strdup("on"),(yyvsp[(7) - (8)].str),(yyvsp[(8) - (8)].str));
@@ -31610,8 +30775,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 651:
-
-/* Line 1455 of yacc.c  */
 #line 4520 "preproc.y"
     { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
@@ -31620,8 +30783,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 652:
-
-/* Line 1455 of yacc.c  */
 #line 4529 "preproc.y"
     { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
@@ -31630,8 +30791,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 653:
-
-/* Line 1455 of yacc.c  */
 #line 4538 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("create aggregate"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -31639,8 +30798,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 654:
-
-/* Line 1455 of yacc.c  */
 #line 4542 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("create aggregate"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -31648,8 +30805,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 655:
-
-/* Line 1455 of yacc.c  */
 #line 4546 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("create operator"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -31657,8 +30812,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 656:
-
-/* Line 1455 of yacc.c  */
 #line 4550 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("create type"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -31666,8 +30819,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 657:
-
-/* Line 1455 of yacc.c  */
 #line 4554 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("create type"),(yyvsp[(3) - (3)].str));
@@ -31675,8 +30826,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 658:
-
-/* Line 1455 of yacc.c  */
 #line 4558 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("create type"),(yyvsp[(3) - (7)].str),mm_strdup("as ("),(yyvsp[(6) - (7)].str),mm_strdup(")"));
@@ -31684,8 +30833,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 659:
-
-/* Line 1455 of yacc.c  */
 #line 4562 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("create type"),(yyvsp[(3) - (8)].str),mm_strdup("as enum ("),(yyvsp[(7) - (8)].str),mm_strdup(")"));
@@ -31693,8 +30840,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 660:
-
-/* Line 1455 of yacc.c  */
 #line 4566 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("create text search parser"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -31702,8 +30847,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 661:
-
-/* Line 1455 of yacc.c  */
 #line 4570 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("create text search dictionary"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -31711,8 +30854,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 662:
-
-/* Line 1455 of yacc.c  */
 #line 4574 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("create text search template"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -31720,8 +30861,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 663:
-
-/* Line 1455 of yacc.c  */
 #line 4578 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("create text search configuration"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -31729,8 +30868,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 664:
-
-/* Line 1455 of yacc.c  */
 #line 4582 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("create collation"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -31738,8 +30875,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 665:
-
-/* Line 1455 of yacc.c  */
 #line 4586 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("create collation"),(yyvsp[(3) - (5)].str),mm_strdup("from"),(yyvsp[(5) - (5)].str));
@@ -31747,8 +30882,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 666:
-
-/* Line 1455 of yacc.c  */
 #line 4594 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -31756,8 +30889,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 667:
-
-/* Line 1455 of yacc.c  */
 #line 4602 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31765,8 +30896,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 668:
-
-/* Line 1455 of yacc.c  */
 #line 4606 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -31774,8 +30903,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 669:
-
-/* Line 1455 of yacc.c  */
 #line 4614 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("="),(yyvsp[(3) - (3)].str));
@@ -31783,8 +30910,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 670:
-
-/* Line 1455 of yacc.c  */
 #line 4618 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31792,8 +30917,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 671:
-
-/* Line 1455 of yacc.c  */
 #line 4626 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31801,8 +30924,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 672:
-
-/* Line 1455 of yacc.c  */
 #line 4630 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31810,8 +30931,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 673:
-
-/* Line 1455 of yacc.c  */
 #line 4634 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31819,8 +30938,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 674:
-
-/* Line 1455 of yacc.c  */
 #line 4638 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31828,8 +30945,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 675:
-
-/* Line 1455 of yacc.c  */
 #line 4642 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31837,8 +30952,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 676:
-
-/* Line 1455 of yacc.c  */
 #line 4650 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -31846,8 +30959,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 677:
-
-/* Line 1455 of yacc.c  */
 #line 4654 "preproc.y"
     { 
  (yyval.str) = mm_strdup("( * )");
@@ -31855,8 +30966,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 678:
-
-/* Line 1455 of yacc.c  */
 #line 4662 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -31864,8 +30973,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 679:
-
-/* Line 1455 of yacc.c  */
 #line 4670 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31873,8 +30980,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 680:
-
-/* Line 1455 of yacc.c  */
 #line 4674 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -31882,8 +30987,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 681:
-
-/* Line 1455 of yacc.c  */
 #line 4682 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("="),(yyvsp[(3) - (3)].str));
@@ -31891,8 +30994,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 682:
-
-/* Line 1455 of yacc.c  */
 #line 4690 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31900,16 +31001,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 683:
-
-/* Line 1455 of yacc.c  */
 #line 4694 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 684:
-
-/* Line 1455 of yacc.c  */
 #line 4701 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31917,8 +31014,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 685:
-
-/* Line 1455 of yacc.c  */
 #line 4705 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -31926,8 +31021,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 686:
-
-/* Line 1455 of yacc.c  */
 #line 4713 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter type"),(yyvsp[(3) - (6)].str),mm_strdup("add value"),(yyvsp[(6) - (6)].str));
@@ -31935,8 +31028,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 687:
-
-/* Line 1455 of yacc.c  */
 #line 4717 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter type"),(yyvsp[(3) - (8)].str),mm_strdup("add value"),(yyvsp[(6) - (8)].str),mm_strdup("before"),(yyvsp[(8) - (8)].str));
@@ -31944,8 +31035,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 688:
-
-/* Line 1455 of yacc.c  */
 #line 4721 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter type"),(yyvsp[(3) - (8)].str),mm_strdup("add value"),(yyvsp[(6) - (8)].str),mm_strdup("after"),(yyvsp[(8) - (8)].str));
@@ -31953,8 +31042,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 689:
-
-/* Line 1455 of yacc.c  */
 #line 4729 "preproc.y"
     { 
  (yyval.str) = cat_str(10,mm_strdup("create operator class"),(yyvsp[(4) - (13)].str),(yyvsp[(5) - (13)].str),mm_strdup("for type"),(yyvsp[(8) - (13)].str),mm_strdup("using"),(yyvsp[(10) - (13)].str),(yyvsp[(11) - (13)].str),mm_strdup("as"),(yyvsp[(13) - (13)].str));
@@ -31962,8 +31049,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 690:
-
-/* Line 1455 of yacc.c  */
 #line 4737 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -31971,8 +31056,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 691:
-
-/* Line 1455 of yacc.c  */
 #line 4741 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -31980,8 +31063,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 692:
-
-/* Line 1455 of yacc.c  */
 #line 4749 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("operator"),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -31989,8 +31070,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 693:
-
-/* Line 1455 of yacc.c  */
 #line 4753 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("operator"),(yyvsp[(2) - (6)].str),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -31998,8 +31077,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 694:
-
-/* Line 1455 of yacc.c  */
 #line 4757 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("function"),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -32007,8 +31084,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 695:
-
-/* Line 1455 of yacc.c  */
 #line 4761 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("function"),(yyvsp[(2) - (7)].str),mm_strdup("("),(yyvsp[(4) - (7)].str),mm_strdup(")"),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -32016,8 +31091,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 696:
-
-/* Line 1455 of yacc.c  */
 #line 4765 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("storage"),(yyvsp[(2) - (2)].str));
@@ -32025,8 +31098,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 697:
-
-/* Line 1455 of yacc.c  */
 #line 4773 "preproc.y"
     { 
  (yyval.str) = mm_strdup("default");
@@ -32034,16 +31105,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 698:
-
-/* Line 1455 of yacc.c  */
 #line 4777 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 699:
-
-/* Line 1455 of yacc.c  */
 #line 4784 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("family"),(yyvsp[(2) - (2)].str));
@@ -32051,16 +31118,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 700:
-
-/* Line 1455 of yacc.c  */
 #line 4788 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 701:
-
-/* Line 1455 of yacc.c  */
 #line 4795 "preproc.y"
     { 
  (yyval.str) = mm_strdup("for search");
@@ -32068,8 +31131,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 702:
-
-/* Line 1455 of yacc.c  */
 #line 4799 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("for order by"),(yyvsp[(4) - (4)].str));
@@ -32077,16 +31138,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 703:
-
-/* Line 1455 of yacc.c  */
 #line 4803 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 704:
-
-/* Line 1455 of yacc.c  */
 #line 4810 "preproc.y"
     { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
@@ -32095,16 +31152,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 705:
-
-/* Line 1455 of yacc.c  */
 #line 4815 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 706:
-
-/* Line 1455 of yacc.c  */
 #line 4822 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("create operator family"),(yyvsp[(4) - (6)].str),mm_strdup("using"),(yyvsp[(6) - (6)].str));
@@ -32112,8 +31165,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 707:
-
-/* Line 1455 of yacc.c  */
 #line 4830 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[(4) - (8)].str),mm_strdup("using"),(yyvsp[(6) - (8)].str),mm_strdup("add"),(yyvsp[(8) - (8)].str));
@@ -32121,8 +31172,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 708:
-
-/* Line 1455 of yacc.c  */
 #line 4834 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[(4) - (8)].str),mm_strdup("using"),(yyvsp[(6) - (8)].str),mm_strdup("drop"),(yyvsp[(8) - (8)].str));
@@ -32130,8 +31179,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 709:
-
-/* Line 1455 of yacc.c  */
 #line 4842 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -32139,8 +31186,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 710:
-
-/* Line 1455 of yacc.c  */
 #line 4846 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -32148,8 +31193,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 711:
-
-/* Line 1455 of yacc.c  */
 #line 4854 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("operator"),(yyvsp[(2) - (5)].str),mm_strdup("("),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -32157,8 +31200,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 712:
-
-/* Line 1455 of yacc.c  */
 #line 4858 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("function"),(yyvsp[(2) - (5)].str),mm_strdup("("),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -32166,8 +31207,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 713:
-
-/* Line 1455 of yacc.c  */
 #line 4866 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("drop operator class"),(yyvsp[(4) - (7)].str),mm_strdup("using"),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -32175,8 +31214,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 714:
-
-/* Line 1455 of yacc.c  */
 #line 4870 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("drop operator class if exists"),(yyvsp[(6) - (9)].str),mm_strdup("using"),(yyvsp[(8) - (9)].str),(yyvsp[(9) - (9)].str));
@@ -32184,8 +31221,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 715:
-
-/* Line 1455 of yacc.c  */
 #line 4878 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("drop operator family"),(yyvsp[(4) - (7)].str),mm_strdup("using"),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -32193,8 +31228,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 716:
-
-/* Line 1455 of yacc.c  */
 #line 4882 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("drop operator family if exists"),(yyvsp[(6) - (9)].str),mm_strdup("using"),(yyvsp[(8) - (9)].str),(yyvsp[(9) - (9)].str));
@@ -32202,8 +31235,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 717:
-
-/* Line 1455 of yacc.c  */
 #line 4890 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("drop owned by"),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -32211,8 +31242,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 718:
-
-/* Line 1455 of yacc.c  */
 #line 4898 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("reassign owned by"),(yyvsp[(4) - (6)].str),mm_strdup("to"),(yyvsp[(6) - (6)].str));
@@ -32220,8 +31249,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 719:
-
-/* Line 1455 of yacc.c  */
 #line 4906 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("drop"),(yyvsp[(2) - (6)].str),mm_strdup("if exists"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -32229,8 +31256,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 720:
-
-/* Line 1455 of yacc.c  */
 #line 4910 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("drop"),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -32238,8 +31263,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 721:
-
-/* Line 1455 of yacc.c  */
 #line 4918 "preproc.y"
     { 
  (yyval.str) = mm_strdup("table");
@@ -32247,8 +31270,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 722:
-
-/* Line 1455 of yacc.c  */
 #line 4922 "preproc.y"
     { 
  (yyval.str) = mm_strdup("sequence");
@@ -32256,8 +31277,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 723:
-
-/* Line 1455 of yacc.c  */
 #line 4926 "preproc.y"
     { 
  (yyval.str) = mm_strdup("view");
@@ -32265,8 +31284,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 724:
-
-/* Line 1455 of yacc.c  */
 #line 4930 "preproc.y"
     { 
  (yyval.str) = mm_strdup("index");
@@ -32274,8 +31291,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 725:
-
-/* Line 1455 of yacc.c  */
 #line 4934 "preproc.y"
     { 
  (yyval.str) = mm_strdup("foreign table");
@@ -32283,8 +31298,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 726:
-
-/* Line 1455 of yacc.c  */
 #line 4938 "preproc.y"
     { 
  (yyval.str) = mm_strdup("type");
@@ -32292,8 +31305,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 727:
-
-/* Line 1455 of yacc.c  */
 #line 4942 "preproc.y"
     { 
  (yyval.str) = mm_strdup("domain");
@@ -32301,8 +31312,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 728:
-
-/* Line 1455 of yacc.c  */
 #line 4946 "preproc.y"
     { 
  (yyval.str) = mm_strdup("collation");
@@ -32310,8 +31319,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 729:
-
-/* Line 1455 of yacc.c  */
 #line 4950 "preproc.y"
     { 
  (yyval.str) = mm_strdup("conversion");
@@ -32319,8 +31326,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 730:
-
-/* Line 1455 of yacc.c  */
 #line 4954 "preproc.y"
     { 
  (yyval.str) = mm_strdup("schema");
@@ -32328,8 +31333,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 731:
-
-/* Line 1455 of yacc.c  */
 #line 4958 "preproc.y"
     { 
  (yyval.str) = mm_strdup("extension");
@@ -32337,8 +31340,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 732:
-
-/* Line 1455 of yacc.c  */
 #line 4962 "preproc.y"
     { 
  (yyval.str) = mm_strdup("text search parser");
@@ -32346,8 +31347,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 733:
-
-/* Line 1455 of yacc.c  */
 #line 4966 "preproc.y"
     { 
  (yyval.str) = mm_strdup("text search dictionary");
@@ -32355,8 +31354,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 734:
-
-/* Line 1455 of yacc.c  */
 #line 4970 "preproc.y"
     { 
  (yyval.str) = mm_strdup("text search template");
@@ -32364,8 +31361,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 735:
-
-/* Line 1455 of yacc.c  */
 #line 4974 "preproc.y"
     { 
  (yyval.str) = mm_strdup("text search configuration");
@@ -32373,8 +31368,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 736:
-
-/* Line 1455 of yacc.c  */
 #line 4982 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -32382,8 +31375,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 737:
-
-/* Line 1455 of yacc.c  */
 #line 4986 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -32391,8 +31382,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 738:
-
-/* Line 1455 of yacc.c  */
 #line 4994 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -32400,8 +31389,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 739:
-
-/* Line 1455 of yacc.c  */
 #line 4998 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -32409,8 +31396,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 740:
-
-/* Line 1455 of yacc.c  */
 #line 5006 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("."),(yyvsp[(2) - (2)].str));
@@ -32418,8 +31403,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 741:
-
-/* Line 1455 of yacc.c  */
 #line 5010 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("."),(yyvsp[(3) - (3)].str));
@@ -32427,8 +31410,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 742:
-
-/* Line 1455 of yacc.c  */
 #line 5018 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("truncate"),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -32436,8 +31417,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 743:
-
-/* Line 1455 of yacc.c  */
 #line 5026 "preproc.y"
     { 
  (yyval.str) = mm_strdup("continue identity");
@@ -32445,8 +31424,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 744:
-
-/* Line 1455 of yacc.c  */
 #line 5030 "preproc.y"
     { 
  (yyval.str) = mm_strdup("restart identity");
@@ -32454,16 +31431,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 745:
-
-/* Line 1455 of yacc.c  */
 #line 5034 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 746:
-
-/* Line 1455 of yacc.c  */
 #line 5041 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("comment on"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("is"),(yyvsp[(6) - (6)].str));
@@ -32471,8 +31444,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 747:
-
-/* Line 1455 of yacc.c  */
 #line 5045 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("comment on aggregate"),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),mm_strdup("is"),(yyvsp[(7) - (7)].str));
@@ -32480,8 +31451,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 748:
-
-/* Line 1455 of yacc.c  */
 #line 5049 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("comment on function"),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),mm_strdup("is"),(yyvsp[(7) - (7)].str));
@@ -32489,8 +31458,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 749:
-
-/* Line 1455 of yacc.c  */
 #line 5053 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("comment on operator"),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),mm_strdup("is"),(yyvsp[(7) - (7)].str));
@@ -32498,8 +31465,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 750:
-
-/* Line 1455 of yacc.c  */
 #line 5057 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("comment on constraint"),(yyvsp[(4) - (8)].str),mm_strdup("on"),(yyvsp[(6) - (8)].str),mm_strdup("is"),(yyvsp[(8) - (8)].str));
@@ -32507,8 +31472,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 751:
-
-/* Line 1455 of yacc.c  */
 #line 5061 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("comment on rule"),(yyvsp[(4) - (8)].str),mm_strdup("on"),(yyvsp[(6) - (8)].str),mm_strdup("is"),(yyvsp[(8) - (8)].str));
@@ -32516,8 +31479,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 752:
-
-/* Line 1455 of yacc.c  */
 #line 5065 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("comment on rule"),(yyvsp[(4) - (6)].str),mm_strdup("is"),(yyvsp[(6) - (6)].str));
@@ -32525,8 +31486,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 753:
-
-/* Line 1455 of yacc.c  */
 #line 5069 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("comment on trigger"),(yyvsp[(4) - (8)].str),mm_strdup("on"),(yyvsp[(6) - (8)].str),mm_strdup("is"),(yyvsp[(8) - (8)].str));
@@ -32534,8 +31493,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 754:
-
-/* Line 1455 of yacc.c  */
 #line 5073 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("comment on operator class"),(yyvsp[(5) - (9)].str),mm_strdup("using"),(yyvsp[(7) - (9)].str),mm_strdup("is"),(yyvsp[(9) - (9)].str));
@@ -32543,8 +31500,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 755:
-
-/* Line 1455 of yacc.c  */
 #line 5077 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("comment on operator family"),(yyvsp[(5) - (9)].str),mm_strdup("using"),(yyvsp[(7) - (9)].str),mm_strdup("is"),(yyvsp[(9) - (9)].str));
@@ -32552,8 +31507,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 756:
-
-/* Line 1455 of yacc.c  */
 #line 5081 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("comment on large object"),(yyvsp[(5) - (7)].str),mm_strdup("is"),(yyvsp[(7) - (7)].str));
@@ -32561,8 +31514,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 757:
-
-/* Line 1455 of yacc.c  */
 #line 5085 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("comment on cast ("),(yyvsp[(5) - (10)].str),mm_strdup("as"),(yyvsp[(7) - (10)].str),mm_strdup(") is"),(yyvsp[(10) - (10)].str));
@@ -32570,8 +31521,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 758:
-
-/* Line 1455 of yacc.c  */
 #line 5089 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("comment on"),(yyvsp[(3) - (7)].str),mm_strdup("language"),(yyvsp[(5) - (7)].str),mm_strdup("is"),(yyvsp[(7) - (7)].str));
@@ -32579,8 +31528,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 759:
-
-/* Line 1455 of yacc.c  */
 #line 5093 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("comment on text search parser"),(yyvsp[(6) - (8)].str),mm_strdup("is"),(yyvsp[(8) - (8)].str));
@@ -32588,8 +31535,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 760:
-
-/* Line 1455 of yacc.c  */
 #line 5097 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("comment on text search dictionary"),(yyvsp[(6) - (8)].str),mm_strdup("is"),(yyvsp[(8) - (8)].str));
@@ -32597,8 +31542,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 761:
-
-/* Line 1455 of yacc.c  */
 #line 5101 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("comment on text search template"),(yyvsp[(6) - (8)].str),mm_strdup("is"),(yyvsp[(8) - (8)].str));
@@ -32606,8 +31549,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 762:
-
-/* Line 1455 of yacc.c  */
 #line 5105 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("comment on text search configuration"),(yyvsp[(6) - (8)].str),mm_strdup("is"),(yyvsp[(8) - (8)].str));
@@ -32615,8 +31556,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 763:
-
-/* Line 1455 of yacc.c  */
 #line 5113 "preproc.y"
     { 
  (yyval.str) = mm_strdup("column");
@@ -32624,8 +31563,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 764:
-
-/* Line 1455 of yacc.c  */
 #line 5117 "preproc.y"
     { 
  (yyval.str) = mm_strdup("database");
@@ -32633,8 +31570,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 765:
-
-/* Line 1455 of yacc.c  */
 #line 5121 "preproc.y"
     { 
  (yyval.str) = mm_strdup("schema");
@@ -32642,8 +31577,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 766:
-
-/* Line 1455 of yacc.c  */
 #line 5125 "preproc.y"
     { 
  (yyval.str) = mm_strdup("index");
@@ -32651,8 +31584,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 767:
-
-/* Line 1455 of yacc.c  */
 #line 5129 "preproc.y"
     { 
  (yyval.str) = mm_strdup("sequence");
@@ -32660,8 +31591,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 768:
-
-/* Line 1455 of yacc.c  */
 #line 5133 "preproc.y"
     { 
  (yyval.str) = mm_strdup("table");
@@ -32669,8 +31598,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 769:
-
-/* Line 1455 of yacc.c  */
 #line 5137 "preproc.y"
     { 
  (yyval.str) = mm_strdup("domain");
@@ -32678,8 +31605,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 770:
-
-/* Line 1455 of yacc.c  */
 #line 5141 "preproc.y"
     { 
  (yyval.str) = mm_strdup("type");
@@ -32687,8 +31612,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 771:
-
-/* Line 1455 of yacc.c  */
 #line 5145 "preproc.y"
     { 
  (yyval.str) = mm_strdup("view");
@@ -32696,8 +31619,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 772:
-
-/* Line 1455 of yacc.c  */
 #line 5149 "preproc.y"
     { 
  (yyval.str) = mm_strdup("collation");
@@ -32705,8 +31626,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 773:
-
-/* Line 1455 of yacc.c  */
 #line 5153 "preproc.y"
     { 
  (yyval.str) = mm_strdup("conversion");
@@ -32714,8 +31633,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 774:
-
-/* Line 1455 of yacc.c  */
 #line 5157 "preproc.y"
     { 
  (yyval.str) = mm_strdup("tablespace");
@@ -32723,8 +31640,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 775:
-
-/* Line 1455 of yacc.c  */
 #line 5161 "preproc.y"
     { 
  (yyval.str) = mm_strdup("extension");
@@ -32732,8 +31647,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 776:
-
-/* Line 1455 of yacc.c  */
 #line 5165 "preproc.y"
     { 
  (yyval.str) = mm_strdup("role");
@@ -32741,8 +31654,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 777:
-
-/* Line 1455 of yacc.c  */
 #line 5169 "preproc.y"
     { 
  (yyval.str) = mm_strdup("foreign table");
@@ -32750,8 +31661,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 778:
-
-/* Line 1455 of yacc.c  */
 #line 5173 "preproc.y"
     { 
  (yyval.str) = mm_strdup("server");
@@ -32759,8 +31668,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 779:
-
-/* Line 1455 of yacc.c  */
 #line 5177 "preproc.y"
     { 
  (yyval.str) = mm_strdup("foreign data wrapper");
@@ -32768,8 +31675,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 780:
-
-/* Line 1455 of yacc.c  */
 #line 5185 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -32777,8 +31682,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 781:
-
-/* Line 1455 of yacc.c  */
 #line 5189 "preproc.y"
     { 
  (yyval.str) = mm_strdup("null");
@@ -32786,8 +31689,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 782:
-
-/* Line 1455 of yacc.c  */
 #line 5197 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("security label"),(yyvsp[(3) - (8)].str),mm_strdup("on"),(yyvsp[(5) - (8)].str),(yyvsp[(6) - (8)].str),mm_strdup("is"),(yyvsp[(8) - (8)].str));
@@ -32795,8 +31696,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 783:
-
-/* Line 1455 of yacc.c  */
 #line 5201 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("security label"),(yyvsp[(3) - (9)].str),mm_strdup("on aggregate"),(yyvsp[(6) - (9)].str),(yyvsp[(7) - (9)].str),mm_strdup("is"),(yyvsp[(9) - (9)].str));
@@ -32804,8 +31703,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 784:
-
-/* Line 1455 of yacc.c  */
 #line 5205 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("security label"),(yyvsp[(3) - (9)].str),mm_strdup("on function"),(yyvsp[(6) - (9)].str),(yyvsp[(7) - (9)].str),mm_strdup("is"),(yyvsp[(9) - (9)].str));
@@ -32813,8 +31710,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 785:
-
-/* Line 1455 of yacc.c  */
 #line 5209 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("security label"),(yyvsp[(3) - (9)].str),mm_strdup("on large object"),(yyvsp[(7) - (9)].str),mm_strdup("is"),(yyvsp[(9) - (9)].str));
@@ -32822,8 +31717,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 786:
-
-/* Line 1455 of yacc.c  */
 #line 5213 "preproc.y"
     { 
  (yyval.str) = cat_str(8,mm_strdup("security label"),(yyvsp[(3) - (9)].str),mm_strdup("on"),(yyvsp[(5) - (9)].str),mm_strdup("language"),(yyvsp[(7) - (9)].str),mm_strdup("is"),(yyvsp[(9) - (9)].str));
@@ -32831,8 +31724,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 787:
-
-/* Line 1455 of yacc.c  */
 #line 5221 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("for"),(yyvsp[(2) - (2)].str));
@@ -32840,16 +31731,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 788:
-
-/* Line 1455 of yacc.c  */
 #line 5225 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 789:
-
-/* Line 1455 of yacc.c  */
 #line 5232 "preproc.y"
     { 
  (yyval.str) = mm_strdup("column");
@@ -32857,8 +31744,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 790:
-
-/* Line 1455 of yacc.c  */
 #line 5236 "preproc.y"
     { 
  (yyval.str) = mm_strdup("foreign table");
@@ -32866,8 +31751,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 791:
-
-/* Line 1455 of yacc.c  */
 #line 5240 "preproc.y"
     { 
  (yyval.str) = mm_strdup("schema");
@@ -32875,8 +31758,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 792:
-
-/* Line 1455 of yacc.c  */
 #line 5244 "preproc.y"
     { 
  (yyval.str) = mm_strdup("sequence");
@@ -32884,8 +31765,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 793:
-
-/* Line 1455 of yacc.c  */
 #line 5248 "preproc.y"
     { 
  (yyval.str) = mm_strdup("table");
@@ -32893,8 +31772,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 794:
-
-/* Line 1455 of yacc.c  */
 #line 5252 "preproc.y"
     { 
  (yyval.str) = mm_strdup("domain");
@@ -32902,8 +31779,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 795:
-
-/* Line 1455 of yacc.c  */
 #line 5256 "preproc.y"
     { 
  (yyval.str) = mm_strdup("type");
@@ -32911,8 +31786,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 796:
-
-/* Line 1455 of yacc.c  */
 #line 5260 "preproc.y"
     { 
  (yyval.str) = mm_strdup("view");
@@ -32920,8 +31793,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 797:
-
-/* Line 1455 of yacc.c  */
 #line 5268 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -32929,8 +31800,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 798:
-
-/* Line 1455 of yacc.c  */
 #line 5272 "preproc.y"
     { 
  (yyval.str) = mm_strdup("null");
@@ -32938,8 +31807,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 799:
-
-/* Line 1455 of yacc.c  */
 #line 5280 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("fetch"),(yyvsp[(2) - (2)].str));
@@ -32947,8 +31814,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 800:
-
-/* Line 1455 of yacc.c  */
 #line 5284 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("move"),(yyvsp[(2) - (2)].str));
@@ -32956,8 +31821,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 801:
-
-/* Line 1455 of yacc.c  */
 #line 5288 "preproc.y"
     {
 		(yyval.str) = cat2_str(mm_strdup("fetch"), (yyvsp[(2) - (3)].str));
@@ -32965,8 +31828,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 802:
-
-/* Line 1455 of yacc.c  */
 #line 5292 "preproc.y"
     {
 		char *cursor_marker = (yyvsp[(3) - (4)].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[(3) - (4)].str);
@@ -32976,8 +31837,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 803:
-
-/* Line 1455 of yacc.c  */
 #line 5298 "preproc.y"
     {
 		char *cursor_marker = (yyvsp[(4) - (5)].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[(4) - (5)].str);
@@ -32987,8 +31846,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 804:
-
-/* Line 1455 of yacc.c  */
 #line 5304 "preproc.y"
     {
 		char *cursor_marker = (yyvsp[(3) - (4)].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[(3) - (4)].str);
@@ -32998,8 +31855,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 805:
-
-/* Line 1455 of yacc.c  */
 #line 5310 "preproc.y"
     {
 		char *cursor_marker = (yyvsp[(4) - (5)].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[(4) - (5)].str);
@@ -33009,8 +31864,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 806:
-
-/* Line 1455 of yacc.c  */
 #line 5316 "preproc.y"
     {
 		char *cursor_marker = (yyvsp[(3) - (3)].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[(3) - (3)].str);
@@ -33020,8 +31873,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 807:
-
-/* Line 1455 of yacc.c  */
 #line 5322 "preproc.y"
     {
 		char *cursor_marker = (yyvsp[(4) - (4)].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[(4) - (4)].str);
@@ -33031,8 +31882,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 808:
-
-/* Line 1455 of yacc.c  */
 #line 5328 "preproc.y"
     {
 		char *cursor_marker = (yyvsp[(3) - (3)].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[(3) - (3)].str);
@@ -33042,8 +31891,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 809:
-
-/* Line 1455 of yacc.c  */
 #line 5334 "preproc.y"
     {
 		char *cursor_marker = (yyvsp[(4) - (4)].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[(4) - (4)].str);
@@ -33053,8 +31900,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 810:
-
-/* Line 1455 of yacc.c  */
 #line 5344 "preproc.y"
     { 
 		add_additional_variables((yyvsp[(1) - (1)].str), false);
@@ -33069,8 +31914,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 811:
-
-/* Line 1455 of yacc.c  */
 #line 5355 "preproc.y"
     { 
 		add_additional_variables((yyvsp[(2) - (2)].str), false);
@@ -33085,8 +31928,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 812:
-
-/* Line 1455 of yacc.c  */
 #line 5366 "preproc.y"
     { 
 		add_additional_variables((yyvsp[(3) - (3)].str), false);
@@ -33101,8 +31942,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 813:
-
-/* Line 1455 of yacc.c  */
 #line 5377 "preproc.y"
     { 
 		add_additional_variables((yyvsp[(3) - (3)].str), false);
@@ -33117,8 +31956,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 814:
-
-/* Line 1455 of yacc.c  */
 #line 5388 "preproc.y"
     { 
 		add_additional_variables((yyvsp[(3) - (3)].str), false);
@@ -33133,8 +31970,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 815:
-
-/* Line 1455 of yacc.c  */
 #line 5399 "preproc.y"
     { 
 		add_additional_variables((yyvsp[(3) - (3)].str), false);
@@ -33149,8 +31984,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 816:
-
-/* Line 1455 of yacc.c  */
 #line 5410 "preproc.y"
     { 
 		add_additional_variables((yyvsp[(4) - (4)].str), false);
@@ -33170,8 +32003,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 817:
-
-/* Line 1455 of yacc.c  */
 #line 5426 "preproc.y"
     { 
 		add_additional_variables((yyvsp[(4) - (4)].str), false);
@@ -33191,8 +32022,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 818:
-
-/* Line 1455 of yacc.c  */
 #line 5442 "preproc.y"
     { 
 		add_additional_variables((yyvsp[(3) - (3)].str), false);
@@ -33212,8 +32041,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 819:
-
-/* Line 1455 of yacc.c  */
 #line 5458 "preproc.y"
     { 
 		add_additional_variables((yyvsp[(3) - (3)].str), false);
@@ -33228,8 +32055,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 820:
-
-/* Line 1455 of yacc.c  */
 #line 5469 "preproc.y"
     { 
 		add_additional_variables((yyvsp[(4) - (4)].str), false);
@@ -33249,8 +32074,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 821:
-
-/* Line 1455 of yacc.c  */
 #line 5485 "preproc.y"
     { 
 		add_additional_variables((yyvsp[(4) - (4)].str), false);
@@ -33265,8 +32088,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 822:
-
-/* Line 1455 of yacc.c  */
 #line 5496 "preproc.y"
     { 
 		add_additional_variables((yyvsp[(4) - (4)].str), false);
@@ -33286,8 +32107,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 823:
-
-/* Line 1455 of yacc.c  */
 #line 5512 "preproc.y"
     { 
 		add_additional_variables((yyvsp[(4) - (4)].str), false);
@@ -33302,8 +32121,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 824:
-
-/* Line 1455 of yacc.c  */
 #line 5527 "preproc.y"
     { 
  (yyval.str) = mm_strdup("from");
@@ -33311,8 +32128,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 825:
-
-/* Line 1455 of yacc.c  */
 #line 5531 "preproc.y"
     { 
  (yyval.str) = mm_strdup("in");
@@ -33320,8 +32135,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 826:
-
-/* Line 1455 of yacc.c  */
 #line 5539 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -33329,16 +32142,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 827:
-
-/* Line 1455 of yacc.c  */
 #line 5543 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 828:
-
-/* Line 1455 of yacc.c  */
 #line 5550 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("grant"),(yyvsp[(2) - (7)].str),mm_strdup("on"),(yyvsp[(4) - (7)].str),mm_strdup("to"),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -33346,8 +32155,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 829:
-
-/* Line 1455 of yacc.c  */
 #line 5558 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("revoke"),(yyvsp[(2) - (7)].str),mm_strdup("on"),(yyvsp[(4) - (7)].str),mm_strdup("from"),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -33355,8 +32162,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 830:
-
-/* Line 1455 of yacc.c  */
 #line 5562 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("revoke grant option for"),(yyvsp[(5) - (10)].str),mm_strdup("on"),(yyvsp[(7) - (10)].str),mm_strdup("from"),(yyvsp[(9) - (10)].str),(yyvsp[(10) - (10)].str));
@@ -33364,8 +32169,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 831:
-
-/* Line 1455 of yacc.c  */
 #line 5570 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -33373,8 +32176,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 832:
-
-/* Line 1455 of yacc.c  */
 #line 5574 "preproc.y"
     { 
  (yyval.str) = mm_strdup("all");
@@ -33382,8 +32183,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 833:
-
-/* Line 1455 of yacc.c  */
 #line 5578 "preproc.y"
     { 
  (yyval.str) = mm_strdup("all privileges");
@@ -33391,8 +32190,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 834:
-
-/* Line 1455 of yacc.c  */
 #line 5582 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("all ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -33400,8 +32197,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 835:
-
-/* Line 1455 of yacc.c  */
 #line 5586 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("all privileges ("),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -33409,8 +32204,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 836:
-
-/* Line 1455 of yacc.c  */
 #line 5594 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -33418,8 +32211,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 837:
-
-/* Line 1455 of yacc.c  */
 #line 5598 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -33427,8 +32218,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 838:
-
-/* Line 1455 of yacc.c  */
 #line 5606 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("select"),(yyvsp[(2) - (2)].str));
@@ -33436,8 +32225,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 839:
-
-/* Line 1455 of yacc.c  */
 #line 5610 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("references"),(yyvsp[(2) - (2)].str));
@@ -33445,8 +32232,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 840:
-
-/* Line 1455 of yacc.c  */
 #line 5614 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("create"),(yyvsp[(2) - (2)].str));
@@ -33454,8 +32239,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 841:
-
-/* Line 1455 of yacc.c  */
 #line 5618 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -33463,8 +32246,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 842:
-
-/* Line 1455 of yacc.c  */
 #line 5626 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -33472,8 +32253,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 843:
-
-/* Line 1455 of yacc.c  */
 #line 5630 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("table"),(yyvsp[(2) - (2)].str));
@@ -33481,8 +32260,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 844:
-
-/* Line 1455 of yacc.c  */
 #line 5634 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("sequence"),(yyvsp[(2) - (2)].str));
@@ -33490,8 +32267,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 845:
-
-/* Line 1455 of yacc.c  */
 #line 5638 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("foreign data wrapper"),(yyvsp[(4) - (4)].str));
@@ -33499,8 +32274,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 846:
-
-/* Line 1455 of yacc.c  */
 #line 5642 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("foreign server"),(yyvsp[(3) - (3)].str));
@@ -33508,8 +32281,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 847:
-
-/* Line 1455 of yacc.c  */
 #line 5646 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("function"),(yyvsp[(2) - (2)].str));
@@ -33517,8 +32288,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 848:
-
-/* Line 1455 of yacc.c  */
 #line 5650 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("database"),(yyvsp[(2) - (2)].str));
@@ -33526,8 +32295,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 849:
-
-/* Line 1455 of yacc.c  */
 #line 5654 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("language"),(yyvsp[(2) - (2)].str));
@@ -33535,8 +32302,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 850:
-
-/* Line 1455 of yacc.c  */
 #line 5658 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("large object"),(yyvsp[(3) - (3)].str));
@@ -33544,8 +32309,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 851:
-
-/* Line 1455 of yacc.c  */
 #line 5662 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("schema"),(yyvsp[(2) - (2)].str));
@@ -33553,8 +32316,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 852:
-
-/* Line 1455 of yacc.c  */
 #line 5666 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("tablespace"),(yyvsp[(2) - (2)].str));
@@ -33562,8 +32323,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 853:
-
-/* Line 1455 of yacc.c  */
 #line 5670 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("all tables in schema"),(yyvsp[(5) - (5)].str));
@@ -33571,8 +32330,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 854:
-
-/* Line 1455 of yacc.c  */
 #line 5674 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("all sequences in schema"),(yyvsp[(5) - (5)].str));
@@ -33580,8 +32337,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 855:
-
-/* Line 1455 of yacc.c  */
 #line 5678 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("all functions in schema"),(yyvsp[(5) - (5)].str));
@@ -33589,8 +32344,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 856:
-
-/* Line 1455 of yacc.c  */
 #line 5686 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -33598,8 +32351,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 857:
-
-/* Line 1455 of yacc.c  */
 #line 5690 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -33607,8 +32358,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 858:
-
-/* Line 1455 of yacc.c  */
 #line 5698 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -33616,8 +32365,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 859:
-
-/* Line 1455 of yacc.c  */
 #line 5702 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("group"),(yyvsp[(2) - (2)].str));
@@ -33625,8 +32372,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 860:
-
-/* Line 1455 of yacc.c  */
 #line 5710 "preproc.y"
     { 
  (yyval.str) = mm_strdup("with grant option");
@@ -33634,16 +32379,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 861:
-
-/* Line 1455 of yacc.c  */
 #line 5714 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 862:
-
-/* Line 1455 of yacc.c  */
 #line 5721 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -33651,8 +32392,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 863:
-
-/* Line 1455 of yacc.c  */
 #line 5725 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -33660,8 +32399,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 864:
-
-/* Line 1455 of yacc.c  */
 #line 5733 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -33669,8 +32406,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 865:
-
-/* Line 1455 of yacc.c  */
 #line 5741 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("grant"),(yyvsp[(2) - (6)].str),mm_strdup("to"),(yyvsp[(4) - (6)].str),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -33678,8 +32413,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 866:
-
-/* Line 1455 of yacc.c  */
 #line 5749 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("revoke"),(yyvsp[(2) - (6)].str),mm_strdup("from"),(yyvsp[(4) - (6)].str),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -33687,8 +32420,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 867:
-
-/* Line 1455 of yacc.c  */
 #line 5753 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("revoke admin option for"),(yyvsp[(5) - (9)].str),mm_strdup("from"),(yyvsp[(7) - (9)].str),(yyvsp[(8) - (9)].str),(yyvsp[(9) - (9)].str));
@@ -33696,8 +32427,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 868:
-
-/* Line 1455 of yacc.c  */
 #line 5761 "preproc.y"
     { 
  (yyval.str) = mm_strdup("with admin option");
@@ -33705,16 +32434,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 869:
-
-/* Line 1455 of yacc.c  */
 #line 5765 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 870:
-
-/* Line 1455 of yacc.c  */
 #line 5772 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("granted by"),(yyvsp[(3) - (3)].str));
@@ -33722,16 +32447,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 871:
-
-/* Line 1455 of yacc.c  */
 #line 5776 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 872:
-
-/* Line 1455 of yacc.c  */
 #line 5783 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter default privileges"),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -33739,8 +32460,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 873:
-
-/* Line 1455 of yacc.c  */
 #line 5791 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -33748,16 +32467,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 874:
-
-/* Line 1455 of yacc.c  */
 #line 5795 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 875:
-
-/* Line 1455 of yacc.c  */
 #line 5802 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("in schema"),(yyvsp[(3) - (3)].str));
@@ -33765,8 +32480,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 876:
-
-/* Line 1455 of yacc.c  */
 #line 5806 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("for role"),(yyvsp[(3) - (3)].str));
@@ -33774,8 +32487,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 877:
-
-/* Line 1455 of yacc.c  */
 #line 5810 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("for user"),(yyvsp[(3) - (3)].str));
@@ -33783,8 +32494,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 878:
-
-/* Line 1455 of yacc.c  */
 #line 5818 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("grant"),(yyvsp[(2) - (7)].str),mm_strdup("on"),(yyvsp[(4) - (7)].str),mm_strdup("to"),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -33792,8 +32501,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 879:
-
-/* Line 1455 of yacc.c  */
 #line 5822 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("revoke"),(yyvsp[(2) - (7)].str),mm_strdup("on"),(yyvsp[(4) - (7)].str),mm_strdup("from"),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -33801,8 +32508,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 880:
-
-/* Line 1455 of yacc.c  */
 #line 5826 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("revoke grant option for"),(yyvsp[(5) - (10)].str),mm_strdup("on"),(yyvsp[(7) - (10)].str),mm_strdup("from"),(yyvsp[(9) - (10)].str),(yyvsp[(10) - (10)].str));
@@ -33810,8 +32515,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 881:
-
-/* Line 1455 of yacc.c  */
 #line 5834 "preproc.y"
     { 
  (yyval.str) = mm_strdup("tables");
@@ -33819,8 +32522,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 882:
-
-/* Line 1455 of yacc.c  */
 #line 5838 "preproc.y"
     { 
  (yyval.str) = mm_strdup("functions");
@@ -33828,8 +32529,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 883:
-
-/* Line 1455 of yacc.c  */
 #line 5842 "preproc.y"
     { 
  (yyval.str) = mm_strdup("sequences");
@@ -33837,8 +32536,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 884:
-
-/* Line 1455 of yacc.c  */
 #line 5850 "preproc.y"
     { 
  (yyval.str) = cat_str(14,mm_strdup("create"),(yyvsp[(2) - (14)].str),mm_strdup("index"),(yyvsp[(4) - (14)].str),(yyvsp[(5) - (14)].str),mm_strdup("on"),(yyvsp[(7) - (14)].str),(yyvsp[(8) - (14)].str),mm_strdup("("),(yyvsp[(10) - (14)].str),mm_strdup(")"),(yyvsp[(12) - (14)].str),(yyvsp[(13) - (14)].str),(yyvsp[(14) - (14)].str));
@@ -33846,8 +32543,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 885:
-
-/* Line 1455 of yacc.c  */
 #line 5858 "preproc.y"
     { 
  (yyval.str) = mm_strdup("unique");
@@ -33855,16 +32550,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 886:
-
-/* Line 1455 of yacc.c  */
 #line 5862 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 887:
-
-/* Line 1455 of yacc.c  */
 #line 5869 "preproc.y"
     { 
  (yyval.str) = mm_strdup("concurrently");
@@ -33872,16 +32563,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 888:
-
-/* Line 1455 of yacc.c  */
 #line 5873 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 889:
-
-/* Line 1455 of yacc.c  */
 #line 5880 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -33889,16 +32576,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 890:
-
-/* Line 1455 of yacc.c  */
 #line 5884 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 891:
-
-/* Line 1455 of yacc.c  */
 #line 5891 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[(2) - (2)].str));
@@ -33906,16 +32589,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 892:
-
-/* Line 1455 of yacc.c  */
 #line 5895 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 893:
-
-/* Line 1455 of yacc.c  */
 #line 5902 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -33923,8 +32602,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 894:
-
-/* Line 1455 of yacc.c  */
 #line 5906 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -33932,8 +32609,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 895:
-
-/* Line 1455 of yacc.c  */
 #line 5914 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -33941,8 +32616,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 896:
-
-/* Line 1455 of yacc.c  */
 #line 5918 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -33950,8 +32623,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 897:
-
-/* Line 1455 of yacc.c  */
 #line 5922 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("("),(yyvsp[(2) - (7)].str),mm_strdup(")"),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -33959,8 +32630,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 898:
-
-/* Line 1455 of yacc.c  */
 #line 5930 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("collate"),(yyvsp[(2) - (2)].str));
@@ -33968,16 +32637,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 899:
-
-/* Line 1455 of yacc.c  */
 #line 5934 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 900:
-
-/* Line 1455 of yacc.c  */
 #line 5941 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -33985,8 +32650,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 901:
-
-/* Line 1455 of yacc.c  */
 #line 5945 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[(2) - (2)].str));
@@ -33994,16 +32657,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 902:
-
-/* Line 1455 of yacc.c  */
 #line 5949 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 903:
-
-/* Line 1455 of yacc.c  */
 #line 5956 "preproc.y"
     { 
  (yyval.str) = mm_strdup("asc");
@@ -34011,8 +32670,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 904:
-
-/* Line 1455 of yacc.c  */
 #line 5960 "preproc.y"
     { 
  (yyval.str) = mm_strdup("desc");
@@ -34020,16 +32677,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 905:
-
-/* Line 1455 of yacc.c  */
 #line 5964 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 906:
-
-/* Line 1455 of yacc.c  */
 #line 5971 "preproc.y"
     { 
  (yyval.str) = mm_strdup("nulls first");
@@ -34037,8 +32690,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 907:
-
-/* Line 1455 of yacc.c  */
 #line 5975 "preproc.y"
     { 
  (yyval.str) = mm_strdup("nulls last");
@@ -34046,16 +32697,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 908:
-
-/* Line 1455 of yacc.c  */
 #line 5979 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 909:
-
-/* Line 1455 of yacc.c  */
 #line 5986 "preproc.y"
     { 
  (yyval.str) = cat_str(9,mm_strdup("create"),(yyvsp[(2) - (9)].str),mm_strdup("function"),(yyvsp[(4) - (9)].str),(yyvsp[(5) - (9)].str),mm_strdup("returns"),(yyvsp[(7) - (9)].str),(yyvsp[(8) - (9)].str),(yyvsp[(9) - (9)].str));
@@ -34063,8 +32710,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 910:
-
-/* Line 1455 of yacc.c  */
 #line 5990 "preproc.y"
     { 
  (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[(2) - (12)].str),mm_strdup("function"),(yyvsp[(4) - (12)].str),(yyvsp[(5) - (12)].str),mm_strdup("returns table ("),(yyvsp[(9) - (12)].str),mm_strdup(")"),(yyvsp[(11) - (12)].str),(yyvsp[(12) - (12)].str));
@@ -34072,8 +32717,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 911:
-
-/* Line 1455 of yacc.c  */
 #line 5994 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("create"),(yyvsp[(2) - (7)].str),mm_strdup("function"),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -34081,8 +32724,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 912:
-
-/* Line 1455 of yacc.c  */
 #line 6002 "preproc.y"
     { 
  (yyval.str) = mm_strdup("or replace");
@@ -34090,16 +32731,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 913:
-
-/* Line 1455 of yacc.c  */
 #line 6006 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 914:
-
-/* Line 1455 of yacc.c  */
 #line 6013 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -34107,8 +32744,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 915:
-
-/* Line 1455 of yacc.c  */
 #line 6017 "preproc.y"
     { 
  (yyval.str) = mm_strdup("( )");
@@ -34116,8 +32751,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 916:
-
-/* Line 1455 of yacc.c  */
 #line 6025 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34125,8 +32758,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 917:
-
-/* Line 1455 of yacc.c  */
 #line 6029 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -34134,8 +32765,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 918:
-
-/* Line 1455 of yacc.c  */
 #line 6037 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -34143,8 +32772,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 919:
-
-/* Line 1455 of yacc.c  */
 #line 6041 "preproc.y"
     { 
  (yyval.str) = mm_strdup("( )");
@@ -34152,8 +32779,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 920:
-
-/* Line 1455 of yacc.c  */
 #line 6049 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34161,8 +32786,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 921:
-
-/* Line 1455 of yacc.c  */
 #line 6053 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -34170,8 +32793,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 922:
-
-/* Line 1455 of yacc.c  */
 #line 6061 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -34179,8 +32800,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 923:
-
-/* Line 1455 of yacc.c  */
 #line 6065 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -34188,8 +32807,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 924:
-
-/* Line 1455 of yacc.c  */
 #line 6069 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -34197,8 +32814,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 925:
-
-/* Line 1455 of yacc.c  */
 #line 6073 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -34206,8 +32821,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 926:
-
-/* Line 1455 of yacc.c  */
 #line 6077 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34215,8 +32828,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 927:
-
-/* Line 1455 of yacc.c  */
 #line 6085 "preproc.y"
     { 
  (yyval.str) = mm_strdup("in");
@@ -34224,8 +32835,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 928:
-
-/* Line 1455 of yacc.c  */
 #line 6089 "preproc.y"
     { 
  (yyval.str) = mm_strdup("out");
@@ -34233,8 +32842,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 929:
-
-/* Line 1455 of yacc.c  */
 #line 6093 "preproc.y"
     { 
  (yyval.str) = mm_strdup("inout");
@@ -34242,8 +32849,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 930:
-
-/* Line 1455 of yacc.c  */
 #line 6097 "preproc.y"
     { 
  (yyval.str) = mm_strdup("in out");
@@ -34251,8 +32856,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 931:
-
-/* Line 1455 of yacc.c  */
 #line 6101 "preproc.y"
     { 
  (yyval.str) = mm_strdup("variadic");
@@ -34260,8 +32863,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 932:
-
-/* Line 1455 of yacc.c  */
 #line 6109 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34269,8 +32870,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 933:
-
-/* Line 1455 of yacc.c  */
 #line 6117 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34278,8 +32877,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 934:
-
-/* Line 1455 of yacc.c  */
 #line 6125 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34287,8 +32884,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 935:
-
-/* Line 1455 of yacc.c  */
 #line 6129 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (4)].str),(yyvsp[(2) - (4)].str),mm_strdup("% type"));
@@ -34296,8 +32891,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 936:
-
-/* Line 1455 of yacc.c  */
 #line 6133 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("setof"),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),mm_strdup("% type"));
@@ -34305,8 +32898,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 937:
-
-/* Line 1455 of yacc.c  */
 #line 6141 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34314,8 +32905,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 938:
-
-/* Line 1455 of yacc.c  */
 #line 6145 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("default"),(yyvsp[(3) - (3)].str));
@@ -34323,8 +32912,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 939:
-
-/* Line 1455 of yacc.c  */
 #line 6149 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("="),(yyvsp[(3) - (3)].str));
@@ -34332,8 +32919,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 940:
-
-/* Line 1455 of yacc.c  */
 #line 6157 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34341,8 +32926,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 941:
-
-/* Line 1455 of yacc.c  */
 #line 6161 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -34350,8 +32933,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 942:
-
-/* Line 1455 of yacc.c  */
 #line 6169 "preproc.y"
     { 
  (yyval.str) = mm_strdup("called on null input");
@@ -34359,8 +32940,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 943:
-
-/* Line 1455 of yacc.c  */
 #line 6173 "preproc.y"
     { 
  (yyval.str) = mm_strdup("returns null on null input");
@@ -34368,8 +32947,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 944:
-
-/* Line 1455 of yacc.c  */
 #line 6177 "preproc.y"
     { 
  (yyval.str) = mm_strdup("strict");
@@ -34377,8 +32954,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 945:
-
-/* Line 1455 of yacc.c  */
 #line 6181 "preproc.y"
     { 
  (yyval.str) = mm_strdup("immutable");
@@ -34386,8 +32961,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 946:
-
-/* Line 1455 of yacc.c  */
 #line 6185 "preproc.y"
     { 
  (yyval.str) = mm_strdup("stable");
@@ -34395,8 +32968,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 947:
-
-/* Line 1455 of yacc.c  */
 #line 6189 "preproc.y"
     { 
  (yyval.str) = mm_strdup("volatile");
@@ -34404,8 +32975,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 948:
-
-/* Line 1455 of yacc.c  */
 #line 6193 "preproc.y"
     { 
  (yyval.str) = mm_strdup("external security definer");
@@ -34413,8 +32982,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 949:
-
-/* Line 1455 of yacc.c  */
 #line 6197 "preproc.y"
     { 
  (yyval.str) = mm_strdup("external security invoker");
@@ -34422,8 +32989,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 950:
-
-/* Line 1455 of yacc.c  */
 #line 6201 "preproc.y"
     { 
  (yyval.str) = mm_strdup("security definer");
@@ -34431,8 +32996,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 951:
-
-/* Line 1455 of yacc.c  */
 #line 6205 "preproc.y"
     { 
  (yyval.str) = mm_strdup("security invoker");
@@ -34440,8 +33003,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 952:
-
-/* Line 1455 of yacc.c  */
 #line 6209 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("cost"),(yyvsp[(2) - (2)].str));
@@ -34449,8 +33010,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 953:
-
-/* Line 1455 of yacc.c  */
 #line 6213 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("rows"),(yyvsp[(2) - (2)].str));
@@ -34458,8 +33017,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 954:
-
-/* Line 1455 of yacc.c  */
 #line 6217 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34467,8 +33024,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 955:
-
-/* Line 1455 of yacc.c  */
 #line 6225 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("as"),(yyvsp[(2) - (2)].str));
@@ -34476,8 +33031,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 956:
-
-/* Line 1455 of yacc.c  */
 #line 6229 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("language"),(yyvsp[(2) - (2)].str));
@@ -34485,8 +33038,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 957:
-
-/* Line 1455 of yacc.c  */
 #line 6233 "preproc.y"
     { 
  (yyval.str) = mm_strdup("window");
@@ -34494,8 +33045,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 958:
-
-/* Line 1455 of yacc.c  */
 #line 6237 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34503,8 +33052,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 959:
-
-/* Line 1455 of yacc.c  */
 #line 6245 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34512,8 +33059,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 960:
-
-/* Line 1455 of yacc.c  */
 #line 6249 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -34521,8 +33066,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 961:
-
-/* Line 1455 of yacc.c  */
 #line 6257 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[(2) - (2)].str));
@@ -34530,16 +33073,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 962:
-
-/* Line 1455 of yacc.c  */
 #line 6261 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 963:
-
-/* Line 1455 of yacc.c  */
 #line 6268 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -34547,8 +33086,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 964:
-
-/* Line 1455 of yacc.c  */
 #line 6276 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34556,8 +33093,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 965:
-
-/* Line 1455 of yacc.c  */
 #line 6280 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -34565,8 +33100,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 966:
-
-/* Line 1455 of yacc.c  */
 #line 6288 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -34574,8 +33107,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 967:
-
-/* Line 1455 of yacc.c  */
 #line 6296 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34583,8 +33114,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 968:
-
-/* Line 1455 of yacc.c  */
 #line 6300 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -34592,8 +33121,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 969:
-
-/* Line 1455 of yacc.c  */
 #line 6308 "preproc.y"
     { 
  (yyval.str) = mm_strdup("restrict");
@@ -34601,16 +33128,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 970:
-
-/* Line 1455 of yacc.c  */
 #line 6312 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 971:
-
-/* Line 1455 of yacc.c  */
 #line 6319 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("drop function"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -34618,8 +33141,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 972:
-
-/* Line 1455 of yacc.c  */
 #line 6323 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("drop function if exists"),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -34627,8 +33148,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 973:
-
-/* Line 1455 of yacc.c  */
 #line 6331 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("drop aggregate"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -34636,8 +33155,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 974:
-
-/* Line 1455 of yacc.c  */
 #line 6335 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("drop aggregate if exists"),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -34645,8 +33162,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 975:
-
-/* Line 1455 of yacc.c  */
 #line 6343 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("drop operator"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -34654,8 +33169,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 976:
-
-/* Line 1455 of yacc.c  */
 #line 6347 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("drop operator if exists"),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -34663,8 +33176,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 977:
-
-/* Line 1455 of yacc.c  */
 #line 6355 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -34672,8 +33183,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 978:
-
-/* Line 1455 of yacc.c  */
 #line 6359 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[(2) - (5)].str),mm_strdup(","),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -34681,8 +33190,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 979:
-
-/* Line 1455 of yacc.c  */
 #line 6363 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("( none ,"),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -34690,8 +33197,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 980:
-
-/* Line 1455 of yacc.c  */
 #line 6367 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (5)].str),mm_strdup(", none )"));
@@ -34699,8 +33204,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 981:
-
-/* Line 1455 of yacc.c  */
 #line 6375 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34708,8 +33211,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 982:
-
-/* Line 1455 of yacc.c  */
 #line 6379 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("."),(yyvsp[(3) - (3)].str));
@@ -34717,8 +33218,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 983:
-
-/* Line 1455 of yacc.c  */
 #line 6387 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("do"),(yyvsp[(2) - (2)].str));
@@ -34726,8 +33225,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 984:
-
-/* Line 1455 of yacc.c  */
 #line 6395 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34735,8 +33232,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 985:
-
-/* Line 1455 of yacc.c  */
 #line 6399 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -34744,8 +33239,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 986:
-
-/* Line 1455 of yacc.c  */
 #line 6407 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -34753,8 +33246,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 987:
-
-/* Line 1455 of yacc.c  */
 #line 6411 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("language"),(yyvsp[(2) - (2)].str));
@@ -34762,8 +33253,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 988:
-
-/* Line 1455 of yacc.c  */
 #line 6419 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("create cast ("),(yyvsp[(4) - (11)].str),mm_strdup("as"),(yyvsp[(6) - (11)].str),mm_strdup(") with function"),(yyvsp[(10) - (11)].str),(yyvsp[(11) - (11)].str));
@@ -34771,8 +33260,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 989:
-
-/* Line 1455 of yacc.c  */
 #line 6423 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("create cast ("),(yyvsp[(4) - (10)].str),mm_strdup("as"),(yyvsp[(6) - (10)].str),mm_strdup(") without function"),(yyvsp[(10) - (10)].str));
@@ -34780,8 +33267,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 990:
-
-/* Line 1455 of yacc.c  */
 #line 6427 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("create cast ("),(yyvsp[(4) - (10)].str),mm_strdup("as"),(yyvsp[(6) - (10)].str),mm_strdup(") with inout"),(yyvsp[(10) - (10)].str));
@@ -34789,8 +33274,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 991:
-
-/* Line 1455 of yacc.c  */
 #line 6435 "preproc.y"
     { 
  (yyval.str) = mm_strdup("as implicit");
@@ -34798,8 +33281,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 992:
-
-/* Line 1455 of yacc.c  */
 #line 6439 "preproc.y"
     { 
  (yyval.str) = mm_strdup("as assignment");
@@ -34807,16 +33288,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 993:
-
-/* Line 1455 of yacc.c  */
 #line 6443 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 994:
-
-/* Line 1455 of yacc.c  */
 #line 6450 "preproc.y"
     { 
  (yyval.str) = cat_str(8,mm_strdup("drop cast"),(yyvsp[(3) - (9)].str),mm_strdup("("),(yyvsp[(5) - (9)].str),mm_strdup("as"),(yyvsp[(7) - (9)].str),mm_strdup(")"),(yyvsp[(9) - (9)].str));
@@ -34824,8 +33301,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 995:
-
-/* Line 1455 of yacc.c  */
 #line 6458 "preproc.y"
     { 
  (yyval.str) = mm_strdup("if exists");
@@ -34833,16 +33308,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 996:
-
-/* Line 1455 of yacc.c  */
 #line 6462 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 997:
-
-/* Line 1455 of yacc.c  */
 #line 6469 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("reindex"),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -34850,8 +33321,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 998:
-
-/* Line 1455 of yacc.c  */
 #line 6473 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("reindex system"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -34859,8 +33328,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 999:
-
-/* Line 1455 of yacc.c  */
 #line 6477 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("reindex database"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -34868,8 +33335,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1000:
-
-/* Line 1455 of yacc.c  */
 #line 6485 "preproc.y"
     { 
  (yyval.str) = mm_strdup("index");
@@ -34877,8 +33342,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1001:
-
-/* Line 1455 of yacc.c  */
 #line 6489 "preproc.y"
     { 
  (yyval.str) = mm_strdup("table");
@@ -34886,8 +33349,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1002:
-
-/* Line 1455 of yacc.c  */
 #line 6497 "preproc.y"
     { 
  (yyval.str) = mm_strdup("force");
@@ -34895,16 +33356,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1003:
-
-/* Line 1455 of yacc.c  */
 #line 6501 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1004:
-
-/* Line 1455 of yacc.c  */
 #line 6508 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter aggregate"),(yyvsp[(3) - (7)].str),(yyvsp[(4) - (7)].str),mm_strdup("rename to"),(yyvsp[(7) - (7)].str));
@@ -34912,8 +33369,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1005:
-
-/* Line 1455 of yacc.c  */
 #line 6512 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter collation"),(yyvsp[(3) - (6)].str),mm_strdup("rename to"),(yyvsp[(6) - (6)].str));
@@ -34921,8 +33376,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1006:
-
-/* Line 1455 of yacc.c  */
 #line 6516 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter conversion"),(yyvsp[(3) - (6)].str),mm_strdup("rename to"),(yyvsp[(6) - (6)].str));
@@ -34930,8 +33383,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1007:
-
-/* Line 1455 of yacc.c  */
 #line 6520 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[(3) - (6)].str),mm_strdup("rename to"),(yyvsp[(6) - (6)].str));
@@ -34939,8 +33390,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1008:
-
-/* Line 1455 of yacc.c  */
 #line 6524 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[(3) - (6)].str),mm_strdup("rename to"),(yyvsp[(6) - (6)].str));
@@ -34948,8 +33397,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1009:
-
-/* Line 1455 of yacc.c  */
 #line 6528 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter group"),(yyvsp[(3) - (6)].str),mm_strdup("rename to"),(yyvsp[(6) - (6)].str));
@@ -34957,8 +33404,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1010:
-
-/* Line 1455 of yacc.c  */
 #line 6532 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter"),(yyvsp[(2) - (7)].str),mm_strdup("language"),(yyvsp[(4) - (7)].str),mm_strdup("rename to"),(yyvsp[(7) - (7)].str));
@@ -34966,8 +33411,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1011:
-
-/* Line 1455 of yacc.c  */
 #line 6536 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator class"),(yyvsp[(4) - (9)].str),mm_strdup("using"),(yyvsp[(6) - (9)].str),mm_strdup("rename to"),(yyvsp[(9) - (9)].str));
@@ -34975,8 +33418,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1012:
-
-/* Line 1455 of yacc.c  */
 #line 6540 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[(4) - (9)].str),mm_strdup("using"),(yyvsp[(6) - (9)].str),mm_strdup("rename to"),(yyvsp[(9) - (9)].str));
@@ -34984,8 +33425,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1013:
-
-/* Line 1455 of yacc.c  */
 #line 6544 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter schema"),(yyvsp[(3) - (6)].str),mm_strdup("rename to"),(yyvsp[(6) - (6)].str));
@@ -34993,8 +33432,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1014:
-
-/* Line 1455 of yacc.c  */
 #line 6548 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter table"),(yyvsp[(3) - (6)].str),mm_strdup("rename to"),(yyvsp[(6) - (6)].str));
@@ -35002,8 +33439,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1015:
-
-/* Line 1455 of yacc.c  */
 #line 6552 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter sequence"),(yyvsp[(3) - (6)].str),mm_strdup("rename to"),(yyvsp[(6) - (6)].str));
@@ -35011,8 +33446,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1016:
-
-/* Line 1455 of yacc.c  */
 #line 6556 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter view"),(yyvsp[(3) - (6)].str),mm_strdup("rename to"),(yyvsp[(6) - (6)].str));
@@ -35020,8 +33453,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1017:
-
-/* Line 1455 of yacc.c  */
 #line 6560 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter index"),(yyvsp[(3) - (6)].str),mm_strdup("rename to"),(yyvsp[(6) - (6)].str));
@@ -35029,8 +33460,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1018:
-
-/* Line 1455 of yacc.c  */
 #line 6564 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter foreign table"),(yyvsp[(4) - (7)].str),mm_strdup("rename to"),(yyvsp[(7) - (7)].str));
@@ -35038,8 +33467,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1019:
-
-/* Line 1455 of yacc.c  */
 #line 6568 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("alter table"),(yyvsp[(3) - (8)].str),mm_strdup("rename"),(yyvsp[(5) - (8)].str),(yyvsp[(6) - (8)].str),mm_strdup("to"),(yyvsp[(8) - (8)].str));
@@ -35047,8 +33474,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1020:
-
-/* Line 1455 of yacc.c  */
 #line 6572 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("alter foreign table"),(yyvsp[(4) - (9)].str),mm_strdup("rename"),(yyvsp[(6) - (9)].str),(yyvsp[(7) - (9)].str),mm_strdup("to"),(yyvsp[(9) - (9)].str));
@@ -35056,8 +33481,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1021:
-
-/* Line 1455 of yacc.c  */
 #line 6576 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter trigger"),(yyvsp[(3) - (8)].str),mm_strdup("on"),(yyvsp[(5) - (8)].str),mm_strdup("rename to"),(yyvsp[(8) - (8)].str));
@@ -35065,8 +33488,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1022:
-
-/* Line 1455 of yacc.c  */
 #line 6580 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter role"),(yyvsp[(3) - (6)].str),mm_strdup("rename to"),(yyvsp[(6) - (6)].str));
@@ -35074,8 +33495,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1023:
-
-/* Line 1455 of yacc.c  */
 #line 6584 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter user"),(yyvsp[(3) - (6)].str),mm_strdup("rename to"),(yyvsp[(6) - (6)].str));
@@ -35083,8 +33502,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1024:
-
-/* Line 1455 of yacc.c  */
 #line 6588 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[(3) - (6)].str),mm_strdup("rename to"),(yyvsp[(6) - (6)].str));
@@ -35092,8 +33509,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1025:
-
-/* Line 1455 of yacc.c  */
 #line 6592 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[(3) - (5)].str),mm_strdup("set"),(yyvsp[(5) - (5)].str));
@@ -35101,8 +33516,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1026:
-
-/* Line 1455 of yacc.c  */
 #line 6596 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[(3) - (5)].str),mm_strdup("reset"),(yyvsp[(5) - (5)].str));
@@ -35110,8 +33523,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1027:
-
-/* Line 1455 of yacc.c  */
 #line 6600 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search parser"),(yyvsp[(5) - (8)].str),mm_strdup("rename to"),(yyvsp[(8) - (8)].str));
@@ -35119,8 +33530,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1028:
-
-/* Line 1455 of yacc.c  */
 #line 6604 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search dictionary"),(yyvsp[(5) - (8)].str),mm_strdup("rename to"),(yyvsp[(8) - (8)].str));
@@ -35128,8 +33537,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1029:
-
-/* Line 1455 of yacc.c  */
 #line 6608 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search template"),(yyvsp[(5) - (8)].str),mm_strdup("rename to"),(yyvsp[(8) - (8)].str));
@@ -35137,8 +33544,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1030:
-
-/* Line 1455 of yacc.c  */
 #line 6612 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[(5) - (8)].str),mm_strdup("rename to"),(yyvsp[(8) - (8)].str));
@@ -35146,8 +33551,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1031:
-
-/* Line 1455 of yacc.c  */
 #line 6616 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter type"),(yyvsp[(3) - (6)].str),mm_strdup("rename to"),(yyvsp[(6) - (6)].str));
@@ -35155,8 +33558,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1032:
-
-/* Line 1455 of yacc.c  */
 #line 6620 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("alter type"),(yyvsp[(3) - (9)].str),mm_strdup("rename attribute"),(yyvsp[(6) - (9)].str),mm_strdup("to"),(yyvsp[(8) - (9)].str),(yyvsp[(9) - (9)].str));
@@ -35164,8 +33565,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1033:
-
-/* Line 1455 of yacc.c  */
 #line 6628 "preproc.y"
     { 
  (yyval.str) = mm_strdup("column");
@@ -35173,16 +33572,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1034:
-
-/* Line 1455 of yacc.c  */
 #line 6632 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1035:
-
-/* Line 1455 of yacc.c  */
 #line 6639 "preproc.y"
     { 
  (yyval.str) = mm_strdup("set data");
@@ -35190,16 +33585,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1036:
-
-/* Line 1455 of yacc.c  */
 #line 6643 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1037:
-
-/* Line 1455 of yacc.c  */
 #line 6650 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter aggregate"),(yyvsp[(3) - (7)].str),(yyvsp[(4) - (7)].str),mm_strdup("set schema"),(yyvsp[(7) - (7)].str));
@@ -35207,8 +33598,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1038:
-
-/* Line 1455 of yacc.c  */
 #line 6654 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter collation"),(yyvsp[(3) - (6)].str),mm_strdup("set schema"),(yyvsp[(6) - (6)].str));
@@ -35216,8 +33605,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1039:
-
-/* Line 1455 of yacc.c  */
 #line 6658 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter conversion"),(yyvsp[(3) - (6)].str),mm_strdup("set schema"),(yyvsp[(6) - (6)].str));
@@ -35225,8 +33612,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1040:
-
-/* Line 1455 of yacc.c  */
 #line 6662 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[(3) - (6)].str),mm_strdup("set schema"),(yyvsp[(6) - (6)].str));
@@ -35234,8 +33619,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1041:
-
-/* Line 1455 of yacc.c  */
 #line 6666 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter extension"),(yyvsp[(3) - (6)].str),mm_strdup("set schema"),(yyvsp[(6) - (6)].str));
@@ -35243,8 +33626,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1042:
-
-/* Line 1455 of yacc.c  */
 #line 6670 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[(3) - (6)].str),mm_strdup("set schema"),(yyvsp[(6) - (6)].str));
@@ -35252,8 +33633,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1043:
-
-/* Line 1455 of yacc.c  */
 #line 6674 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter operator"),(yyvsp[(3) - (7)].str),(yyvsp[(4) - (7)].str),mm_strdup("set schema"),(yyvsp[(7) - (7)].str));
@@ -35261,8 +33640,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1044:
-
-/* Line 1455 of yacc.c  */
 #line 6678 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator class"),(yyvsp[(4) - (9)].str),mm_strdup("using"),(yyvsp[(6) - (9)].str),mm_strdup("set schema"),(yyvsp[(9) - (9)].str));
@@ -35270,8 +33647,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1045:
-
-/* Line 1455 of yacc.c  */
 #line 6682 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[(4) - (9)].str),mm_strdup("using"),(yyvsp[(6) - (9)].str),mm_strdup("set schema"),(yyvsp[(9) - (9)].str));
@@ -35279,8 +33654,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1046:
-
-/* Line 1455 of yacc.c  */
 #line 6686 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter table"),(yyvsp[(3) - (6)].str),mm_strdup("set schema"),(yyvsp[(6) - (6)].str));
@@ -35288,8 +33661,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1047:
-
-/* Line 1455 of yacc.c  */
 #line 6690 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search parser"),(yyvsp[(5) - (8)].str),mm_strdup("set schema"),(yyvsp[(8) - (8)].str));
@@ -35297,8 +33668,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1048:
-
-/* Line 1455 of yacc.c  */
 #line 6694 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search dictionary"),(yyvsp[(5) - (8)].str),mm_strdup("set schema"),(yyvsp[(8) - (8)].str));
@@ -35306,8 +33675,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1049:
-
-/* Line 1455 of yacc.c  */
 #line 6698 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search template"),(yyvsp[(5) - (8)].str),mm_strdup("set schema"),(yyvsp[(8) - (8)].str));
@@ -35315,8 +33682,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1050:
-
-/* Line 1455 of yacc.c  */
 #line 6702 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[(5) - (8)].str),mm_strdup("set schema"),(yyvsp[(8) - (8)].str));
@@ -35324,8 +33689,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1051:
-
-/* Line 1455 of yacc.c  */
 #line 6706 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter sequence"),(yyvsp[(3) - (6)].str),mm_strdup("set schema"),(yyvsp[(6) - (6)].str));
@@ -35333,8 +33696,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1052:
-
-/* Line 1455 of yacc.c  */
 #line 6710 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter view"),(yyvsp[(3) - (6)].str),mm_strdup("set schema"),(yyvsp[(6) - (6)].str));
@@ -35342,8 +33703,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1053:
-
-/* Line 1455 of yacc.c  */
 #line 6714 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter foreign table"),(yyvsp[(4) - (7)].str),mm_strdup("set schema"),(yyvsp[(7) - (7)].str));
@@ -35351,8 +33710,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1054:
-
-/* Line 1455 of yacc.c  */
 #line 6718 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter type"),(yyvsp[(3) - (6)].str),mm_strdup("set schema"),(yyvsp[(6) - (6)].str));
@@ -35360,8 +33717,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1055:
-
-/* Line 1455 of yacc.c  */
 #line 6726 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter aggregate"),(yyvsp[(3) - (7)].str),(yyvsp[(4) - (7)].str),mm_strdup("owner to"),(yyvsp[(7) - (7)].str));
@@ -35369,8 +33724,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1056:
-
-/* Line 1455 of yacc.c  */
 #line 6730 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter collation"),(yyvsp[(3) - (6)].str),mm_strdup("owner to"),(yyvsp[(6) - (6)].str));
@@ -35378,8 +33731,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1057:
-
-/* Line 1455 of yacc.c  */
 #line 6734 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter conversion"),(yyvsp[(3) - (6)].str),mm_strdup("owner to"),(yyvsp[(6) - (6)].str));
@@ -35387,8 +33738,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1058:
-
-/* Line 1455 of yacc.c  */
 #line 6738 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[(3) - (6)].str),mm_strdup("owner to"),(yyvsp[(6) - (6)].str));
@@ -35396,8 +33745,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1059:
-
-/* Line 1455 of yacc.c  */
 #line 6742 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[(3) - (6)].str),mm_strdup("owner to"),(yyvsp[(6) - (6)].str));
@@ -35405,8 +33752,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1060:
-
-/* Line 1455 of yacc.c  */
 #line 6746 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter function"),(yyvsp[(3) - (6)].str),mm_strdup("owner to"),(yyvsp[(6) - (6)].str));
@@ -35414,8 +33759,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1061:
-
-/* Line 1455 of yacc.c  */
 #line 6750 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter"),(yyvsp[(2) - (7)].str),mm_strdup("language"),(yyvsp[(4) - (7)].str),mm_strdup("owner to"),(yyvsp[(7) - (7)].str));
@@ -35423,8 +33766,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1062:
-
-/* Line 1455 of yacc.c  */
 #line 6754 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter large object"),(yyvsp[(4) - (7)].str),mm_strdup("owner to"),(yyvsp[(7) - (7)].str));
@@ -35432,8 +33773,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1063:
-
-/* Line 1455 of yacc.c  */
 #line 6758 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter operator"),(yyvsp[(3) - (7)].str),(yyvsp[(4) - (7)].str),mm_strdup("owner to"),(yyvsp[(7) - (7)].str));
@@ -35441,8 +33780,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1064:
-
-/* Line 1455 of yacc.c  */
 #line 6762 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator class"),(yyvsp[(4) - (9)].str),mm_strdup("using"),(yyvsp[(6) - (9)].str),mm_strdup("owner to"),(yyvsp[(9) - (9)].str));
@@ -35450,8 +33787,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1065:
-
-/* Line 1455 of yacc.c  */
 #line 6766 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter operator family"),(yyvsp[(4) - (9)].str),mm_strdup("using"),(yyvsp[(6) - (9)].str),mm_strdup("owner to"),(yyvsp[(9) - (9)].str));
@@ -35459,8 +33794,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1066:
-
-/* Line 1455 of yacc.c  */
 #line 6770 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter schema"),(yyvsp[(3) - (6)].str),mm_strdup("owner to"),(yyvsp[(6) - (6)].str));
@@ -35468,8 +33801,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1067:
-
-/* Line 1455 of yacc.c  */
 #line 6774 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter type"),(yyvsp[(3) - (6)].str),mm_strdup("owner to"),(yyvsp[(6) - (6)].str));
@@ -35477,8 +33808,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1068:
-
-/* Line 1455 of yacc.c  */
 #line 6778 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter tablespace"),(yyvsp[(3) - (6)].str),mm_strdup("owner to"),(yyvsp[(6) - (6)].str));
@@ -35486,8 +33815,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1069:
-
-/* Line 1455 of yacc.c  */
 #line 6782 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search dictionary"),(yyvsp[(5) - (8)].str),mm_strdup("owner to"),(yyvsp[(8) - (8)].str));
@@ -35495,8 +33822,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1070:
-
-/* Line 1455 of yacc.c  */
 #line 6786 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[(5) - (8)].str),mm_strdup("owner to"),(yyvsp[(8) - (8)].str));
@@ -35504,8 +33829,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1071:
-
-/* Line 1455 of yacc.c  */
 #line 6790 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter foreign data wrapper"),(yyvsp[(5) - (8)].str),mm_strdup("owner to"),(yyvsp[(8) - (8)].str));
@@ -35513,8 +33836,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1072:
-
-/* Line 1455 of yacc.c  */
 #line 6794 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter server"),(yyvsp[(3) - (6)].str),mm_strdup("owner to"),(yyvsp[(6) - (6)].str));
@@ -35522,8 +33843,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1073:
-
-/* Line 1455 of yacc.c  */
 #line 6802 "preproc.y"
     { 
  (yyval.str) = cat_str(12,mm_strdup("create"),(yyvsp[(2) - (13)].str),mm_strdup("rule"),(yyvsp[(4) - (13)].str),mm_strdup("as on"),(yyvsp[(7) - (13)].str),mm_strdup("to"),(yyvsp[(9) - (13)].str),(yyvsp[(10) - (13)].str),mm_strdup("do"),(yyvsp[(12) - (13)].str),(yyvsp[(13) - (13)].str));
@@ -35531,8 +33850,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1074:
-
-/* Line 1455 of yacc.c  */
 #line 6810 "preproc.y"
     { 
  (yyval.str) = mm_strdup("nothing");
@@ -35540,8 +33857,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1075:
-
-/* Line 1455 of yacc.c  */
 #line 6814 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -35549,8 +33864,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1076:
-
-/* Line 1455 of yacc.c  */
 #line 6818 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -35558,8 +33871,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1077:
-
-/* Line 1455 of yacc.c  */
 #line 6826 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(";"),(yyvsp[(3) - (3)].str));
@@ -35567,8 +33878,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1078:
-
-/* Line 1455 of yacc.c  */
 #line 6830 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -35576,8 +33885,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1079:
-
-/* Line 1455 of yacc.c  */
 #line 6838 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -35585,8 +33892,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1080:
-
-/* Line 1455 of yacc.c  */
 #line 6842 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -35594,8 +33899,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1081:
-
-/* Line 1455 of yacc.c  */
 #line 6846 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -35603,8 +33906,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1082:
-
-/* Line 1455 of yacc.c  */
 #line 6850 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -35612,8 +33913,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1083:
-
-/* Line 1455 of yacc.c  */
 #line 6854 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -35621,8 +33920,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1084:
-
-/* Line 1455 of yacc.c  */
 #line 6862 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -35630,16 +33927,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1085:
-
-/* Line 1455 of yacc.c  */
 #line 6866 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1086:
-
-/* Line 1455 of yacc.c  */
 #line 6873 "preproc.y"
     { 
  (yyval.str) = mm_strdup("select");
@@ -35647,8 +33940,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1087:
-
-/* Line 1455 of yacc.c  */
 #line 6877 "preproc.y"
     { 
  (yyval.str) = mm_strdup("update");
@@ -35656,8 +33947,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1088:
-
-/* Line 1455 of yacc.c  */
 #line 6881 "preproc.y"
     { 
  (yyval.str) = mm_strdup("delete");
@@ -35665,8 +33954,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1089:
-
-/* Line 1455 of yacc.c  */
 #line 6885 "preproc.y"
     { 
  (yyval.str) = mm_strdup("insert");
@@ -35674,8 +33961,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1090:
-
-/* Line 1455 of yacc.c  */
 #line 6893 "preproc.y"
     { 
  (yyval.str) = mm_strdup("instead");
@@ -35683,8 +33968,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1091:
-
-/* Line 1455 of yacc.c  */
 #line 6897 "preproc.y"
     { 
  (yyval.str) = mm_strdup("also");
@@ -35692,16 +33975,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1092:
-
-/* Line 1455 of yacc.c  */
 #line 6901 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1093:
-
-/* Line 1455 of yacc.c  */
 #line 6908 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("drop rule"),(yyvsp[(3) - (6)].str),mm_strdup("on"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -35709,8 +33988,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1094:
-
-/* Line 1455 of yacc.c  */
 #line 6912 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("drop rule if exists"),(yyvsp[(5) - (8)].str),mm_strdup("on"),(yyvsp[(7) - (8)].str),(yyvsp[(8) - (8)].str));
@@ -35718,8 +33995,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1095:
-
-/* Line 1455 of yacc.c  */
 #line 6920 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("notify"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -35727,8 +34002,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1096:
-
-/* Line 1455 of yacc.c  */
 #line 6928 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup(","),(yyvsp[(2) - (2)].str));
@@ -35736,16 +34009,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1097:
-
-/* Line 1455 of yacc.c  */
 #line 6932 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1098:
-
-/* Line 1455 of yacc.c  */
 #line 6939 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("listen"),(yyvsp[(2) - (2)].str));
@@ -35753,8 +34022,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1099:
-
-/* Line 1455 of yacc.c  */
 #line 6947 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("unlisten"),(yyvsp[(2) - (2)].str));
@@ -35762,8 +34029,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1100:
-
-/* Line 1455 of yacc.c  */
 #line 6951 "preproc.y"
     { 
  (yyval.str) = mm_strdup("unlisten *");
@@ -35771,8 +34036,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1101:
-
-/* Line 1455 of yacc.c  */
 #line 6959 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("abort"),(yyvsp[(2) - (2)].str));
@@ -35780,8 +34043,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1102:
-
-/* Line 1455 of yacc.c  */
 #line 6963 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("begin"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -35789,8 +34050,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1103:
-
-/* Line 1455 of yacc.c  */
 #line 6967 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("start transaction"),(yyvsp[(3) - (3)].str));
@@ -35798,8 +34057,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1104:
-
-/* Line 1455 of yacc.c  */
 #line 6971 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("commit"),(yyvsp[(2) - (2)].str));
@@ -35807,8 +34064,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1105:
-
-/* Line 1455 of yacc.c  */
 #line 6975 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("end"),(yyvsp[(2) - (2)].str));
@@ -35816,8 +34071,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1106:
-
-/* Line 1455 of yacc.c  */
 #line 6979 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("rollback"),(yyvsp[(2) - (2)].str));
@@ -35825,8 +34078,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1107:
-
-/* Line 1455 of yacc.c  */
 #line 6983 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("savepoint"),(yyvsp[(2) - (2)].str));
@@ -35834,8 +34085,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1108:
-
-/* Line 1455 of yacc.c  */
 #line 6987 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("release savepoint"),(yyvsp[(3) - (3)].str));
@@ -35843,8 +34092,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1109:
-
-/* Line 1455 of yacc.c  */
 #line 6991 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("release"),(yyvsp[(2) - (2)].str));
@@ -35852,8 +34099,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1110:
-
-/* Line 1455 of yacc.c  */
 #line 6995 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("rollback"),(yyvsp[(2) - (5)].str),mm_strdup("to savepoint"),(yyvsp[(5) - (5)].str));
@@ -35861,8 +34106,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1111:
-
-/* Line 1455 of yacc.c  */
 #line 6999 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("rollback"),(yyvsp[(2) - (4)].str),mm_strdup("to"),(yyvsp[(4) - (4)].str));
@@ -35870,8 +34113,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1112:
-
-/* Line 1455 of yacc.c  */
 #line 7003 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("prepare transaction"),(yyvsp[(3) - (3)].str));
@@ -35879,8 +34120,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1113:
-
-/* Line 1455 of yacc.c  */
 #line 7007 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("commit prepared"),(yyvsp[(3) - (3)].str));
@@ -35888,8 +34127,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1114:
-
-/* Line 1455 of yacc.c  */
 #line 7011 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("rollback prepared"),(yyvsp[(3) - (3)].str));
@@ -35897,8 +34134,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1115:
-
-/* Line 1455 of yacc.c  */
 #line 7019 "preproc.y"
     { 
  (yyval.str) = mm_strdup("work");
@@ -35906,8 +34141,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1116:
-
-/* Line 1455 of yacc.c  */
 #line 7023 "preproc.y"
     { 
  (yyval.str) = mm_strdup("transaction");
@@ -35915,16 +34148,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1117:
-
-/* Line 1455 of yacc.c  */
 #line 7027 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1118:
-
-/* Line 1455 of yacc.c  */
 #line 7034 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("isolation level"),(yyvsp[(3) - (3)].str));
@@ -35932,8 +34161,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1119:
-
-/* Line 1455 of yacc.c  */
 #line 7038 "preproc.y"
     { 
  (yyval.str) = mm_strdup("read only");
@@ -35941,8 +34168,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1120:
-
-/* Line 1455 of yacc.c  */
 #line 7042 "preproc.y"
     { 
  (yyval.str) = mm_strdup("read write");
@@ -35950,8 +34175,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1121:
-
-/* Line 1455 of yacc.c  */
 #line 7046 "preproc.y"
     { 
  (yyval.str) = mm_strdup("deferrable");
@@ -35959,8 +34182,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1122:
-
-/* Line 1455 of yacc.c  */
 #line 7050 "preproc.y"
     { 
  (yyval.str) = mm_strdup("not deferrable");
@@ -35968,8 +34189,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1123:
-
-/* Line 1455 of yacc.c  */
 #line 7058 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -35977,8 +34196,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1124:
-
-/* Line 1455 of yacc.c  */
 #line 7062 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -35986,8 +34203,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1125:
-
-/* Line 1455 of yacc.c  */
 #line 7066 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -35995,8 +34210,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1126:
-
-/* Line 1455 of yacc.c  */
 #line 7074 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36004,16 +34217,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1127:
-
-/* Line 1455 of yacc.c  */
 #line 7078 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1128:
-
-/* Line 1455 of yacc.c  */
 #line 7085 "preproc.y"
     { 
  (yyval.str) = cat_str(8,mm_strdup("create"),(yyvsp[(2) - (8)].str),mm_strdup("view"),(yyvsp[(4) - (8)].str),(yyvsp[(5) - (8)].str),mm_strdup("as"),(yyvsp[(7) - (8)].str),(yyvsp[(8) - (8)].str));
@@ -36021,8 +34230,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1129:
-
-/* Line 1455 of yacc.c  */
 #line 7089 "preproc.y"
     { 
  (yyval.str) = cat_str(8,mm_strdup("create or replace"),(yyvsp[(4) - (10)].str),mm_strdup("view"),(yyvsp[(6) - (10)].str),(yyvsp[(7) - (10)].str),mm_strdup("as"),(yyvsp[(9) - (10)].str),(yyvsp[(10) - (10)].str));
@@ -36030,8 +34237,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1130:
-
-/* Line 1455 of yacc.c  */
 #line 7097 "preproc.y"
     { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
@@ -36040,8 +34245,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1131:
-
-/* Line 1455 of yacc.c  */
 #line 7102 "preproc.y"
     { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
@@ -36050,8 +34253,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1132:
-
-/* Line 1455 of yacc.c  */
 #line 7107 "preproc.y"
     { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
@@ -36060,16 +34261,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1133:
-
-/* Line 1455 of yacc.c  */
 #line 7112 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1134:
-
-/* Line 1455 of yacc.c  */
 #line 7119 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("load"),(yyvsp[(2) - (2)].str));
@@ -36077,8 +34274,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1135:
-
-/* Line 1455 of yacc.c  */
 #line 7127 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("create database"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -36086,8 +34281,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1136:
-
-/* Line 1455 of yacc.c  */
 #line 7135 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -36095,16 +34288,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1137:
-
-/* Line 1455 of yacc.c  */
 #line 7139 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1138:
-
-/* Line 1455 of yacc.c  */
 #line 7146 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("tablespace"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -36112,8 +34301,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1139:
-
-/* Line 1455 of yacc.c  */
 #line 7150 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("tablespace"),(yyvsp[(2) - (3)].str),mm_strdup("default"));
@@ -36121,8 +34308,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1140:
-
-/* Line 1455 of yacc.c  */
 #line 7154 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("location"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -36130,8 +34315,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1141:
-
-/* Line 1455 of yacc.c  */
 #line 7158 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("location"),(yyvsp[(2) - (3)].str),mm_strdup("default"));
@@ -36139,8 +34322,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1142:
-
-/* Line 1455 of yacc.c  */
 #line 7162 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("template"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -36148,8 +34329,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1143:
-
-/* Line 1455 of yacc.c  */
 #line 7166 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("template"),(yyvsp[(2) - (3)].str),mm_strdup("default"));
@@ -36157,8 +34336,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1144:
-
-/* Line 1455 of yacc.c  */
 #line 7170 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("encoding"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -36166,8 +34343,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1145:
-
-/* Line 1455 of yacc.c  */
 #line 7174 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("encoding"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -36175,8 +34350,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1146:
-
-/* Line 1455 of yacc.c  */
 #line 7178 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("encoding"),(yyvsp[(2) - (3)].str),mm_strdup("default"));
@@ -36184,8 +34357,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1147:
-
-/* Line 1455 of yacc.c  */
 #line 7182 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("lc_collate"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -36193,8 +34364,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1148:
-
-/* Line 1455 of yacc.c  */
 #line 7186 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("lc_collate"),(yyvsp[(2) - (3)].str),mm_strdup("default"));
@@ -36202,8 +34371,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1149:
-
-/* Line 1455 of yacc.c  */
 #line 7190 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("lc_ctype"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -36211,8 +34378,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1150:
-
-/* Line 1455 of yacc.c  */
 #line 7194 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("lc_ctype"),(yyvsp[(2) - (3)].str),mm_strdup("default"));
@@ -36220,8 +34385,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1151:
-
-/* Line 1455 of yacc.c  */
 #line 7198 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("connection limit"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -36229,8 +34392,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1152:
-
-/* Line 1455 of yacc.c  */
 #line 7202 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("owner"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -36238,8 +34399,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1153:
-
-/* Line 1455 of yacc.c  */
 #line 7206 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("owner"),(yyvsp[(2) - (3)].str),mm_strdup("default"));
@@ -36247,8 +34406,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1154:
-
-/* Line 1455 of yacc.c  */
 #line 7214 "preproc.y"
     { 
  (yyval.str) = mm_strdup("=");
@@ -36256,16 +34413,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1155:
-
-/* Line 1455 of yacc.c  */
 #line 7218 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1156:
-
-/* Line 1455 of yacc.c  */
 #line 7225 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -36273,8 +34426,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1157:
-
-/* Line 1455 of yacc.c  */
 #line 7229 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter database"),(yyvsp[(3) - (6)].str),mm_strdup("set tablespace"),(yyvsp[(6) - (6)].str));
@@ -36282,8 +34433,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1158:
-
-/* Line 1455 of yacc.c  */
 #line 7237 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter database"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -36291,8 +34440,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1159:
-
-/* Line 1455 of yacc.c  */
 #line 7245 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -36300,16 +34447,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1160:
-
-/* Line 1455 of yacc.c  */
 #line 7249 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1161:
-
-/* Line 1455 of yacc.c  */
 #line 7256 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("connection limit"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -36317,8 +34460,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1162:
-
-/* Line 1455 of yacc.c  */
 #line 7264 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("drop database"),(yyvsp[(3) - (3)].str));
@@ -36326,8 +34467,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1163:
-
-/* Line 1455 of yacc.c  */
 #line 7268 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("drop database if exists"),(yyvsp[(5) - (5)].str));
@@ -36335,8 +34474,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1164:
-
-/* Line 1455 of yacc.c  */
 #line 7276 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("create domain"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -36344,8 +34481,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1165:
-
-/* Line 1455 of yacc.c  */
 #line 7284 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter domain"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -36353,8 +34488,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1166:
-
-/* Line 1455 of yacc.c  */
 #line 7288 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter domain"),(yyvsp[(3) - (6)].str),mm_strdup("drop not null"));
@@ -36362,8 +34495,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1167:
-
-/* Line 1455 of yacc.c  */
 #line 7292 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter domain"),(yyvsp[(3) - (6)].str),mm_strdup("set not null"));
@@ -36371,8 +34502,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1168:
-
-/* Line 1455 of yacc.c  */
 #line 7296 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter domain"),(yyvsp[(3) - (5)].str),mm_strdup("add"),(yyvsp[(5) - (5)].str));
@@ -36380,8 +34509,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1169:
-
-/* Line 1455 of yacc.c  */
 #line 7300 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("alter domain"),(yyvsp[(3) - (7)].str),mm_strdup("drop constraint"),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -36389,8 +34516,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1170:
-
-/* Line 1455 of yacc.c  */
 #line 7308 "preproc.y"
     { 
  (yyval.str) = mm_strdup("as");
@@ -36398,16 +34523,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1171:
-
-/* Line 1455 of yacc.c  */
 #line 7312 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1172:
-
-/* Line 1455 of yacc.c  */
 #line 7319 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("alter text search dictionary"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -36415,8 +34536,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1173:
-
-/* Line 1455 of yacc.c  */
 #line 7327 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter text search configuration"),(yyvsp[(5) - (11)].str),mm_strdup("add mapping for"),(yyvsp[(9) - (11)].str),mm_strdup("with"),(yyvsp[(11) - (11)].str));
@@ -36424,8 +34543,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1174:
-
-/* Line 1455 of yacc.c  */
 #line 7331 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter text search configuration"),(yyvsp[(5) - (11)].str),mm_strdup("alter mapping for"),(yyvsp[(9) - (11)].str),mm_strdup("with"),(yyvsp[(11) - (11)].str));
@@ -36433,8 +34550,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1175:
-
-/* Line 1455 of yacc.c  */
 #line 7335 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("alter text search configuration"),(yyvsp[(5) - (11)].str),mm_strdup("alter mapping replace"),(yyvsp[(9) - (11)].str),mm_strdup("with"),(yyvsp[(11) - (11)].str));
@@ -36442,8 +34557,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1176:
-
-/* Line 1455 of yacc.c  */
 #line 7339 "preproc.y"
     { 
  (yyval.str) = cat_str(8,mm_strdup("alter text search configuration"),(yyvsp[(5) - (13)].str),mm_strdup("alter mapping for"),(yyvsp[(9) - (13)].str),mm_strdup("replace"),(yyvsp[(11) - (13)].str),mm_strdup("with"),(yyvsp[(13) - (13)].str));
@@ -36451,8 +34564,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1177:
-
-/* Line 1455 of yacc.c  */
 #line 7343 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[(5) - (9)].str),mm_strdup("drop mapping for"),(yyvsp[(9) - (9)].str));
@@ -36460,8 +34571,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1178:
-
-/* Line 1455 of yacc.c  */
 #line 7347 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("alter text search configuration"),(yyvsp[(5) - (11)].str),mm_strdup("drop mapping if exists for"),(yyvsp[(11) - (11)].str));
@@ -36469,8 +34578,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1179:
-
-/* Line 1455 of yacc.c  */
 #line 7355 "preproc.y"
     { 
  (yyval.str) = cat_str(10,mm_strdup("create"),(yyvsp[(2) - (10)].str),mm_strdup("conversion"),(yyvsp[(4) - (10)].str),mm_strdup("for"),(yyvsp[(6) - (10)].str),mm_strdup("to"),(yyvsp[(8) - (10)].str),mm_strdup("from"),(yyvsp[(10) - (10)].str));
@@ -36478,8 +34585,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1180:
-
-/* Line 1455 of yacc.c  */
 #line 7363 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("cluster"),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -36487,8 +34592,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1181:
-
-/* Line 1455 of yacc.c  */
 #line 7367 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("cluster"),(yyvsp[(2) - (2)].str));
@@ -36496,8 +34599,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1182:
-
-/* Line 1455 of yacc.c  */
 #line 7371 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("cluster"),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),mm_strdup("on"),(yyvsp[(5) - (5)].str));
@@ -36505,8 +34606,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1183:
-
-/* Line 1455 of yacc.c  */
 #line 7379 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[(2) - (2)].str));
@@ -36514,16 +34613,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1184:
-
-/* Line 1455 of yacc.c  */
 #line 7383 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1185:
-
-/* Line 1455 of yacc.c  */
 #line 7390 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("vacuum"),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -36531,8 +34626,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1186:
-
-/* Line 1455 of yacc.c  */
 #line 7394 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("vacuum"),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -36540,8 +34633,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1187:
-
-/* Line 1455 of yacc.c  */
 #line 7398 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("vacuum"),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -36549,8 +34640,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1188:
-
-/* Line 1455 of yacc.c  */
 #line 7402 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("vacuum ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -36558,8 +34647,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1189:
-
-/* Line 1455 of yacc.c  */
 #line 7406 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("vacuum ("),(yyvsp[(3) - (6)].str),mm_strdup(")"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -36567,8 +34654,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1190:
-
-/* Line 1455 of yacc.c  */
 #line 7414 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36576,8 +34661,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1191:
-
-/* Line 1455 of yacc.c  */
 #line 7418 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -36585,8 +34668,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1192:
-
-/* Line 1455 of yacc.c  */
 #line 7426 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36594,8 +34675,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1193:
-
-/* Line 1455 of yacc.c  */
 #line 7430 "preproc.y"
     { 
  (yyval.str) = mm_strdup("verbose");
@@ -36603,8 +34682,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1194:
-
-/* Line 1455 of yacc.c  */
 #line 7434 "preproc.y"
     { 
  (yyval.str) = mm_strdup("freeze");
@@ -36612,8 +34689,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1195:
-
-/* Line 1455 of yacc.c  */
 #line 7438 "preproc.y"
     { 
  (yyval.str) = mm_strdup("full");
@@ -36621,8 +34696,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1196:
-
-/* Line 1455 of yacc.c  */
 #line 7446 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -36630,8 +34703,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1197:
-
-/* Line 1455 of yacc.c  */
 #line 7450 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (4)].str),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -36639,8 +34710,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1198:
-
-/* Line 1455 of yacc.c  */
 #line 7458 "preproc.y"
     { 
  (yyval.str) = mm_strdup("analyze");
@@ -36648,8 +34717,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1199:
-
-/* Line 1455 of yacc.c  */
 #line 7462 "preproc.y"
     { 
  (yyval.str) = mm_strdup("analyse");
@@ -36657,8 +34724,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1200:
-
-/* Line 1455 of yacc.c  */
 #line 7470 "preproc.y"
     { 
  (yyval.str) = mm_strdup("verbose");
@@ -36666,16 +34731,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1201:
-
-/* Line 1455 of yacc.c  */
 #line 7474 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1202:
-
-/* Line 1455 of yacc.c  */
 #line 7481 "preproc.y"
     { 
  (yyval.str) = mm_strdup("full");
@@ -36683,16 +34744,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1203:
-
-/* Line 1455 of yacc.c  */
 #line 7485 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1204:
-
-/* Line 1455 of yacc.c  */
 #line 7492 "preproc.y"
     { 
  (yyval.str) = mm_strdup("freeze");
@@ -36700,16 +34757,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1205:
-
-/* Line 1455 of yacc.c  */
 #line 7496 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1206:
-
-/* Line 1455 of yacc.c  */
 #line 7503 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -36717,16 +34770,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1207:
-
-/* Line 1455 of yacc.c  */
 #line 7507 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1208:
-
-/* Line 1455 of yacc.c  */
 #line 7514 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("explain"),(yyvsp[(2) - (2)].str));
@@ -36734,8 +34783,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1209:
-
-/* Line 1455 of yacc.c  */
 #line 7518 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("explain"),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -36743,8 +34790,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1210:
-
-/* Line 1455 of yacc.c  */
 #line 7522 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("explain verbose"),(yyvsp[(3) - (3)].str));
@@ -36752,8 +34797,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1211:
-
-/* Line 1455 of yacc.c  */
 #line 7526 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("explain ("),(yyvsp[(3) - (5)].str),mm_strdup(")"),(yyvsp[(5) - (5)].str));
@@ -36761,8 +34804,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1212:
-
-/* Line 1455 of yacc.c  */
 #line 7534 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36770,8 +34811,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1213:
-
-/* Line 1455 of yacc.c  */
 #line 7538 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36779,8 +34818,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1214:
-
-/* Line 1455 of yacc.c  */
 #line 7542 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36788,8 +34825,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1215:
-
-/* Line 1455 of yacc.c  */
 #line 7546 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36797,8 +34832,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1216:
-
-/* Line 1455 of yacc.c  */
 #line 7550 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36806,8 +34839,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1217:
-
-/* Line 1455 of yacc.c  */
 #line 7554 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36815,8 +34846,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1218:
-
-/* Line 1455 of yacc.c  */
 #line 7558 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36824,8 +34853,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1219:
-
-/* Line 1455 of yacc.c  */
 #line 7566 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36833,8 +34860,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1220:
-
-/* Line 1455 of yacc.c  */
 #line 7570 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -36842,8 +34867,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1221:
-
-/* Line 1455 of yacc.c  */
 #line 7578 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -36851,8 +34874,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1222:
-
-/* Line 1455 of yacc.c  */
 #line 7586 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36860,8 +34881,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1223:
-
-/* Line 1455 of yacc.c  */
 #line 7590 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36869,8 +34888,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1224:
-
-/* Line 1455 of yacc.c  */
 #line 7594 "preproc.y"
     { 
  (yyval.str) = mm_strdup("verbose");
@@ -36878,8 +34895,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1225:
-
-/* Line 1455 of yacc.c  */
 #line 7602 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36887,8 +34902,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1226:
-
-/* Line 1455 of yacc.c  */
 #line 7606 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36896,16 +34909,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1227:
-
-/* Line 1455 of yacc.c  */
 #line 7610 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1228:
-
-/* Line 1455 of yacc.c  */
 #line 7617 "preproc.y"
     {
 		(yyval.prep).name = (yyvsp[(2) - (5)].str);
@@ -36915,8 +34924,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1229:
-
-/* Line 1455 of yacc.c  */
 #line 7623 "preproc.y"
     {
 		(yyval.prep).name = (yyvsp[(2) - (4)].str);
@@ -36926,8 +34933,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1230:
-
-/* Line 1455 of yacc.c  */
 #line 7633 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -36935,16 +34940,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1231:
-
-/* Line 1455 of yacc.c  */
 #line 7637 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1232:
-
-/* Line 1455 of yacc.c  */
 #line 7644 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36952,8 +34953,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1233:
-
-/* Line 1455 of yacc.c  */
 #line 7648 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36961,8 +34960,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1234:
-
-/* Line 1455 of yacc.c  */
 #line 7652 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36970,8 +34967,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1235:
-
-/* Line 1455 of yacc.c  */
 #line 7656 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -36979,15 +34974,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1236:
-
-/* Line 1455 of yacc.c  */
 #line 7664 "preproc.y"
     { (yyval.str) = (yyvsp[(2) - (4)].str); ;}
     break;
 
   case 1237:
-
-/* Line 1455 of yacc.c  */
 #line 7666 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("create"),(yyvsp[(2) - (8)].str),mm_strdup("table"),(yyvsp[(4) - (8)].str),mm_strdup("as execute"),(yyvsp[(7) - (8)].str),(yyvsp[(8) - (8)].str));
@@ -36995,8 +34986,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1238:
-
-/* Line 1455 of yacc.c  */
 #line 7674 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -37004,16 +34993,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1239:
-
-/* Line 1455 of yacc.c  */
 #line 7678 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1240:
-
-/* Line 1455 of yacc.c  */
 #line 7685 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (6)].str),mm_strdup("insert into"),(yyvsp[(4) - (6)].str),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -37021,8 +35006,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1241:
-
-/* Line 1455 of yacc.c  */
 #line 7693 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37030,8 +35013,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1242:
-
-/* Line 1455 of yacc.c  */
 #line 7697 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[(2) - (4)].str),mm_strdup(")"),(yyvsp[(4) - (4)].str));
@@ -37039,8 +35020,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1243:
-
-/* Line 1455 of yacc.c  */
 #line 7701 "preproc.y"
     { 
  (yyval.str) = mm_strdup("default values");
@@ -37048,8 +35027,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1244:
-
-/* Line 1455 of yacc.c  */
 #line 7709 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37057,8 +35034,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1245:
-
-/* Line 1455 of yacc.c  */
 #line 7713 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -37066,8 +35041,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1246:
-
-/* Line 1455 of yacc.c  */
 #line 7721 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -37075,8 +35048,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1247:
-
-/* Line 1455 of yacc.c  */
 #line 7729 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("returning"),(yyvsp[(2) - (3)].str));
@@ -37084,16 +35055,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1248:
-
-/* Line 1455 of yacc.c  */
 #line 7733 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1249:
-
-/* Line 1455 of yacc.c  */
 #line 7740 "preproc.y"
     { 
  (yyval.str) = cat_str(6,(yyvsp[(1) - (7)].str),mm_strdup("delete from"),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));
@@ -37101,8 +35068,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1250:
-
-/* Line 1455 of yacc.c  */
 #line 7748 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("using"),(yyvsp[(2) - (2)].str));
@@ -37110,16 +35075,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1251:
-
-/* Line 1455 of yacc.c  */
 #line 7752 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1252:
-
-/* Line 1455 of yacc.c  */
 #line 7759 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("lock"),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -37127,8 +35088,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1253:
-
-/* Line 1455 of yacc.c  */
 #line 7767 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("in"),(yyvsp[(2) - (3)].str),mm_strdup("mode"));
@@ -37136,16 +35095,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1254:
-
-/* Line 1455 of yacc.c  */
 #line 7771 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1255:
-
-/* Line 1455 of yacc.c  */
 #line 7778 "preproc.y"
     { 
  (yyval.str) = mm_strdup("access share");
@@ -37153,8 +35108,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1256:
-
-/* Line 1455 of yacc.c  */
 #line 7782 "preproc.y"
     { 
  (yyval.str) = mm_strdup("row share");
@@ -37162,8 +35115,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1257:
-
-/* Line 1455 of yacc.c  */
 #line 7786 "preproc.y"
     { 
  (yyval.str) = mm_strdup("row exclusive");
@@ -37171,8 +35122,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1258:
-
-/* Line 1455 of yacc.c  */
 #line 7790 "preproc.y"
     { 
  (yyval.str) = mm_strdup("share update exclusive");
@@ -37180,8 +35129,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1259:
-
-/* Line 1455 of yacc.c  */
 #line 7794 "preproc.y"
     { 
  (yyval.str) = mm_strdup("share");
@@ -37189,8 +35136,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1260:
-
-/* Line 1455 of yacc.c  */
 #line 7798 "preproc.y"
     { 
  (yyval.str) = mm_strdup("share row exclusive");
@@ -37198,8 +35143,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1261:
-
-/* Line 1455 of yacc.c  */
 #line 7802 "preproc.y"
     { 
  (yyval.str) = mm_strdup("exclusive");
@@ -37207,8 +35150,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1262:
-
-/* Line 1455 of yacc.c  */
 #line 7806 "preproc.y"
     { 
  (yyval.str) = mm_strdup("access exclusive");
@@ -37216,8 +35157,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1263:
-
-/* Line 1455 of yacc.c  */
 #line 7814 "preproc.y"
     { 
  (yyval.str) = mm_strdup("nowait");
@@ -37225,16 +35164,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1264:
-
-/* Line 1455 of yacc.c  */
 #line 7818 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1265:
-
-/* Line 1455 of yacc.c  */
 #line 7825 "preproc.y"
     { 
  (yyval.str) = cat_str(8,(yyvsp[(1) - (8)].str),mm_strdup("update"),(yyvsp[(3) - (8)].str),mm_strdup("set"),(yyvsp[(5) - (8)].str),(yyvsp[(6) - (8)].str),(yyvsp[(7) - (8)].str),(yyvsp[(8) - (8)].str));
@@ -37242,8 +35177,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1266:
-
-/* Line 1455 of yacc.c  */
 #line 7833 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37251,8 +35184,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1267:
-
-/* Line 1455 of yacc.c  */
 #line 7837 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -37260,8 +35191,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1268:
-
-/* Line 1455 of yacc.c  */
 #line 7845 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37269,8 +35198,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1269:
-
-/* Line 1455 of yacc.c  */
 #line 7849 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37278,8 +35205,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1270:
-
-/* Line 1455 of yacc.c  */
 #line 7857 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("="),(yyvsp[(3) - (3)].str));
@@ -37287,8 +35212,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1271:
-
-/* Line 1455 of yacc.c  */
 #line 7865 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[(2) - (5)].str),mm_strdup(") ="),(yyvsp[(5) - (5)].str));
@@ -37296,8 +35219,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1272:
-
-/* Line 1455 of yacc.c  */
 #line 7873 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -37305,8 +35226,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1273:
-
-/* Line 1455 of yacc.c  */
 #line 7881 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37314,8 +35233,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1274:
-
-/* Line 1455 of yacc.c  */
 #line 7885 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -37323,8 +35240,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1275:
-
-/* Line 1455 of yacc.c  */
 #line 7893 "preproc.y"
     {
 		struct cursor *ptr, *this;
@@ -37377,8 +35292,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1276:
-
-/* Line 1455 of yacc.c  */
 #line 7946 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37386,8 +35299,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1277:
-
-/* Line 1455 of yacc.c  */
 #line 7950 "preproc.y"
     {
 			char *curname = mm_alloc(strlen((yyvsp[(1) - (1)].str)) + 2);
@@ -37399,16 +35310,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1278:
-
-/* Line 1455 of yacc.c  */
 #line 7962 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1279:
-
-/* Line 1455 of yacc.c  */
 #line 7965 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (3)].str),mm_strdup("no scroll"));
@@ -37416,8 +35323,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1280:
-
-/* Line 1455 of yacc.c  */
 #line 7969 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),mm_strdup("scroll"));
@@ -37425,8 +35330,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1281:
-
-/* Line 1455 of yacc.c  */
 #line 7973 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),mm_strdup("binary"));
@@ -37434,8 +35337,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1282:
-
-/* Line 1455 of yacc.c  */
 #line 7977 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),mm_strdup("insensitive"));
@@ -37443,8 +35344,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1283:
-
-/* Line 1455 of yacc.c  */
 #line 7985 "preproc.y"
     {
 		if (compat == ECPG_COMPAT_INFORMIX_SE && autocommit)
@@ -37455,8 +35354,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1284:
-
-/* Line 1455 of yacc.c  */
 #line 7992 "preproc.y"
     { 
  (yyval.str) = mm_strdup("with hold");
@@ -37464,8 +35361,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1285:
-
-/* Line 1455 of yacc.c  */
 #line 7996 "preproc.y"
     { 
  (yyval.str) = mm_strdup("without hold");
@@ -37473,8 +35368,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1286:
-
-/* Line 1455 of yacc.c  */
 #line 8004 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37482,8 +35375,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1287:
-
-/* Line 1455 of yacc.c  */
 #line 8008 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37491,8 +35382,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1288:
-
-/* Line 1455 of yacc.c  */
 #line 8016 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -37500,8 +35389,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1289:
-
-/* Line 1455 of yacc.c  */
 #line 8020 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -37509,8 +35396,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1290:
-
-/* Line 1455 of yacc.c  */
 #line 8028 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37518,8 +35403,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1291:
-
-/* Line 1455 of yacc.c  */
 #line 8032 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -37527,8 +35410,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1292:
-
-/* Line 1455 of yacc.c  */
 #line 8036 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (4)].str),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -37536,8 +35417,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1293:
-
-/* Line 1455 of yacc.c  */
 #line 8040 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (4)].str),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -37545,8 +35424,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1294:
-
-/* Line 1455 of yacc.c  */
 #line 8044 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -37554,8 +35431,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1295:
-
-/* Line 1455 of yacc.c  */
 #line 8048 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -37563,8 +35438,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1296:
-
-/* Line 1455 of yacc.c  */
 #line 8052 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -37572,8 +35445,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1297:
-
-/* Line 1455 of yacc.c  */
 #line 8056 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -37581,8 +35452,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1298:
-
-/* Line 1455 of yacc.c  */
 #line 8064 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37590,8 +35459,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1299:
-
-/* Line 1455 of yacc.c  */
 #line 8068 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37599,8 +35466,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1300:
-
-/* Line 1455 of yacc.c  */
 #line 8076 "preproc.y"
     { 
  (yyval.str) = cat_str(9,mm_strdup("select"),(yyvsp[(2) - (9)].str),(yyvsp[(3) - (9)].str),(yyvsp[(4) - (9)].str),(yyvsp[(5) - (9)].str),(yyvsp[(6) - (9)].str),(yyvsp[(7) - (9)].str),(yyvsp[(8) - (9)].str),(yyvsp[(9) - (9)].str));
@@ -37608,8 +35473,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1301:
-
-/* Line 1455 of yacc.c  */
 #line 8080 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37617,8 +35480,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1302:
-
-/* Line 1455 of yacc.c  */
 #line 8084 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("table"),(yyvsp[(2) - (2)].str));
@@ -37626,8 +35487,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1303:
-
-/* Line 1455 of yacc.c  */
 #line 8088 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (4)].str),mm_strdup("union"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -37635,8 +35494,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1304:
-
-/* Line 1455 of yacc.c  */
 #line 8092 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (4)].str),mm_strdup("intersect"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -37644,8 +35501,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1305:
-
-/* Line 1455 of yacc.c  */
 #line 8096 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (4)].str),mm_strdup("except"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -37653,8 +35508,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1306:
-
-/* Line 1455 of yacc.c  */
 #line 8104 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("with"),(yyvsp[(2) - (2)].str));
@@ -37662,8 +35515,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1307:
-
-/* Line 1455 of yacc.c  */
 #line 8108 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("with recursive"),(yyvsp[(3) - (3)].str));
@@ -37671,8 +35522,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1308:
-
-/* Line 1455 of yacc.c  */
 #line 8116 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37680,8 +35529,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1309:
-
-/* Line 1455 of yacc.c  */
 #line 8120 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -37689,8 +35536,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1310:
-
-/* Line 1455 of yacc.c  */
 #line 8128 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (6)].str),(yyvsp[(2) - (6)].str),mm_strdup("as ("),(yyvsp[(5) - (6)].str),mm_strdup(")"));
@@ -37698,8 +35543,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1311:
-
-/* Line 1455 of yacc.c  */
 #line 8136 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37707,16 +35550,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1312:
-
-/* Line 1455 of yacc.c  */
 #line 8140 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1313:
-
-/* Line 1455 of yacc.c  */
 #line 8147 "preproc.y"
     {
 						FoundInto = 1;
@@ -37725,23 +35564,17 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1314:
-
-/* Line 1455 of yacc.c  */
 #line 8151 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 1315:
-
-/* Line 1455 of yacc.c  */
 #line 8153 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1316:
-
-/* Line 1455 of yacc.c  */
 #line 8160 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("temporary"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -37749,8 +35582,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1317:
-
-/* Line 1455 of yacc.c  */
 #line 8164 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("temp"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -37758,8 +35589,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1318:
-
-/* Line 1455 of yacc.c  */
 #line 8168 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("local temporary"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -37767,8 +35596,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1319:
-
-/* Line 1455 of yacc.c  */
 #line 8172 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("local temp"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -37776,8 +35603,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1320:
-
-/* Line 1455 of yacc.c  */
 #line 8176 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("global temporary"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -37785,8 +35610,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1321:
-
-/* Line 1455 of yacc.c  */
 #line 8180 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("global temp"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -37794,8 +35617,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1322:
-
-/* Line 1455 of yacc.c  */
 #line 8184 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("unlogged"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -37803,8 +35624,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1323:
-
-/* Line 1455 of yacc.c  */
 #line 8188 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("table"),(yyvsp[(2) - (2)].str));
@@ -37812,8 +35631,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1324:
-
-/* Line 1455 of yacc.c  */
 #line 8192 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37821,8 +35638,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1325:
-
-/* Line 1455 of yacc.c  */
 #line 8200 "preproc.y"
     { 
  (yyval.str) = mm_strdup("table");
@@ -37830,16 +35645,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1326:
-
-/* Line 1455 of yacc.c  */
 #line 8204 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1327:
-
-/* Line 1455 of yacc.c  */
 #line 8211 "preproc.y"
     { 
  (yyval.str) = mm_strdup("all");
@@ -37847,8 +35658,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1328:
-
-/* Line 1455 of yacc.c  */
 #line 8215 "preproc.y"
     { 
  (yyval.str) = mm_strdup("distinct");
@@ -37856,16 +35665,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1329:
-
-/* Line 1455 of yacc.c  */
 #line 8219 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1330:
-
-/* Line 1455 of yacc.c  */
 #line 8226 "preproc.y"
     { 
  (yyval.str) = mm_strdup("distinct");
@@ -37873,8 +35678,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1331:
-
-/* Line 1455 of yacc.c  */
 #line 8230 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("distinct on ("),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -37882,8 +35685,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1332:
-
-/* Line 1455 of yacc.c  */
 #line 8234 "preproc.y"
     { 
  (yyval.str) = mm_strdup("all");
@@ -37891,16 +35692,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1333:
-
-/* Line 1455 of yacc.c  */
 #line 8238 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1334:
-
-/* Line 1455 of yacc.c  */
 #line 8245 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37908,16 +35705,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1335:
-
-/* Line 1455 of yacc.c  */
 #line 8249 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1336:
-
-/* Line 1455 of yacc.c  */
 #line 8256 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("order by"),(yyvsp[(3) - (3)].str));
@@ -37925,8 +35718,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1337:
-
-/* Line 1455 of yacc.c  */
 #line 8264 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37934,8 +35725,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1338:
-
-/* Line 1455 of yacc.c  */
 #line 8268 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -37943,8 +35732,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1339:
-
-/* Line 1455 of yacc.c  */
 #line 8276 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (4)].str),mm_strdup("using"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -37952,8 +35739,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1340:
-
-/* Line 1455 of yacc.c  */
 #line 8280 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -37961,8 +35746,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1341:
-
-/* Line 1455 of yacc.c  */
 #line 8288 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -37970,8 +35753,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1342:
-
-/* Line 1455 of yacc.c  */
 #line 8292 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -37979,8 +35760,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1343:
-
-/* Line 1455 of yacc.c  */
 #line 8296 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37988,8 +35767,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1344:
-
-/* Line 1455 of yacc.c  */
 #line 8300 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -37997,8 +35774,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1345:
-
-/* Line 1455 of yacc.c  */
 #line 8308 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38006,16 +35781,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1346:
-
-/* Line 1455 of yacc.c  */
 #line 8312 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1347:
-
-/* Line 1455 of yacc.c  */
 #line 8319 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("limit"),(yyvsp[(2) - (2)].str));
@@ -38023,8 +35794,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1348:
-
-/* Line 1455 of yacc.c  */
 #line 8323 "preproc.y"
     {
                 mmerror(PARSE_ERROR, ET_WARNING, "no longer supported LIMIT #,# syntax passed to server");
@@ -38033,8 +35802,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1349:
-
-/* Line 1455 of yacc.c  */
 #line 8328 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("fetch"),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),mm_strdup("only"));
@@ -38042,8 +35809,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1350:
-
-/* Line 1455 of yacc.c  */
 #line 8336 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("offset"),(yyvsp[(2) - (2)].str));
@@ -38051,8 +35816,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1351:
-
-/* Line 1455 of yacc.c  */
 #line 8340 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("offset"),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -38060,8 +35823,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1352:
-
-/* Line 1455 of yacc.c  */
 #line 8348 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38069,8 +35830,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1353:
-
-/* Line 1455 of yacc.c  */
 #line 8352 "preproc.y"
     { 
  (yyval.str) = mm_strdup("all");
@@ -38078,8 +35837,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1354:
-
-/* Line 1455 of yacc.c  */
 #line 8360 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38087,8 +35844,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1355:
-
-/* Line 1455 of yacc.c  */
 #line 8368 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38096,8 +35851,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1356:
-
-/* Line 1455 of yacc.c  */
 #line 8372 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -38105,16 +35858,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1357:
-
-/* Line 1455 of yacc.c  */
 #line 8376 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1358:
-
-/* Line 1455 of yacc.c  */
 #line 8383 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38122,8 +35871,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1359:
-
-/* Line 1455 of yacc.c  */
 #line 8391 "preproc.y"
     { 
  (yyval.str) = mm_strdup("row");
@@ -38131,8 +35878,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1360:
-
-/* Line 1455 of yacc.c  */
 #line 8395 "preproc.y"
     { 
  (yyval.str) = mm_strdup("rows");
@@ -38140,8 +35885,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1361:
-
-/* Line 1455 of yacc.c  */
 #line 8403 "preproc.y"
     { 
  (yyval.str) = mm_strdup("first");
@@ -38149,8 +35892,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1362:
-
-/* Line 1455 of yacc.c  */
 #line 8407 "preproc.y"
     { 
  (yyval.str) = mm_strdup("next");
@@ -38158,8 +35899,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1363:
-
-/* Line 1455 of yacc.c  */
 #line 8415 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("group by"),(yyvsp[(3) - (3)].str));
@@ -38167,16 +35906,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1364:
-
-/* Line 1455 of yacc.c  */
 #line 8419 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1365:
-
-/* Line 1455 of yacc.c  */
 #line 8426 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("having"),(yyvsp[(2) - (2)].str));
@@ -38184,16 +35919,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1366:
-
-/* Line 1455 of yacc.c  */
 #line 8430 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1367:
-
-/* Line 1455 of yacc.c  */
 #line 8437 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38201,8 +35932,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1368:
-
-/* Line 1455 of yacc.c  */
 #line 8441 "preproc.y"
     { 
  (yyval.str) = mm_strdup("for read only");
@@ -38210,8 +35939,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1369:
-
-/* Line 1455 of yacc.c  */
 #line 8449 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38219,16 +35946,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1370:
-
-/* Line 1455 of yacc.c  */
 #line 8453 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1371:
-
-/* Line 1455 of yacc.c  */
 #line 8460 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38236,8 +35959,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1372:
-
-/* Line 1455 of yacc.c  */
 #line 8464 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -38245,8 +35966,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1373:
-
-/* Line 1455 of yacc.c  */
 #line 8472 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("for update"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -38254,8 +35973,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1374:
-
-/* Line 1455 of yacc.c  */
 #line 8476 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("for share"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -38263,8 +35980,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1375:
-
-/* Line 1455 of yacc.c  */
 #line 8484 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("of"),(yyvsp[(2) - (2)].str));
@@ -38272,16 +35987,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1376:
-
-/* Line 1455 of yacc.c  */
 #line 8488 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1377:
-
-/* Line 1455 of yacc.c  */
 #line 8495 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("values"),(yyvsp[(2) - (2)].str));
@@ -38289,8 +36000,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1378:
-
-/* Line 1455 of yacc.c  */
 #line 8499 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -38298,8 +36007,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1379:
-
-/* Line 1455 of yacc.c  */
 #line 8507 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[(2) - (2)].str));
@@ -38307,16 +36014,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1380:
-
-/* Line 1455 of yacc.c  */
 #line 8511 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1381:
-
-/* Line 1455 of yacc.c  */
 #line 8518 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38324,8 +36027,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1382:
-
-/* Line 1455 of yacc.c  */
 #line 8522 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -38333,8 +36034,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1383:
-
-/* Line 1455 of yacc.c  */
 #line 8530 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38342,8 +36041,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1384:
-
-/* Line 1455 of yacc.c  */
 #line 8534 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -38351,8 +36048,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1385:
-
-/* Line 1455 of yacc.c  */
 #line 8538 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38360,8 +36055,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1386:
-
-/* Line 1455 of yacc.c  */
 #line 8542 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -38369,8 +36062,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1387:
-
-/* Line 1455 of yacc.c  */
 #line 8546 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (5)].str),mm_strdup("as ("),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -38378,8 +36069,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1388:
-
-/* Line 1455 of yacc.c  */
 #line 8550 "preproc.y"
     { 
  (yyval.str) = cat_str(6,(yyvsp[(1) - (6)].str),mm_strdup("as"),(yyvsp[(3) - (6)].str),mm_strdup("("),(yyvsp[(5) - (6)].str),mm_strdup(")"));
@@ -38387,8 +36076,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1389:
-
-/* Line 1455 of yacc.c  */
 #line 8554 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),(yyvsp[(2) - (5)].str),mm_strdup("("),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -38396,8 +36083,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1390:
-
-/* Line 1455 of yacc.c  */
 #line 8558 "preproc.y"
     { 
 		mmerror(PARSE_ERROR, ET_ERROR, "subquery in FROM must have an alias");
@@ -38407,8 +36092,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1391:
-
-/* Line 1455 of yacc.c  */
 #line 8564 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -38416,8 +36099,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1392:
-
-/* Line 1455 of yacc.c  */
 #line 8568 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38425,8 +36106,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1393:
-
-/* Line 1455 of yacc.c  */
 #line 8572 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[(2) - (4)].str),mm_strdup(")"),(yyvsp[(4) - (4)].str));
@@ -38434,8 +36113,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1394:
-
-/* Line 1455 of yacc.c  */
 #line 8580 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -38443,8 +36120,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1395:
-
-/* Line 1455 of yacc.c  */
 #line 8584 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (4)].str),mm_strdup("cross join"),(yyvsp[(4) - (4)].str));
@@ -38452,8 +36127,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1396:
-
-/* Line 1455 of yacc.c  */
 #line 8588 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),(yyvsp[(2) - (5)].str),mm_strdup("join"),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));
@@ -38461,8 +36134,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1397:
-
-/* Line 1455 of yacc.c  */
 #line 8592 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (4)].str),mm_strdup("join"),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -38470,8 +36141,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1398:
-
-/* Line 1455 of yacc.c  */
 #line 8596 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),mm_strdup("natural"),(yyvsp[(3) - (5)].str),mm_strdup("join"),(yyvsp[(5) - (5)].str));
@@ -38479,8 +36148,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1399:
-
-/* Line 1455 of yacc.c  */
 #line 8600 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (4)].str),mm_strdup("natural join"),(yyvsp[(4) - (4)].str));
@@ -38488,8 +36155,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1400:
-
-/* Line 1455 of yacc.c  */
 #line 8608 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("as"),(yyvsp[(2) - (5)].str),mm_strdup("("),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -38497,8 +36162,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1401:
-
-/* Line 1455 of yacc.c  */
 #line 8612 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("as"),(yyvsp[(2) - (2)].str));
@@ -38506,8 +36169,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1402:
-
-/* Line 1455 of yacc.c  */
 #line 8616 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (4)].str),mm_strdup("("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -38515,8 +36176,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1403:
-
-/* Line 1455 of yacc.c  */
 #line 8620 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38524,8 +36183,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1404:
-
-/* Line 1455 of yacc.c  */
 #line 8628 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("full"),(yyvsp[(2) - (2)].str));
@@ -38533,8 +36190,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1405:
-
-/* Line 1455 of yacc.c  */
 #line 8632 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("left"),(yyvsp[(2) - (2)].str));
@@ -38542,8 +36197,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1406:
-
-/* Line 1455 of yacc.c  */
 #line 8636 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("right"),(yyvsp[(2) - (2)].str));
@@ -38551,8 +36204,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1407:
-
-/* Line 1455 of yacc.c  */
 #line 8640 "preproc.y"
     { 
  (yyval.str) = mm_strdup("inner");
@@ -38560,8 +36211,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1408:
-
-/* Line 1455 of yacc.c  */
 #line 8648 "preproc.y"
     { 
  (yyval.str) = mm_strdup("outer");
@@ -38569,16 +36218,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1409:
-
-/* Line 1455 of yacc.c  */
 #line 8652 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1410:
-
-/* Line 1455 of yacc.c  */
 #line 8659 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("using ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -38586,8 +36231,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1411:
-
-/* Line 1455 of yacc.c  */
 #line 8663 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("on"),(yyvsp[(2) - (2)].str));
@@ -38595,8 +36238,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1412:
-
-/* Line 1455 of yacc.c  */
 #line 8671 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38604,8 +36245,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1413:
-
-/* Line 1455 of yacc.c  */
 #line 8675 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),mm_strdup("*"));
@@ -38613,8 +36252,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1414:
-
-/* Line 1455 of yacc.c  */
 #line 8679 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("only"),(yyvsp[(2) - (2)].str));
@@ -38622,8 +36259,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1415:
-
-/* Line 1455 of yacc.c  */
 #line 8683 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("only ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -38631,8 +36266,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1416:
-
-/* Line 1455 of yacc.c  */
 #line 8691 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38640,8 +36273,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1417:
-
-/* Line 1455 of yacc.c  */
 #line 8695 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -38649,8 +36280,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1418:
-
-/* Line 1455 of yacc.c  */
 #line 8703 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38658,8 +36287,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1419:
-
-/* Line 1455 of yacc.c  */
 #line 8707 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -38667,8 +36294,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1420:
-
-/* Line 1455 of yacc.c  */
 #line 8711 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("as"),(yyvsp[(3) - (3)].str));
@@ -38676,8 +36301,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1421:
-
-/* Line 1455 of yacc.c  */
 #line 8719 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38685,8 +36308,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1422:
-
-/* Line 1455 of yacc.c  */
 #line 8727 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("where"),(yyvsp[(2) - (2)].str));
@@ -38694,16 +36315,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1423:
-
-/* Line 1455 of yacc.c  */
 #line 8731 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1424:
-
-/* Line 1455 of yacc.c  */
 #line 8738 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("where"),(yyvsp[(2) - (2)].str));
@@ -38711,8 +36328,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1425:
-
-/* Line 1455 of yacc.c  */
 #line 8742 "preproc.y"
     {
 		char *cursor_marker = (yyvsp[(4) - (4)].str)[0] == ':' ? mm_strdup("$0") : (yyvsp[(4) - (4)].str);
@@ -38721,16 +36336,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1426:
-
-/* Line 1455 of yacc.c  */
 #line 8747 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1427:
-
-/* Line 1455 of yacc.c  */
 #line 8754 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38738,16 +36349,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1428:
-
-/* Line 1455 of yacc.c  */
 #line 8758 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1429:
-
-/* Line 1455 of yacc.c  */
 #line 8765 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38755,8 +36362,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1430:
-
-/* Line 1455 of yacc.c  */
 #line 8769 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -38764,8 +36369,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1431:
-
-/* Line 1455 of yacc.c  */
 #line 8777 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -38773,22 +36376,16 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1432:
-
-/* Line 1455 of yacc.c  */
 #line 8785 "preproc.y"
     {	(yyval.str) = cat2_str((yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].index).str); ;}
     break;
 
   case 1433:
-
-/* Line 1455 of yacc.c  */
 #line 8787 "preproc.y"
     {	(yyval.str) = cat_str(3, mm_strdup("setof"), (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].index).str); ;}
     break;
 
   case 1434:
-
-/* Line 1455 of yacc.c  */
 #line 8789 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (5)].str),mm_strdup("array ["),(yyvsp[(4) - (5)].str),mm_strdup("]"));
@@ -38796,8 +36393,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1435:
-
-/* Line 1455 of yacc.c  */
 #line 8793 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("setof"),(yyvsp[(2) - (6)].str),mm_strdup("array ["),(yyvsp[(5) - (6)].str),mm_strdup("]"));
@@ -38805,8 +36400,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1436:
-
-/* Line 1455 of yacc.c  */
 #line 8797 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),mm_strdup("array"));
@@ -38814,8 +36407,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1437:
-
-/* Line 1455 of yacc.c  */
 #line 8801 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("setof"),(yyvsp[(2) - (3)].str),mm_strdup("array"));
@@ -38823,8 +36414,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1438:
-
-/* Line 1455 of yacc.c  */
 #line 8809 "preproc.y"
     {
 		(yyval.index).index1 = (yyvsp[(1) - (3)].index).index1;
@@ -38838,8 +36427,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1439:
-
-/* Line 1455 of yacc.c  */
 #line 8819 "preproc.y"
     {
 		(yyval.index).index1 = (yyvsp[(1) - (4)].index).index1;
@@ -38853,8 +36440,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1440:
-
-/* Line 1455 of yacc.c  */
 #line 8829 "preproc.y"
     {
 		(yyval.index).index1 = mm_strdup("-1");
@@ -38864,8 +36449,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1441:
-
-/* Line 1455 of yacc.c  */
 #line 8839 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38873,8 +36456,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1442:
-
-/* Line 1455 of yacc.c  */
 #line 8843 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38882,8 +36463,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1443:
-
-/* Line 1455 of yacc.c  */
 #line 8847 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38891,8 +36470,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1444:
-
-/* Line 1455 of yacc.c  */
 #line 8851 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38900,8 +36477,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1445:
-
-/* Line 1455 of yacc.c  */
 #line 8855 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38909,8 +36484,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1446:
-
-/* Line 1455 of yacc.c  */
 #line 8859 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -38918,8 +36491,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1447:
-
-/* Line 1455 of yacc.c  */
 #line 8863 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),mm_strdup("("),(yyvsp[(3) - (5)].str),mm_strdup(")"),(yyvsp[(5) - (5)].str));
@@ -38927,8 +36498,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1448:
-
-/* Line 1455 of yacc.c  */
 #line 8871 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38936,8 +36505,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1449:
-
-/* Line 1455 of yacc.c  */
 #line 8875 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38945,8 +36512,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1450:
-
-/* Line 1455 of yacc.c  */
 #line 8879 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38954,8 +36519,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1451:
-
-/* Line 1455 of yacc.c  */
 #line 8883 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -38963,8 +36526,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1452:
-
-/* Line 1455 of yacc.c  */
 #line 8891 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -38972,8 +36533,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1453:
-
-/* Line 1455 of yacc.c  */
 #line 8895 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -38981,8 +36540,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1454:
-
-/* Line 1455 of yacc.c  */
 #line 8903 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -38990,16 +36547,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1455:
-
-/* Line 1455 of yacc.c  */
 #line 8907 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1456:
-
-/* Line 1455 of yacc.c  */
 #line 8914 "preproc.y"
     { 
  (yyval.str) = mm_strdup("int");
@@ -39007,8 +36560,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1457:
-
-/* Line 1455 of yacc.c  */
 #line 8918 "preproc.y"
     { 
  (yyval.str) = mm_strdup("integer");
@@ -39016,8 +36567,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1458:
-
-/* Line 1455 of yacc.c  */
 #line 8922 "preproc.y"
     { 
  (yyval.str) = mm_strdup("smallint");
@@ -39025,8 +36574,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1459:
-
-/* Line 1455 of yacc.c  */
 #line 8926 "preproc.y"
     { 
  (yyval.str) = mm_strdup("bigint");
@@ -39034,8 +36581,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1460:
-
-/* Line 1455 of yacc.c  */
 #line 8930 "preproc.y"
     { 
  (yyval.str) = mm_strdup("real");
@@ -39043,8 +36588,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1461:
-
-/* Line 1455 of yacc.c  */
 #line 8934 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("float"),(yyvsp[(2) - (2)].str));
@@ -39052,8 +36595,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1462:
-
-/* Line 1455 of yacc.c  */
 #line 8938 "preproc.y"
     { 
  (yyval.str) = mm_strdup("double precision");
@@ -39061,8 +36602,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1463:
-
-/* Line 1455 of yacc.c  */
 #line 8942 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("decimal"),(yyvsp[(2) - (2)].str));
@@ -39070,8 +36609,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1464:
-
-/* Line 1455 of yacc.c  */
 #line 8946 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("dec"),(yyvsp[(2) - (2)].str));
@@ -39079,8 +36616,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1465:
-
-/* Line 1455 of yacc.c  */
 #line 8950 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("numeric"),(yyvsp[(2) - (2)].str));
@@ -39088,8 +36623,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1466:
-
-/* Line 1455 of yacc.c  */
 #line 8954 "preproc.y"
     { 
  (yyval.str) = mm_strdup("boolean");
@@ -39097,8 +36630,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1467:
-
-/* Line 1455 of yacc.c  */
 #line 8962 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -39106,16 +36637,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1468:
-
-/* Line 1455 of yacc.c  */
 #line 8966 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1469:
-
-/* Line 1455 of yacc.c  */
 #line 8973 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -39123,8 +36650,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1470:
-
-/* Line 1455 of yacc.c  */
 #line 8977 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -39132,8 +36657,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1471:
-
-/* Line 1455 of yacc.c  */
 #line 8985 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -39141,8 +36664,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1472:
-
-/* Line 1455 of yacc.c  */
 #line 8989 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -39150,8 +36671,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1473:
-
-/* Line 1455 of yacc.c  */
 #line 8997 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("bit"),(yyvsp[(2) - (5)].str),mm_strdup("("),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -39159,8 +36678,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1474:
-
-/* Line 1455 of yacc.c  */
 #line 9005 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("bit"),(yyvsp[(2) - (2)].str));
@@ -39168,8 +36685,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1475:
-
-/* Line 1455 of yacc.c  */
 #line 9013 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -39177,8 +36692,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1476:
-
-/* Line 1455 of yacc.c  */
 #line 9017 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -39186,8 +36699,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1477:
-
-/* Line 1455 of yacc.c  */
 #line 9025 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -39195,8 +36706,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1478:
-
-/* Line 1455 of yacc.c  */
 #line 9029 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -39204,8 +36713,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1479:
-
-/* Line 1455 of yacc.c  */
 #line 9037 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),mm_strdup("("),(yyvsp[(3) - (5)].str),mm_strdup(")"),(yyvsp[(5) - (5)].str));
@@ -39213,8 +36720,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1480:
-
-/* Line 1455 of yacc.c  */
 #line 9045 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -39222,8 +36727,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1481:
-
-/* Line 1455 of yacc.c  */
 #line 9053 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("character"),(yyvsp[(2) - (2)].str));
@@ -39231,8 +36734,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1482:
-
-/* Line 1455 of yacc.c  */
 #line 9057 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("char"),(yyvsp[(2) - (2)].str));
@@ -39240,8 +36741,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1483:
-
-/* Line 1455 of yacc.c  */
 #line 9061 "preproc.y"
     { 
  (yyval.str) = mm_strdup("varchar");
@@ -39249,8 +36748,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1484:
-
-/* Line 1455 of yacc.c  */
 #line 9065 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("national character"),(yyvsp[(3) - (3)].str));
@@ -39258,8 +36755,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1485:
-
-/* Line 1455 of yacc.c  */
 #line 9069 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("national char"),(yyvsp[(3) - (3)].str));
@@ -39267,8 +36762,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1486:
-
-/* Line 1455 of yacc.c  */
 #line 9073 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("nchar"),(yyvsp[(2) - (2)].str));
@@ -39276,8 +36769,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1487:
-
-/* Line 1455 of yacc.c  */
 #line 9081 "preproc.y"
     { 
  (yyval.str) = mm_strdup("varying");
@@ -39285,16 +36776,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1488:
-
-/* Line 1455 of yacc.c  */
 #line 9085 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1489:
-
-/* Line 1455 of yacc.c  */
 #line 9092 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("character set"),(yyvsp[(3) - (3)].str));
@@ -39302,16 +36789,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1490:
-
-/* Line 1455 of yacc.c  */
 #line 9096 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1491:
-
-/* Line 1455 of yacc.c  */
 #line 9103 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("timestamp ("),(yyvsp[(3) - (5)].str),mm_strdup(")"),(yyvsp[(5) - (5)].str));
@@ -39319,8 +36802,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1492:
-
-/* Line 1455 of yacc.c  */
 #line 9107 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("timestamp"),(yyvsp[(2) - (2)].str));
@@ -39328,8 +36809,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1493:
-
-/* Line 1455 of yacc.c  */
 #line 9111 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("time ("),(yyvsp[(3) - (5)].str),mm_strdup(")"),(yyvsp[(5) - (5)].str));
@@ -39337,8 +36816,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1494:
-
-/* Line 1455 of yacc.c  */
 #line 9115 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("time"),(yyvsp[(2) - (2)].str));
@@ -39346,8 +36823,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1495:
-
-/* Line 1455 of yacc.c  */
 #line 9123 "preproc.y"
     { 
  (yyval.str) = mm_strdup("interval");
@@ -39355,8 +36830,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1496:
-
-/* Line 1455 of yacc.c  */
 #line 9131 "preproc.y"
     { 
  (yyval.str) = mm_strdup("with time zone");
@@ -39364,8 +36837,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1497:
-
-/* Line 1455 of yacc.c  */
 #line 9135 "preproc.y"
     { 
  (yyval.str) = mm_strdup("without time zone");
@@ -39373,16 +36844,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1498:
-
-/* Line 1455 of yacc.c  */
 #line 9139 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1499:
-
-/* Line 1455 of yacc.c  */
 #line 9146 "preproc.y"
     { 
  (yyval.str) = mm_strdup("year");
@@ -39390,8 +36857,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1500:
-
-/* Line 1455 of yacc.c  */
 #line 9150 "preproc.y"
     { 
  (yyval.str) = mm_strdup("month");
@@ -39399,8 +36864,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1501:
-
-/* Line 1455 of yacc.c  */
 #line 9154 "preproc.y"
     { 
  (yyval.str) = mm_strdup("day");
@@ -39408,8 +36871,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1502:
-
-/* Line 1455 of yacc.c  */
 #line 9158 "preproc.y"
     { 
  (yyval.str) = mm_strdup("hour");
@@ -39417,8 +36878,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1503:
-
-/* Line 1455 of yacc.c  */
 #line 9162 "preproc.y"
     { 
  (yyval.str) = mm_strdup("minute");
@@ -39426,8 +36885,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1504:
-
-/* Line 1455 of yacc.c  */
 #line 9166 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -39435,8 +36892,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1505:
-
-/* Line 1455 of yacc.c  */
 #line 9170 "preproc.y"
     { 
  (yyval.str) = mm_strdup("year to month");
@@ -39444,8 +36899,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1506:
-
-/* Line 1455 of yacc.c  */
 #line 9174 "preproc.y"
     { 
  (yyval.str) = mm_strdup("day to hour");
@@ -39453,8 +36906,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1507:
-
-/* Line 1455 of yacc.c  */
 #line 9178 "preproc.y"
     { 
  (yyval.str) = mm_strdup("day to minute");
@@ -39462,8 +36913,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1508:
-
-/* Line 1455 of yacc.c  */
 #line 9182 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("day to"),(yyvsp[(3) - (3)].str));
@@ -39471,8 +36920,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1509:
-
-/* Line 1455 of yacc.c  */
 #line 9186 "preproc.y"
     { 
  (yyval.str) = mm_strdup("hour to minute");
@@ -39480,8 +36927,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1510:
-
-/* Line 1455 of yacc.c  */
 #line 9190 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("hour to"),(yyvsp[(3) - (3)].str));
@@ -39489,8 +36934,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1511:
-
-/* Line 1455 of yacc.c  */
 #line 9194 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("minute to"),(yyvsp[(3) - (3)].str));
@@ -39498,16 +36941,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1512:
-
-/* Line 1455 of yacc.c  */
 #line 9198 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1513:
-
-/* Line 1455 of yacc.c  */
 #line 9205 "preproc.y"
     { 
  (yyval.str) = mm_strdup("second");
@@ -39515,8 +36954,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1514:
-
-/* Line 1455 of yacc.c  */
 #line 9209 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("second ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -39524,8 +36961,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1515:
-
-/* Line 1455 of yacc.c  */
 #line 9217 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -39533,8 +36968,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1516:
-
-/* Line 1455 of yacc.c  */
 #line 9221 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("::"),(yyvsp[(3) - (3)].str));
@@ -39542,8 +36975,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1517:
-
-/* Line 1455 of yacc.c  */
 #line 9225 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("collate"),(yyvsp[(3) - (3)].str));
@@ -39551,8 +36982,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1518:
-
-/* Line 1455 of yacc.c  */
 #line 9229 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (5)].str),mm_strdup("at time zone"),(yyvsp[(5) - (5)].str));
@@ -39560,8 +36989,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1519:
-
-/* Line 1455 of yacc.c  */
 #line 9233 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[(2) - (2)].str));
@@ -39569,8 +36996,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1520:
-
-/* Line 1455 of yacc.c  */
 #line 9237 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[(2) - (2)].str));
@@ -39578,8 +37003,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1521:
-
-/* Line 1455 of yacc.c  */
 #line 9241 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("+"),(yyvsp[(3) - (3)].str));
@@ -39587,8 +37010,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1522:
-
-/* Line 1455 of yacc.c  */
 #line 9245 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("-"),(yyvsp[(3) - (3)].str));
@@ -39596,8 +37017,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1523:
-
-/* Line 1455 of yacc.c  */
 #line 9249 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("*"),(yyvsp[(3) - (3)].str));
@@ -39605,8 +37024,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1524:
-
-/* Line 1455 of yacc.c  */
 #line 9253 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("/"),(yyvsp[(3) - (3)].str));
@@ -39614,8 +37031,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1525:
-
-/* Line 1455 of yacc.c  */
 #line 9257 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("%"),(yyvsp[(3) - (3)].str));
@@ -39623,8 +37038,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1526:
-
-/* Line 1455 of yacc.c  */
 #line 9261 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("^"),(yyvsp[(3) - (3)].str));
@@ -39632,8 +37045,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1527:
-
-/* Line 1455 of yacc.c  */
 #line 9265 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("<"),(yyvsp[(3) - (3)].str));
@@ -39641,8 +37052,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1528:
-
-/* Line 1455 of yacc.c  */
 #line 9269 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(">"),(yyvsp[(3) - (3)].str));
@@ -39650,8 +37059,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1529:
-
-/* Line 1455 of yacc.c  */
 #line 9273 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("="),(yyvsp[(3) - (3)].str));
@@ -39659,8 +37066,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1530:
-
-/* Line 1455 of yacc.c  */
 #line 9277 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -39668,8 +37073,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1531:
-
-/* Line 1455 of yacc.c  */
 #line 9281 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -39677,8 +37080,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1532:
-
-/* Line 1455 of yacc.c  */
 #line 9285 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -39686,8 +37087,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1533:
-
-/* Line 1455 of yacc.c  */
 #line 9289 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("and"),(yyvsp[(3) - (3)].str));
@@ -39695,8 +37094,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1534:
-
-/* Line 1455 of yacc.c  */
 #line 9293 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("or"),(yyvsp[(3) - (3)].str));
@@ -39704,8 +37101,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1535:
-
-/* Line 1455 of yacc.c  */
 #line 9297 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("not"),(yyvsp[(2) - (2)].str));
@@ -39713,8 +37108,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1536:
-
-/* Line 1455 of yacc.c  */
 #line 9301 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("like"),(yyvsp[(3) - (3)].str));
@@ -39722,8 +37115,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1537:
-
-/* Line 1455 of yacc.c  */
 #line 9305 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),mm_strdup("like"),(yyvsp[(3) - (5)].str),mm_strdup("escape"),(yyvsp[(5) - (5)].str));
@@ -39731,8 +37122,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1538:
-
-/* Line 1455 of yacc.c  */
 #line 9309 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (4)].str),mm_strdup("not like"),(yyvsp[(4) - (4)].str));
@@ -39740,8 +37129,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1539:
-
-/* Line 1455 of yacc.c  */
 #line 9313 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (6)].str),mm_strdup("not like"),(yyvsp[(4) - (6)].str),mm_strdup("escape"),(yyvsp[(6) - (6)].str));
@@ -39749,8 +37136,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1540:
-
-/* Line 1455 of yacc.c  */
 #line 9317 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("ilike"),(yyvsp[(3) - (3)].str));
@@ -39758,8 +37143,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1541:
-
-/* Line 1455 of yacc.c  */
 #line 9321 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),mm_strdup("ilike"),(yyvsp[(3) - (5)].str),mm_strdup("escape"),(yyvsp[(5) - (5)].str));
@@ -39767,8 +37150,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1542:
-
-/* Line 1455 of yacc.c  */
 #line 9325 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (4)].str),mm_strdup("not ilike"),(yyvsp[(4) - (4)].str));
@@ -39776,8 +37157,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1543:
-
-/* Line 1455 of yacc.c  */
 #line 9329 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (6)].str),mm_strdup("not ilike"),(yyvsp[(4) - (6)].str),mm_strdup("escape"),(yyvsp[(6) - (6)].str));
@@ -39785,8 +37164,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1544:
-
-/* Line 1455 of yacc.c  */
 #line 9333 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (4)].str),mm_strdup("similar to"),(yyvsp[(4) - (4)].str));
@@ -39794,8 +37171,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1545:
-
-/* Line 1455 of yacc.c  */
 #line 9337 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (6)].str),mm_strdup("similar to"),(yyvsp[(4) - (6)].str),mm_strdup("escape"),(yyvsp[(6) - (6)].str));
@@ -39803,8 +37178,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1546:
-
-/* Line 1455 of yacc.c  */
 #line 9341 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (5)].str),mm_strdup("not similar to"),(yyvsp[(5) - (5)].str));
@@ -39812,8 +37185,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1547:
-
-/* Line 1455 of yacc.c  */
 #line 9345 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (7)].str),mm_strdup("not similar to"),(yyvsp[(5) - (7)].str),mm_strdup("escape"),(yyvsp[(7) - (7)].str));
@@ -39821,8 +37192,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1548:
-
-/* Line 1455 of yacc.c  */
 #line 9349 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (3)].str),mm_strdup("is null"));
@@ -39830,8 +37199,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1549:
-
-/* Line 1455 of yacc.c  */
 #line 9353 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),mm_strdup("isnull"));
@@ -39839,8 +37206,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1550:
-
-/* Line 1455 of yacc.c  */
 #line 9357 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (4)].str),mm_strdup("is not null"));
@@ -39848,8 +37213,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1551:
-
-/* Line 1455 of yacc.c  */
 #line 9361 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),mm_strdup("notnull"));
@@ -39857,8 +37220,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1552:
-
-/* Line 1455 of yacc.c  */
 #line 9365 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("overlaps"),(yyvsp[(3) - (3)].str));
@@ -39866,8 +37227,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1553:
-
-/* Line 1455 of yacc.c  */
 #line 9369 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (3)].str),mm_strdup("is true"));
@@ -39875,8 +37234,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1554:
-
-/* Line 1455 of yacc.c  */
 #line 9373 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (4)].str),mm_strdup("is not true"));
@@ -39884,8 +37241,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1555:
-
-/* Line 1455 of yacc.c  */
 #line 9377 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (3)].str),mm_strdup("is false"));
@@ -39893,8 +37248,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1556:
-
-/* Line 1455 of yacc.c  */
 #line 9381 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (4)].str),mm_strdup("is not false"));
@@ -39902,8 +37255,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1557:
-
-/* Line 1455 of yacc.c  */
 #line 9385 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (3)].str),mm_strdup("is unknown"));
@@ -39911,8 +37262,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1558:
-
-/* Line 1455 of yacc.c  */
 #line 9389 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (4)].str),mm_strdup("is not unknown"));
@@ -39920,8 +37269,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1559:
-
-/* Line 1455 of yacc.c  */
 #line 9393 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (5)].str),mm_strdup("is distinct from"),(yyvsp[(5) - (5)].str));
@@ -39929,8 +37276,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1560:
-
-/* Line 1455 of yacc.c  */
 #line 9397 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (6)].str),mm_strdup("is not distinct from"),(yyvsp[(6) - (6)].str));
@@ -39938,8 +37283,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1561:
-
-/* Line 1455 of yacc.c  */
 #line 9401 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (6)].str),mm_strdup("is of ("),(yyvsp[(5) - (6)].str),mm_strdup(")"));
@@ -39947,8 +37290,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1562:
-
-/* Line 1455 of yacc.c  */
 #line 9405 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (7)].str),mm_strdup("is not of ("),(yyvsp[(6) - (7)].str),mm_strdup(")"));
@@ -39956,8 +37297,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1563:
-
-/* Line 1455 of yacc.c  */
 #line 9409 "preproc.y"
     { 
  (yyval.str) = cat_str(6,(yyvsp[(1) - (6)].str),mm_strdup("between"),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup("and"),(yyvsp[(6) - (6)].str));
@@ -39965,8 +37304,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1564:
-
-/* Line 1455 of yacc.c  */
 #line 9413 "preproc.y"
     { 
  (yyval.str) = cat_str(6,(yyvsp[(1) - (7)].str),mm_strdup("not between"),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),mm_strdup("and"),(yyvsp[(7) - (7)].str));
@@ -39974,8 +37311,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1565:
-
-/* Line 1455 of yacc.c  */
 #line 9417 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (6)].str),mm_strdup("between symmetric"),(yyvsp[(4) - (6)].str),mm_strdup("and"),(yyvsp[(6) - (6)].str));
@@ -39983,8 +37318,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1566:
-
-/* Line 1455 of yacc.c  */
 #line 9421 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (7)].str),mm_strdup("not between symmetric"),(yyvsp[(5) - (7)].str),mm_strdup("and"),(yyvsp[(7) - (7)].str));
@@ -39992,8 +37325,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1567:
-
-/* Line 1455 of yacc.c  */
 #line 9425 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("in"),(yyvsp[(3) - (3)].str));
@@ -40001,8 +37332,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1568:
-
-/* Line 1455 of yacc.c  */
 #line 9429 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (4)].str),mm_strdup("not in"),(yyvsp[(4) - (4)].str));
@@ -40010,8 +37339,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1569:
-
-/* Line 1455 of yacc.c  */
 #line 9433 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (4)].str),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -40019,8 +37346,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1570:
-
-/* Line 1455 of yacc.c  */
 #line 9437 "preproc.y"
     { 
  (yyval.str) = cat_str(6,(yyvsp[(1) - (6)].str),(yyvsp[(2) - (6)].str),(yyvsp[(3) - (6)].str),mm_strdup("("),(yyvsp[(5) - (6)].str),mm_strdup(")"));
@@ -40028,8 +37353,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1571:
-
-/* Line 1455 of yacc.c  */
 #line 9441 "preproc.y"
     { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
@@ -40038,8 +37361,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1572:
-
-/* Line 1455 of yacc.c  */
 #line 9446 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (3)].str),mm_strdup("is document"));
@@ -40047,8 +37368,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1573:
-
-/* Line 1455 of yacc.c  */
 #line 9450 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (4)].str),mm_strdup("is not document"));
@@ -40056,8 +37375,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1574:
-
-/* Line 1455 of yacc.c  */
 #line 9458 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -40065,8 +37382,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1575:
-
-/* Line 1455 of yacc.c  */
 #line 9462 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("::"),(yyvsp[(3) - (3)].str));
@@ -40074,8 +37389,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1576:
-
-/* Line 1455 of yacc.c  */
 #line 9466 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[(2) - (2)].str));
@@ -40083,8 +37396,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1577:
-
-/* Line 1455 of yacc.c  */
 #line 9470 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[(2) - (2)].str));
@@ -40092,8 +37403,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1578:
-
-/* Line 1455 of yacc.c  */
 #line 9474 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("+"),(yyvsp[(3) - (3)].str));
@@ -40101,8 +37410,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1579:
-
-/* Line 1455 of yacc.c  */
 #line 9478 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("-"),(yyvsp[(3) - (3)].str));
@@ -40110,8 +37417,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1580:
-
-/* Line 1455 of yacc.c  */
 #line 9482 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("*"),(yyvsp[(3) - (3)].str));
@@ -40119,8 +37424,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1581:
-
-/* Line 1455 of yacc.c  */
 #line 9486 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("/"),(yyvsp[(3) - (3)].str));
@@ -40128,8 +37431,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1582:
-
-/* Line 1455 of yacc.c  */
 #line 9490 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("%"),(yyvsp[(3) - (3)].str));
@@ -40137,8 +37438,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1583:
-
-/* Line 1455 of yacc.c  */
 #line 9494 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("^"),(yyvsp[(3) - (3)].str));
@@ -40146,8 +37445,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1584:
-
-/* Line 1455 of yacc.c  */
 #line 9498 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("<"),(yyvsp[(3) - (3)].str));
@@ -40155,8 +37452,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1585:
-
-/* Line 1455 of yacc.c  */
 #line 9502 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(">"),(yyvsp[(3) - (3)].str));
@@ -40164,8 +37459,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1586:
-
-/* Line 1455 of yacc.c  */
 #line 9506 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("="),(yyvsp[(3) - (3)].str));
@@ -40173,8 +37466,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1587:
-
-/* Line 1455 of yacc.c  */
 #line 9510 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -40182,8 +37473,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1588:
-
-/* Line 1455 of yacc.c  */
 #line 9514 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -40191,8 +37480,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1589:
-
-/* Line 1455 of yacc.c  */
 #line 9518 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -40200,8 +37487,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1590:
-
-/* Line 1455 of yacc.c  */
 #line 9522 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (5)].str),mm_strdup("is distinct from"),(yyvsp[(5) - (5)].str));
@@ -40209,8 +37494,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1591:
-
-/* Line 1455 of yacc.c  */
 #line 9526 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (6)].str),mm_strdup("is not distinct from"),(yyvsp[(6) - (6)].str));
@@ -40218,8 +37501,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1592:
-
-/* Line 1455 of yacc.c  */
 #line 9530 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (6)].str),mm_strdup("is of ("),(yyvsp[(5) - (6)].str),mm_strdup(")"));
@@ -40227,8 +37508,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1593:
-
-/* Line 1455 of yacc.c  */
 #line 9534 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (7)].str),mm_strdup("is not of ("),(yyvsp[(6) - (7)].str),mm_strdup(")"));
@@ -40236,8 +37515,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1594:
-
-/* Line 1455 of yacc.c  */
 #line 9538 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (3)].str),mm_strdup("is document"));
@@ -40245,8 +37522,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1595:
-
-/* Line 1455 of yacc.c  */
 #line 9542 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (4)].str),mm_strdup("is not document"));
@@ -40254,8 +37529,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1596:
-
-/* Line 1455 of yacc.c  */
 #line 9550 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -40263,8 +37536,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1597:
-
-/* Line 1455 of yacc.c  */
 #line 9554 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -40272,8 +37543,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1598:
-
-/* Line 1455 of yacc.c  */
 #line 9558 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -40281,8 +37550,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1599:
-
-/* Line 1455 of yacc.c  */
 #line 9562 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("("),(yyvsp[(2) - (4)].str),mm_strdup(")"),(yyvsp[(4) - (4)].str));
@@ -40290,8 +37557,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1600:
-
-/* Line 1455 of yacc.c  */
 #line 9566 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -40299,8 +37564,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1601:
-
-/* Line 1455 of yacc.c  */
 #line 9570 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -40308,8 +37571,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1602:
-
-/* Line 1455 of yacc.c  */
 #line 9574 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -40317,8 +37578,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1603:
-
-/* Line 1455 of yacc.c  */
 #line 9578 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("exists"),(yyvsp[(2) - (2)].str));
@@ -40326,8 +37585,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1604:
-
-/* Line 1455 of yacc.c  */
 #line 9582 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("array"),(yyvsp[(2) - (2)].str));
@@ -40335,8 +37592,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1605:
-
-/* Line 1455 of yacc.c  */
 #line 9586 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("array"),(yyvsp[(2) - (2)].str));
@@ -40344,8 +37599,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1606:
-
-/* Line 1455 of yacc.c  */
 #line 9590 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -40353,8 +37606,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1607:
-
-/* Line 1455 of yacc.c  */
 #line 9598 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (4)].str),mm_strdup("( )"),(yyvsp[(4) - (4)].str));
@@ -40362,8 +37613,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1608:
-
-/* Line 1455 of yacc.c  */
 #line 9602 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),mm_strdup("("),(yyvsp[(3) - (5)].str),mm_strdup(")"),(yyvsp[(5) - (5)].str));
@@ -40371,8 +37620,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1609:
-
-/* Line 1455 of yacc.c  */
 #line 9606 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (6)].str),mm_strdup("( variadic"),(yyvsp[(4) - (6)].str),mm_strdup(")"),(yyvsp[(6) - (6)].str));
@@ -40380,8 +37627,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1610:
-
-/* Line 1455 of yacc.c  */
 #line 9610 "preproc.y"
     { 
  (yyval.str) = cat_str(7,(yyvsp[(1) - (8)].str),mm_strdup("("),(yyvsp[(3) - (8)].str),mm_strdup(", variadic"),(yyvsp[(6) - (8)].str),mm_strdup(")"),(yyvsp[(8) - (8)].str));
@@ -40389,8 +37634,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1611:
-
-/* Line 1455 of yacc.c  */
 #line 9614 "preproc.y"
     { 
  (yyval.str) = cat_str(6,(yyvsp[(1) - (6)].str),mm_strdup("("),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),mm_strdup(")"),(yyvsp[(6) - (6)].str));
@@ -40398,8 +37641,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1612:
-
-/* Line 1455 of yacc.c  */
 #line 9618 "preproc.y"
     { 
  (yyval.str) = cat_str(6,(yyvsp[(1) - (7)].str),mm_strdup("( all"),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),mm_strdup(")"),(yyvsp[(7) - (7)].str));
@@ -40407,8 +37648,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1613:
-
-/* Line 1455 of yacc.c  */
 #line 9622 "preproc.y"
     { 
  (yyval.str) = cat_str(6,(yyvsp[(1) - (7)].str),mm_strdup("( distinct"),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),mm_strdup(")"),(yyvsp[(7) - (7)].str));
@@ -40416,8 +37655,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1614:
-
-/* Line 1455 of yacc.c  */
 #line 9626 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (5)].str),mm_strdup("( * )"),(yyvsp[(5) - (5)].str));
@@ -40425,8 +37662,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1615:
-
-/* Line 1455 of yacc.c  */
 #line 9630 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_date");
@@ -40434,8 +37669,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1616:
-
-/* Line 1455 of yacc.c  */
 #line 9634 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_time");
@@ -40443,8 +37676,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1617:
-
-/* Line 1455 of yacc.c  */
 #line 9638 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("current_time ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40452,8 +37683,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1618:
-
-/* Line 1455 of yacc.c  */
 #line 9642 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_timestamp");
@@ -40461,8 +37690,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1619:
-
-/* Line 1455 of yacc.c  */
 #line 9646 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("current_timestamp ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40470,8 +37697,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1620:
-
-/* Line 1455 of yacc.c  */
 #line 9650 "preproc.y"
     { 
  (yyval.str) = mm_strdup("localtime");
@@ -40479,8 +37704,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1621:
-
-/* Line 1455 of yacc.c  */
 #line 9654 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("localtime ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40488,8 +37711,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1622:
-
-/* Line 1455 of yacc.c  */
 #line 9658 "preproc.y"
     { 
  (yyval.str) = mm_strdup("localtimestamp");
@@ -40497,8 +37718,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1623:
-
-/* Line 1455 of yacc.c  */
 #line 9662 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("localtimestamp ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40506,8 +37725,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1624:
-
-/* Line 1455 of yacc.c  */
 #line 9666 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_role");
@@ -40515,8 +37732,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1625:
-
-/* Line 1455 of yacc.c  */
 #line 9670 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_user");
@@ -40524,8 +37739,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1626:
-
-/* Line 1455 of yacc.c  */
 #line 9674 "preproc.y"
     { 
  (yyval.str) = mm_strdup("session_user");
@@ -40533,8 +37746,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1627:
-
-/* Line 1455 of yacc.c  */
 #line 9678 "preproc.y"
     { 
  (yyval.str) = mm_strdup("user");
@@ -40542,8 +37753,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1628:
-
-/* Line 1455 of yacc.c  */
 #line 9682 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_catalog");
@@ -40551,8 +37760,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1629:
-
-/* Line 1455 of yacc.c  */
 #line 9686 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_schema");
@@ -40560,8 +37767,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1630:
-
-/* Line 1455 of yacc.c  */
 #line 9690 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("cast ("),(yyvsp[(3) - (6)].str),mm_strdup("as"),(yyvsp[(5) - (6)].str),mm_strdup(")"));
@@ -40569,8 +37774,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1631:
-
-/* Line 1455 of yacc.c  */
 #line 9694 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("extract ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40578,8 +37781,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1632:
-
-/* Line 1455 of yacc.c  */
 #line 9698 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("overlay ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40587,8 +37788,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1633:
-
-/* Line 1455 of yacc.c  */
 #line 9702 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("position ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40596,8 +37795,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1634:
-
-/* Line 1455 of yacc.c  */
 #line 9706 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("substring ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40605,8 +37802,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1635:
-
-/* Line 1455 of yacc.c  */
 #line 9710 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("treat ("),(yyvsp[(3) - (6)].str),mm_strdup("as"),(yyvsp[(5) - (6)].str),mm_strdup(")"));
@@ -40614,8 +37809,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1636:
-
-/* Line 1455 of yacc.c  */
 #line 9714 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("trim ( both"),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -40623,8 +37816,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1637:
-
-/* Line 1455 of yacc.c  */
 #line 9718 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("trim ( leading"),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -40632,8 +37823,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1638:
-
-/* Line 1455 of yacc.c  */
 #line 9722 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("trim ( trailing"),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -40641,8 +37830,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1639:
-
-/* Line 1455 of yacc.c  */
 #line 9726 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("trim ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40650,8 +37837,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1640:
-
-/* Line 1455 of yacc.c  */
 #line 9730 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("nullif ("),(yyvsp[(3) - (6)].str),mm_strdup(","),(yyvsp[(5) - (6)].str),mm_strdup(")"));
@@ -40659,8 +37844,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1641:
-
-/* Line 1455 of yacc.c  */
 #line 9734 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("coalesce ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40668,8 +37851,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1642:
-
-/* Line 1455 of yacc.c  */
 #line 9738 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("greatest ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40677,8 +37858,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1643:
-
-/* Line 1455 of yacc.c  */
 #line 9742 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("least ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40686,8 +37865,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1644:
-
-/* Line 1455 of yacc.c  */
 #line 9746 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("xmlconcat ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40695,8 +37872,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1645:
-
-/* Line 1455 of yacc.c  */
 #line 9750 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("xmlelement ( name"),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -40704,8 +37879,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1646:
-
-/* Line 1455 of yacc.c  */
 #line 9754 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("xmlelement ( name"),(yyvsp[(4) - (7)].str),mm_strdup(","),(yyvsp[(6) - (7)].str),mm_strdup(")"));
@@ -40713,8 +37886,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1647:
-
-/* Line 1455 of yacc.c  */
 #line 9758 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("xmlelement ( name"),(yyvsp[(4) - (7)].str),mm_strdup(","),(yyvsp[(6) - (7)].str),mm_strdup(")"));
@@ -40722,8 +37893,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1648:
-
-/* Line 1455 of yacc.c  */
 #line 9762 "preproc.y"
     { 
  (yyval.str) = cat_str(7,mm_strdup("xmlelement ( name"),(yyvsp[(4) - (9)].str),mm_strdup(","),(yyvsp[(6) - (9)].str),mm_strdup(","),(yyvsp[(8) - (9)].str),mm_strdup(")"));
@@ -40731,8 +37900,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1649:
-
-/* Line 1455 of yacc.c  */
 #line 9766 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("xmlexists ("),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -40740,8 +37907,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1650:
-
-/* Line 1455 of yacc.c  */
 #line 9770 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("xmlforest ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40749,8 +37914,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1651:
-
-/* Line 1455 of yacc.c  */
 #line 9774 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("xmlparse ("),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),(yyvsp[(5) - (6)].str),mm_strdup(")"));
@@ -40758,8 +37921,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1652:
-
-/* Line 1455 of yacc.c  */
 #line 9778 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("xmlpi ( name"),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -40767,8 +37928,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1653:
-
-/* Line 1455 of yacc.c  */
 #line 9782 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("xmlpi ( name"),(yyvsp[(4) - (7)].str),mm_strdup(","),(yyvsp[(6) - (7)].str),mm_strdup(")"));
@@ -40776,8 +37935,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1654:
-
-/* Line 1455 of yacc.c  */
 #line 9786 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("xmlroot ("),(yyvsp[(3) - (7)].str),mm_strdup(","),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),mm_strdup(")"));
@@ -40785,8 +37942,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1655:
-
-/* Line 1455 of yacc.c  */
 #line 9790 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("xmlserialize ("),(yyvsp[(3) - (7)].str),(yyvsp[(4) - (7)].str),mm_strdup("as"),(yyvsp[(6) - (7)].str),mm_strdup(")"));
@@ -40794,8 +37949,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1656:
-
-/* Line 1455 of yacc.c  */
 #line 9798 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("version"),(yyvsp[(2) - (2)].str));
@@ -40803,8 +37956,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1657:
-
-/* Line 1455 of yacc.c  */
 #line 9802 "preproc.y"
     { 
  (yyval.str) = mm_strdup("version no value");
@@ -40812,8 +37963,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1658:
-
-/* Line 1455 of yacc.c  */
 #line 9810 "preproc.y"
     { 
  (yyval.str) = mm_strdup(", standalone yes");
@@ -40821,8 +37970,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1659:
-
-/* Line 1455 of yacc.c  */
 #line 9814 "preproc.y"
     { 
  (yyval.str) = mm_strdup(", standalone no");
@@ -40830,8 +37977,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1660:
-
-/* Line 1455 of yacc.c  */
 #line 9818 "preproc.y"
     { 
  (yyval.str) = mm_strdup(", standalone no value");
@@ -40839,16 +37984,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1661:
-
-/* Line 1455 of yacc.c  */
 #line 9822 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1662:
-
-/* Line 1455 of yacc.c  */
 #line 9829 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("xmlattributes ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -40856,8 +37997,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1663:
-
-/* Line 1455 of yacc.c  */
 #line 9837 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -40865,8 +38004,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1664:
-
-/* Line 1455 of yacc.c  */
 #line 9841 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -40874,8 +38011,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1665:
-
-/* Line 1455 of yacc.c  */
 #line 9849 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("as"),(yyvsp[(3) - (3)].str));
@@ -40883,8 +38018,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1666:
-
-/* Line 1455 of yacc.c  */
 #line 9853 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -40892,8 +38025,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1667:
-
-/* Line 1455 of yacc.c  */
 #line 9861 "preproc.y"
     { 
  (yyval.str) = mm_strdup("document");
@@ -40901,8 +38032,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1668:
-
-/* Line 1455 of yacc.c  */
 #line 9865 "preproc.y"
     { 
  (yyval.str) = mm_strdup("content");
@@ -40910,8 +38039,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1669:
-
-/* Line 1455 of yacc.c  */
 #line 9873 "preproc.y"
     { 
  (yyval.str) = mm_strdup("preserve whitespace");
@@ -40919,8 +38046,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1670:
-
-/* Line 1455 of yacc.c  */
 #line 9877 "preproc.y"
     { 
  (yyval.str) = mm_strdup("strip whitespace");
@@ -40928,16 +38053,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1671:
-
-/* Line 1455 of yacc.c  */
 #line 9881 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1672:
-
-/* Line 1455 of yacc.c  */
 #line 9888 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("passing"),(yyvsp[(2) - (2)].str));
@@ -40945,8 +38066,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1673:
-
-/* Line 1455 of yacc.c  */
 #line 9892 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("passing"),(yyvsp[(2) - (4)].str),mm_strdup("by ref"));
@@ -40954,8 +38073,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1674:
-
-/* Line 1455 of yacc.c  */
 #line 9896 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("passing by ref"),(yyvsp[(4) - (4)].str));
@@ -40963,8 +38080,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1675:
-
-/* Line 1455 of yacc.c  */
 #line 9900 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("passing by ref"),(yyvsp[(4) - (6)].str),mm_strdup("by ref"));
@@ -40972,8 +38087,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1676:
-
-/* Line 1455 of yacc.c  */
 #line 9908 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("window"),(yyvsp[(2) - (2)].str));
@@ -40981,16 +38094,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1677:
-
-/* Line 1455 of yacc.c  */
 #line 9912 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1678:
-
-/* Line 1455 of yacc.c  */
 #line 9919 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -40998,8 +38107,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1679:
-
-/* Line 1455 of yacc.c  */
 #line 9923 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -41007,8 +38114,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1680:
-
-/* Line 1455 of yacc.c  */
 #line 9931 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("as"),(yyvsp[(3) - (3)].str));
@@ -41016,8 +38121,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1681:
-
-/* Line 1455 of yacc.c  */
 #line 9939 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("over"),(yyvsp[(2) - (2)].str));
@@ -41025,8 +38128,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1682:
-
-/* Line 1455 of yacc.c  */
 #line 9943 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("over"),(yyvsp[(2) - (2)].str));
@@ -41034,16 +38135,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1683:
-
-/* Line 1455 of yacc.c  */
 #line 9947 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1684:
-
-/* Line 1455 of yacc.c  */
 #line 9954 "preproc.y"
     { 
  (yyval.str) = cat_str(6,mm_strdup("("),(yyvsp[(2) - (6)].str),(yyvsp[(3) - (6)].str),(yyvsp[(4) - (6)].str),(yyvsp[(5) - (6)].str),mm_strdup(")"));
@@ -41051,8 +38148,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1685:
-
-/* Line 1455 of yacc.c  */
 #line 9962 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41060,16 +38155,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1686:
-
-/* Line 1455 of yacc.c  */
 #line 9966 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1687:
-
-/* Line 1455 of yacc.c  */
 #line 9973 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("partition by"),(yyvsp[(3) - (3)].str));
@@ -41077,16 +38168,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1688:
-
-/* Line 1455 of yacc.c  */
 #line 9977 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1689:
-
-/* Line 1455 of yacc.c  */
 #line 9984 "preproc.y"
     { 
 mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");
@@ -41095,8 +38182,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1690:
-
-/* Line 1455 of yacc.c  */
 #line 9989 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("rows"),(yyvsp[(2) - (2)].str));
@@ -41104,16 +38189,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1691:
-
-/* Line 1455 of yacc.c  */
 #line 9993 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1692:
-
-/* Line 1455 of yacc.c  */
 #line 10000 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41121,8 +38202,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1693:
-
-/* Line 1455 of yacc.c  */
 #line 10004 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("between"),(yyvsp[(2) - (4)].str),mm_strdup("and"),(yyvsp[(4) - (4)].str));
@@ -41130,8 +38209,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1694:
-
-/* Line 1455 of yacc.c  */
 #line 10012 "preproc.y"
     { 
  (yyval.str) = mm_strdup("unbounded preceding");
@@ -41139,8 +38216,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1695:
-
-/* Line 1455 of yacc.c  */
 #line 10016 "preproc.y"
     { 
  (yyval.str) = mm_strdup("unbounded following");
@@ -41148,8 +38223,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1696:
-
-/* Line 1455 of yacc.c  */
 #line 10020 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current row");
@@ -41157,8 +38230,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1697:
-
-/* Line 1455 of yacc.c  */
 #line 10024 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),mm_strdup("preceding"));
@@ -41166,8 +38237,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1698:
-
-/* Line 1455 of yacc.c  */
 #line 10028 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),mm_strdup("following"));
@@ -41175,8 +38244,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1699:
-
-/* Line 1455 of yacc.c  */
 #line 10036 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("row ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -41184,8 +38251,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1700:
-
-/* Line 1455 of yacc.c  */
 #line 10040 "preproc.y"
     { 
  (yyval.str) = mm_strdup("row ( )");
@@ -41193,8 +38258,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1701:
-
-/* Line 1455 of yacc.c  */
 #line 10044 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("("),(yyvsp[(2) - (5)].str),mm_strdup(","),(yyvsp[(4) - (5)].str),mm_strdup(")"));
@@ -41202,8 +38265,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1702:
-
-/* Line 1455 of yacc.c  */
 #line 10052 "preproc.y"
     { 
  (yyval.str) = mm_strdup("any");
@@ -41211,8 +38272,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1703:
-
-/* Line 1455 of yacc.c  */
 #line 10056 "preproc.y"
     { 
  (yyval.str) = mm_strdup("some");
@@ -41220,8 +38279,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1704:
-
-/* Line 1455 of yacc.c  */
 #line 10060 "preproc.y"
     { 
  (yyval.str) = mm_strdup("all");
@@ -41229,8 +38286,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1705:
-
-/* Line 1455 of yacc.c  */
 #line 10068 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41238,8 +38293,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1706:
-
-/* Line 1455 of yacc.c  */
 #line 10072 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41247,8 +38300,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1707:
-
-/* Line 1455 of yacc.c  */
 #line 10080 "preproc.y"
     { 
  (yyval.str) = mm_strdup("+");
@@ -41256,8 +38307,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1708:
-
-/* Line 1455 of yacc.c  */
 #line 10084 "preproc.y"
     { 
  (yyval.str) = mm_strdup("-");
@@ -41265,8 +38314,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1709:
-
-/* Line 1455 of yacc.c  */
 #line 10088 "preproc.y"
     { 
  (yyval.str) = mm_strdup("*");
@@ -41274,8 +38321,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1710:
-
-/* Line 1455 of yacc.c  */
 #line 10092 "preproc.y"
     { 
  (yyval.str) = mm_strdup("/");
@@ -41283,8 +38328,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1711:
-
-/* Line 1455 of yacc.c  */
 #line 10096 "preproc.y"
     { 
  (yyval.str) = mm_strdup("%");
@@ -41292,8 +38335,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1712:
-
-/* Line 1455 of yacc.c  */
 #line 10100 "preproc.y"
     { 
  (yyval.str) = mm_strdup("^");
@@ -41301,8 +38342,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1713:
-
-/* Line 1455 of yacc.c  */
 #line 10104 "preproc.y"
     { 
  (yyval.str) = mm_strdup("<");
@@ -41310,8 +38349,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1714:
-
-/* Line 1455 of yacc.c  */
 #line 10108 "preproc.y"
     { 
  (yyval.str) = mm_strdup(">");
@@ -41319,8 +38356,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1715:
-
-/* Line 1455 of yacc.c  */
 #line 10112 "preproc.y"
     { 
  (yyval.str) = mm_strdup("=");
@@ -41328,8 +38363,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1716:
-
-/* Line 1455 of yacc.c  */
 #line 10120 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41337,8 +38370,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1717:
-
-/* Line 1455 of yacc.c  */
 #line 10124 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("operator ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -41346,8 +38377,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1718:
-
-/* Line 1455 of yacc.c  */
 #line 10132 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41355,8 +38384,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1719:
-
-/* Line 1455 of yacc.c  */
 #line 10136 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("operator ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -41364,8 +38391,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1720:
-
-/* Line 1455 of yacc.c  */
 #line 10144 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41373,8 +38398,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1721:
-
-/* Line 1455 of yacc.c  */
 #line 10148 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("operator ("),(yyvsp[(3) - (4)].str),mm_strdup(")"));
@@ -41382,8 +38405,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1722:
-
-/* Line 1455 of yacc.c  */
 #line 10152 "preproc.y"
     { 
  (yyval.str) = mm_strdup("like");
@@ -41391,8 +38412,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1723:
-
-/* Line 1455 of yacc.c  */
 #line 10156 "preproc.y"
     { 
  (yyval.str) = mm_strdup("not like");
@@ -41400,8 +38419,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1724:
-
-/* Line 1455 of yacc.c  */
 #line 10160 "preproc.y"
     { 
  (yyval.str) = mm_strdup("ilike");
@@ -41409,8 +38426,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1725:
-
-/* Line 1455 of yacc.c  */
 #line 10164 "preproc.y"
     { 
  (yyval.str) = mm_strdup("not ilike");
@@ -41418,8 +38433,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1726:
-
-/* Line 1455 of yacc.c  */
 #line 10172 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41427,8 +38440,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1727:
-
-/* Line 1455 of yacc.c  */
 #line 10176 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -41436,8 +38447,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1728:
-
-/* Line 1455 of yacc.c  */
 #line 10184 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41445,8 +38454,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1729:
-
-/* Line 1455 of yacc.c  */
 #line 10188 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -41454,8 +38461,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1730:
-
-/* Line 1455 of yacc.c  */
 #line 10196 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41463,8 +38468,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1731:
-
-/* Line 1455 of yacc.c  */
 #line 10200 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(":="),(yyvsp[(3) - (3)].str));
@@ -41472,8 +38475,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1732:
-
-/* Line 1455 of yacc.c  */
 #line 10208 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41481,8 +38482,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1733:
-
-/* Line 1455 of yacc.c  */
 #line 10212 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -41490,8 +38489,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1734:
-
-/* Line 1455 of yacc.c  */
 #line 10220 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("["),(yyvsp[(2) - (3)].str),mm_strdup("]"));
@@ -41499,8 +38496,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1735:
-
-/* Line 1455 of yacc.c  */
 #line 10224 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("["),(yyvsp[(2) - (3)].str),mm_strdup("]"));
@@ -41508,8 +38503,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1736:
-
-/* Line 1455 of yacc.c  */
 #line 10228 "preproc.y"
     { 
  (yyval.str) = mm_strdup("[ ]");
@@ -41517,8 +38510,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1737:
-
-/* Line 1455 of yacc.c  */
 #line 10236 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41526,8 +38517,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1738:
-
-/* Line 1455 of yacc.c  */
 #line 10240 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -41535,8 +38524,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1739:
-
-/* Line 1455 of yacc.c  */
 #line 10248 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("from"),(yyvsp[(3) - (3)].str));
@@ -41544,16 +38531,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1740:
-
-/* Line 1455 of yacc.c  */
 #line 10252 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1741:
-
-/* Line 1455 of yacc.c  */
 #line 10259 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41561,8 +38544,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1742:
-
-/* Line 1455 of yacc.c  */
 #line 10263 "preproc.y"
     { 
  (yyval.str) = mm_strdup("year");
@@ -41570,8 +38551,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1743:
-
-/* Line 1455 of yacc.c  */
 #line 10267 "preproc.y"
     { 
  (yyval.str) = mm_strdup("month");
@@ -41579,8 +38558,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1744:
-
-/* Line 1455 of yacc.c  */
 #line 10271 "preproc.y"
     { 
  (yyval.str) = mm_strdup("day");
@@ -41588,8 +38565,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1745:
-
-/* Line 1455 of yacc.c  */
 #line 10275 "preproc.y"
     { 
  (yyval.str) = mm_strdup("hour");
@@ -41597,8 +38572,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1746:
-
-/* Line 1455 of yacc.c  */
 #line 10279 "preproc.y"
     { 
  (yyval.str) = mm_strdup("minute");
@@ -41606,8 +38579,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1747:
-
-/* Line 1455 of yacc.c  */
 #line 10283 "preproc.y"
     { 
  (yyval.str) = mm_strdup("second");
@@ -41615,8 +38586,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1748:
-
-/* Line 1455 of yacc.c  */
 #line 10287 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41624,8 +38593,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1749:
-
-/* Line 1455 of yacc.c  */
 #line 10295 "preproc.y"
     { 
  (yyval.str) = cat_str(4,(yyvsp[(1) - (4)].str),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));
@@ -41633,8 +38600,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1750:
-
-/* Line 1455 of yacc.c  */
 #line 10299 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -41642,8 +38607,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1751:
-
-/* Line 1455 of yacc.c  */
 #line 10307 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("placing"),(yyvsp[(2) - (2)].str));
@@ -41651,8 +38614,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1752:
-
-/* Line 1455 of yacc.c  */
 #line 10315 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("in"),(yyvsp[(3) - (3)].str));
@@ -41660,16 +38621,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1753:
-
-/* Line 1455 of yacc.c  */
 #line 10319 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1754:
-
-/* Line 1455 of yacc.c  */
 #line 10326 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -41677,8 +38634,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1755:
-
-/* Line 1455 of yacc.c  */
 #line 10330 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -41686,8 +38641,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1756:
-
-/* Line 1455 of yacc.c  */
 #line 10334 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -41695,8 +38648,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1757:
-
-/* Line 1455 of yacc.c  */
 #line 10338 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -41704,8 +38655,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1758:
-
-/* Line 1455 of yacc.c  */
 #line 10342 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41713,16 +38662,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1759:
-
-/* Line 1455 of yacc.c  */
 #line 10346 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1760:
-
-/* Line 1455 of yacc.c  */
 #line 10353 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[(2) - (2)].str));
@@ -41730,8 +38675,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1761:
-
-/* Line 1455 of yacc.c  */
 #line 10361 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("for"),(yyvsp[(2) - (2)].str));
@@ -41739,8 +38682,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1762:
-
-/* Line 1455 of yacc.c  */
 #line 10369 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("from"),(yyvsp[(3) - (3)].str));
@@ -41748,8 +38689,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1763:
-
-/* Line 1455 of yacc.c  */
 #line 10373 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("from"),(yyvsp[(2) - (2)].str));
@@ -41757,8 +38696,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1764:
-
-/* Line 1455 of yacc.c  */
 #line 10377 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41766,8 +38703,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1765:
-
-/* Line 1455 of yacc.c  */
 #line 10385 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41775,8 +38710,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1766:
-
-/* Line 1455 of yacc.c  */
 #line 10389 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -41784,8 +38717,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1767:
-
-/* Line 1455 of yacc.c  */
 #line 10397 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("case"),(yyvsp[(2) - (5)].str),(yyvsp[(3) - (5)].str),(yyvsp[(4) - (5)].str),mm_strdup("end"));
@@ -41793,8 +38724,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1768:
-
-/* Line 1455 of yacc.c  */
 #line 10405 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41802,8 +38731,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1769:
-
-/* Line 1455 of yacc.c  */
 #line 10409 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -41811,8 +38738,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1770:
-
-/* Line 1455 of yacc.c  */
 #line 10417 "preproc.y"
     { 
  (yyval.str) = cat_str(4,mm_strdup("when"),(yyvsp[(2) - (4)].str),mm_strdup("then"),(yyvsp[(4) - (4)].str));
@@ -41820,8 +38745,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1771:
-
-/* Line 1455 of yacc.c  */
 #line 10425 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("else"),(yyvsp[(2) - (2)].str));
@@ -41829,16 +38752,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1772:
-
-/* Line 1455 of yacc.c  */
 #line 10429 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1773:
-
-/* Line 1455 of yacc.c  */
 #line 10436 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41846,16 +38765,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1774:
-
-/* Line 1455 of yacc.c  */
 #line 10440 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1775:
-
-/* Line 1455 of yacc.c  */
 #line 10447 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41863,8 +38778,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1776:
-
-/* Line 1455 of yacc.c  */
 #line 10451 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -41872,8 +38785,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1777:
-
-/* Line 1455 of yacc.c  */
 #line 10459 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("."),(yyvsp[(2) - (2)].str));
@@ -41881,8 +38792,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1778:
-
-/* Line 1455 of yacc.c  */
 #line 10463 "preproc.y"
     { 
  (yyval.str) = mm_strdup(". *");
@@ -41890,8 +38799,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1779:
-
-/* Line 1455 of yacc.c  */
 #line 10467 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("["),(yyvsp[(2) - (3)].str),mm_strdup("]"));
@@ -41899,8 +38806,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1780:
-
-/* Line 1455 of yacc.c  */
 #line 10471 "preproc.y"
     { 
  (yyval.str) = cat_str(5,mm_strdup("["),(yyvsp[(2) - (5)].str),mm_strdup(":"),(yyvsp[(4) - (5)].str),mm_strdup("]"));
@@ -41908,8 +38813,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1781:
-
-/* Line 1455 of yacc.c  */
 #line 10479 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41917,8 +38820,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1782:
-
-/* Line 1455 of yacc.c  */
 #line 10483 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -41926,16 +38827,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1783:
-
-/* Line 1455 of yacc.c  */
 #line 10491 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1784:
-
-/* Line 1455 of yacc.c  */
 #line 10494 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -41943,8 +38840,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1785:
-
-/* Line 1455 of yacc.c  */
 #line 10502 "preproc.y"
     { 
  (yyval.str) = mm_strdup("asymmetric");
@@ -41952,16 +38847,12 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1786:
-
-/* Line 1455 of yacc.c  */
 #line 10506 "preproc.y"
     { 
  (yyval.str)=EMPTY; ;}
     break;
 
   case 1787:
-
-/* Line 1455 of yacc.c  */
 #line 10513 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41969,8 +38860,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1788:
-
-/* Line 1455 of yacc.c  */
 #line 10517 "preproc.y"
     { 
  (yyval.str) = mm_strdup("default");
@@ -41978,8 +38867,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1789:
-
-/* Line 1455 of yacc.c  */
 #line 10525 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -41987,8 +38874,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1790:
-
-/* Line 1455 of yacc.c  */
 #line 10529 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -41996,8 +38881,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1791:
-
-/* Line 1455 of yacc.c  */
 #line 10537 "preproc.y"
     { 
  (yyval.str) = cat_str(3,mm_strdup("("),(yyvsp[(2) - (3)].str),mm_strdup(")"));
@@ -42005,8 +38888,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1792:
-
-/* Line 1455 of yacc.c  */
 #line 10545 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42014,8 +38895,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1793:
-
-/* Line 1455 of yacc.c  */
 #line 10549 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -42023,8 +38902,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1794:
-
-/* Line 1455 of yacc.c  */
 #line 10557 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup("as"),(yyvsp[(3) - (3)].str));
@@ -42032,8 +38909,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1795:
-
-/* Line 1455 of yacc.c  */
 #line 10561 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -42041,8 +38916,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1796:
-
-/* Line 1455 of yacc.c  */
 #line 10565 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42050,8 +38923,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1797:
-
-/* Line 1455 of yacc.c  */
 #line 10569 "preproc.y"
     { 
  (yyval.str) = mm_strdup("*");
@@ -42059,8 +38930,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1798:
-
-/* Line 1455 of yacc.c  */
 #line 10577 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42068,8 +38937,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1799:
-
-/* Line 1455 of yacc.c  */
 #line 10581 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -42077,8 +38944,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1800:
-
-/* Line 1455 of yacc.c  */
 #line 10589 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42086,8 +38951,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1801:
-
-/* Line 1455 of yacc.c  */
 #line 10593 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -42095,8 +38958,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1802:
-
-/* Line 1455 of yacc.c  */
 #line 10601 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42104,8 +38965,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1803:
-
-/* Line 1455 of yacc.c  */
 #line 10605 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),mm_strdup(","),(yyvsp[(3) - (3)].str));
@@ -42113,8 +38972,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1804:
-
-/* Line 1455 of yacc.c  */
 #line 10613 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42122,8 +38979,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1805:
-
-/* Line 1455 of yacc.c  */
 #line 10621 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42131,8 +38986,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1806:
-
-/* Line 1455 of yacc.c  */
 #line 10629 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42140,8 +38993,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1807:
-
-/* Line 1455 of yacc.c  */
 #line 10637 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42149,8 +39000,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1808:
-
-/* Line 1455 of yacc.c  */
 #line 10645 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42158,8 +39007,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1809:
-
-/* Line 1455 of yacc.c  */
 #line 10653 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42167,8 +39014,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1810:
-
-/* Line 1455 of yacc.c  */
 #line 10661 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42176,8 +39021,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1811:
-
-/* Line 1455 of yacc.c  */
 #line 10665 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -42185,8 +39028,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1812:
-
-/* Line 1455 of yacc.c  */
 #line 10673 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42194,8 +39035,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1813:
-
-/* Line 1455 of yacc.c  */
 #line 10677 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42203,8 +39042,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1814:
-
-/* Line 1455 of yacc.c  */
 #line 10681 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42212,8 +39049,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1815:
-
-/* Line 1455 of yacc.c  */
 #line 10685 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42221,8 +39056,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1816:
-
-/* Line 1455 of yacc.c  */
 #line 10689 "preproc.y"
     { 
  (yyval.str) = mm_strdup("xconst");
@@ -42230,8 +39063,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1817:
-
-/* Line 1455 of yacc.c  */
 #line 10693 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -42239,8 +39070,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1818:
-
-/* Line 1455 of yacc.c  */
 #line 10697 "preproc.y"
     { 
  (yyval.str) = cat_str(5,(yyvsp[(1) - (5)].str),mm_strdup("("),(yyvsp[(3) - (5)].str),mm_strdup(")"),(yyvsp[(5) - (5)].str));
@@ -42248,8 +39077,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1819:
-
-/* Line 1455 of yacc.c  */
 #line 10701 "preproc.y"
     { 
  (yyval.str) = cat_str(2,(yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));
@@ -42257,8 +39084,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1820:
-
-/* Line 1455 of yacc.c  */
 #line 10705 "preproc.y"
     { 
  (yyval.str) = cat_str(3,(yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));
@@ -42266,8 +39091,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1821:
-
-/* Line 1455 of yacc.c  */
 #line 10709 "preproc.y"
     { 
  (yyval.str) = cat_str(6,(yyvsp[(1) - (6)].str),mm_strdup("("),(yyvsp[(3) - (6)].str),mm_strdup(")"),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].str));
@@ -42275,8 +39098,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1822:
-
-/* Line 1455 of yacc.c  */
 #line 10713 "preproc.y"
     { 
  (yyval.str) = mm_strdup("true");
@@ -42284,8 +39105,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1823:
-
-/* Line 1455 of yacc.c  */
 #line 10717 "preproc.y"
     { 
  (yyval.str) = mm_strdup("false");
@@ -42293,8 +39112,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1824:
-
-/* Line 1455 of yacc.c  */
 #line 10721 "preproc.y"
     { 
  (yyval.str) = mm_strdup("null");
@@ -42302,29 +39119,21 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1825:
-
-/* Line 1455 of yacc.c  */
 #line 10724 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1826:
-
-/* Line 1455 of yacc.c  */
 #line 10725 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1827:
-
-/* Line 1455 of yacc.c  */
 #line 10731 "preproc.y"
     { (yyval.str) = make_name(); ;}
     break;
 
   case 1828:
-
-/* Line 1455 of yacc.c  */
 #line 10737 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42332,8 +39141,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1829:
-
-/* Line 1455 of yacc.c  */
 #line 10745 "preproc.y"
     { 
  (yyval.str) = (yyvsp[(1) - (1)].str);
@@ -42341,15 +39148,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1830:
-
-/* Line 1455 of yacc.c  */
 #line 10748 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 1831:
-
-/* Line 1455 of yacc.c  */
 #line 10750 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("+"),(yyvsp[(2) - (2)].str));
@@ -42357,8 +39160,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1832:
-
-/* Line 1455 of yacc.c  */
 #line 10754 "preproc.y"
     { 
  (yyval.str) = cat_str(2,mm_strdup("-"),(yyvsp[(2) - (2)].str));
@@ -42366,8 +39167,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1833:
-
-/* Line 1455 of yacc.c  */
 #line 10762 "preproc.y"
     { 
  (yyval.str) = mm_strdup("abort");
@@ -42375,8 +39174,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1834:
-
-/* Line 1455 of yacc.c  */
 #line 10766 "preproc.y"
     { 
  (yyval.str) = mm_strdup("absolute");
@@ -42384,8 +39181,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1835:
-
-/* Line 1455 of yacc.c  */
 #line 10770 "preproc.y"
     { 
  (yyval.str) = mm_strdup("access");
@@ -42393,8 +39188,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1836:
-
-/* Line 1455 of yacc.c  */
 #line 10774 "preproc.y"
     { 
  (yyval.str) = mm_strdup("action");
@@ -42402,8 +39195,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1837:
-
-/* Line 1455 of yacc.c  */
 #line 10778 "preproc.y"
     { 
  (yyval.str) = mm_strdup("add");
@@ -42411,8 +39202,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1838:
-
-/* Line 1455 of yacc.c  */
 #line 10782 "preproc.y"
     { 
  (yyval.str) = mm_strdup("admin");
@@ -42420,8 +39209,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1839:
-
-/* Line 1455 of yacc.c  */
 #line 10786 "preproc.y"
     { 
  (yyval.str) = mm_strdup("after");
@@ -42429,8 +39216,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1840:
-
-/* Line 1455 of yacc.c  */
 #line 10790 "preproc.y"
     { 
  (yyval.str) = mm_strdup("aggregate");
@@ -42438,8 +39223,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1841:
-
-/* Line 1455 of yacc.c  */
 #line 10794 "preproc.y"
     { 
  (yyval.str) = mm_strdup("also");
@@ -42447,8 +39230,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1842:
-
-/* Line 1455 of yacc.c  */
 #line 10798 "preproc.y"
     { 
  (yyval.str) = mm_strdup("alter");
@@ -42456,8 +39237,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1843:
-
-/* Line 1455 of yacc.c  */
 #line 10802 "preproc.y"
     { 
  (yyval.str) = mm_strdup("always");
@@ -42465,8 +39244,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1844:
-
-/* Line 1455 of yacc.c  */
 #line 10806 "preproc.y"
     { 
  (yyval.str) = mm_strdup("assertion");
@@ -42474,8 +39251,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1845:
-
-/* Line 1455 of yacc.c  */
 #line 10810 "preproc.y"
     { 
  (yyval.str) = mm_strdup("assignment");
@@ -42483,8 +39258,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1846:
-
-/* Line 1455 of yacc.c  */
 #line 10814 "preproc.y"
     { 
  (yyval.str) = mm_strdup("at");
@@ -42492,8 +39265,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1847:
-
-/* Line 1455 of yacc.c  */
 #line 10818 "preproc.y"
     { 
  (yyval.str) = mm_strdup("attribute");
@@ -42501,8 +39272,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1848:
-
-/* Line 1455 of yacc.c  */
 #line 10822 "preproc.y"
     { 
  (yyval.str) = mm_strdup("backward");
@@ -42510,8 +39279,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1849:
-
-/* Line 1455 of yacc.c  */
 #line 10826 "preproc.y"
     { 
  (yyval.str) = mm_strdup("before");
@@ -42519,8 +39286,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1850:
-
-/* Line 1455 of yacc.c  */
 #line 10830 "preproc.y"
     { 
  (yyval.str) = mm_strdup("begin");
@@ -42528,8 +39293,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1851:
-
-/* Line 1455 of yacc.c  */
 #line 10834 "preproc.y"
     { 
  (yyval.str) = mm_strdup("by");
@@ -42537,8 +39300,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1852:
-
-/* Line 1455 of yacc.c  */
 #line 10838 "preproc.y"
     { 
  (yyval.str) = mm_strdup("cache");
@@ -42546,8 +39307,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1853:
-
-/* Line 1455 of yacc.c  */
 #line 10842 "preproc.y"
     { 
  (yyval.str) = mm_strdup("called");
@@ -42555,8 +39314,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1854:
-
-/* Line 1455 of yacc.c  */
 #line 10846 "preproc.y"
     { 
  (yyval.str) = mm_strdup("cascade");
@@ -42564,8 +39321,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1855:
-
-/* Line 1455 of yacc.c  */
 #line 10850 "preproc.y"
     { 
  (yyval.str) = mm_strdup("cascaded");
@@ -42573,8 +39328,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1856:
-
-/* Line 1455 of yacc.c  */
 #line 10854 "preproc.y"
     { 
  (yyval.str) = mm_strdup("catalog");
@@ -42582,8 +39335,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1857:
-
-/* Line 1455 of yacc.c  */
 #line 10858 "preproc.y"
     { 
  (yyval.str) = mm_strdup("chain");
@@ -42591,8 +39342,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1858:
-
-/* Line 1455 of yacc.c  */
 #line 10862 "preproc.y"
     { 
  (yyval.str) = mm_strdup("characteristics");
@@ -42600,8 +39349,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1859:
-
-/* Line 1455 of yacc.c  */
 #line 10866 "preproc.y"
     { 
  (yyval.str) = mm_strdup("checkpoint");
@@ -42609,8 +39356,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1860:
-
-/* Line 1455 of yacc.c  */
 #line 10870 "preproc.y"
     { 
  (yyval.str) = mm_strdup("class");
@@ -42618,8 +39363,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1861:
-
-/* Line 1455 of yacc.c  */
 #line 10874 "preproc.y"
     { 
  (yyval.str) = mm_strdup("close");
@@ -42627,8 +39370,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1862:
-
-/* Line 1455 of yacc.c  */
 #line 10878 "preproc.y"
     { 
  (yyval.str) = mm_strdup("cluster");
@@ -42636,8 +39377,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1863:
-
-/* Line 1455 of yacc.c  */
 #line 10882 "preproc.y"
     { 
  (yyval.str) = mm_strdup("collation");
@@ -42645,8 +39384,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1864:
-
-/* Line 1455 of yacc.c  */
 #line 10886 "preproc.y"
     { 
  (yyval.str) = mm_strdup("comment");
@@ -42654,8 +39391,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1865:
-
-/* Line 1455 of yacc.c  */
 #line 10890 "preproc.y"
     { 
  (yyval.str) = mm_strdup("comments");
@@ -42663,8 +39398,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1866:
-
-/* Line 1455 of yacc.c  */
 #line 10894 "preproc.y"
     { 
  (yyval.str) = mm_strdup("commit");
@@ -42672,8 +39405,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1867:
-
-/* Line 1455 of yacc.c  */
 #line 10898 "preproc.y"
     { 
  (yyval.str) = mm_strdup("committed");
@@ -42681,8 +39412,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1868:
-
-/* Line 1455 of yacc.c  */
 #line 10902 "preproc.y"
     { 
  (yyval.str) = mm_strdup("configuration");
@@ -42690,8 +39419,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1869:
-
-/* Line 1455 of yacc.c  */
 #line 10906 "preproc.y"
     { 
  (yyval.str) = mm_strdup("constraints");
@@ -42699,8 +39426,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1870:
-
-/* Line 1455 of yacc.c  */
 #line 10910 "preproc.y"
     { 
  (yyval.str) = mm_strdup("content");
@@ -42708,8 +39433,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1871:
-
-/* Line 1455 of yacc.c  */
 #line 10914 "preproc.y"
     { 
  (yyval.str) = mm_strdup("continue");
@@ -42717,8 +39440,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1872:
-
-/* Line 1455 of yacc.c  */
 #line 10918 "preproc.y"
     { 
  (yyval.str) = mm_strdup("conversion");
@@ -42726,8 +39447,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1873:
-
-/* Line 1455 of yacc.c  */
 #line 10922 "preproc.y"
     { 
  (yyval.str) = mm_strdup("copy");
@@ -42735,8 +39454,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1874:
-
-/* Line 1455 of yacc.c  */
 #line 10926 "preproc.y"
     { 
  (yyval.str) = mm_strdup("cost");
@@ -42744,8 +39461,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1875:
-
-/* Line 1455 of yacc.c  */
 #line 10930 "preproc.y"
     { 
  (yyval.str) = mm_strdup("csv");
@@ -42753,8 +39468,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1876:
-
-/* Line 1455 of yacc.c  */
 #line 10934 "preproc.y"
     { 
  (yyval.str) = mm_strdup("cursor");
@@ -42762,8 +39475,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1877:
-
-/* Line 1455 of yacc.c  */
 #line 10938 "preproc.y"
     { 
  (yyval.str) = mm_strdup("cycle");
@@ -42771,8 +39482,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1878:
-
-/* Line 1455 of yacc.c  */
 #line 10942 "preproc.y"
     { 
  (yyval.str) = mm_strdup("data");
@@ -42780,8 +39489,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1879:
-
-/* Line 1455 of yacc.c  */
 #line 10946 "preproc.y"
     { 
  (yyval.str) = mm_strdup("database");
@@ -42789,8 +39496,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1880:
-
-/* Line 1455 of yacc.c  */
 #line 10950 "preproc.y"
     { 
  (yyval.str) = mm_strdup("deallocate");
@@ -42798,8 +39503,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1881:
-
-/* Line 1455 of yacc.c  */
 #line 10954 "preproc.y"
     { 
  (yyval.str) = mm_strdup("declare");
@@ -42807,8 +39510,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1882:
-
-/* Line 1455 of yacc.c  */
 #line 10958 "preproc.y"
     { 
  (yyval.str) = mm_strdup("defaults");
@@ -42816,8 +39517,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1883:
-
-/* Line 1455 of yacc.c  */
 #line 10962 "preproc.y"
     { 
  (yyval.str) = mm_strdup("deferred");
@@ -42825,8 +39524,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1884:
-
-/* Line 1455 of yacc.c  */
 #line 10966 "preproc.y"
     { 
  (yyval.str) = mm_strdup("definer");
@@ -42834,8 +39531,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1885:
-
-/* Line 1455 of yacc.c  */
 #line 10970 "preproc.y"
     { 
  (yyval.str) = mm_strdup("delete");
@@ -42843,8 +39538,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1886:
-
-/* Line 1455 of yacc.c  */
 #line 10974 "preproc.y"
     { 
  (yyval.str) = mm_strdup("delimiter");
@@ -42852,8 +39545,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1887:
-
-/* Line 1455 of yacc.c  */
 #line 10978 "preproc.y"
     { 
  (yyval.str) = mm_strdup("delimiters");
@@ -42861,8 +39552,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1888:
-
-/* Line 1455 of yacc.c  */
 #line 10982 "preproc.y"
     { 
  (yyval.str) = mm_strdup("dictionary");
@@ -42870,8 +39559,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1889:
-
-/* Line 1455 of yacc.c  */
 #line 10986 "preproc.y"
     { 
  (yyval.str) = mm_strdup("disable");
@@ -42879,8 +39566,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1890:
-
-/* Line 1455 of yacc.c  */
 #line 10990 "preproc.y"
     { 
  (yyval.str) = mm_strdup("discard");
@@ -42888,8 +39573,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1891:
-
-/* Line 1455 of yacc.c  */
 #line 10994 "preproc.y"
     { 
  (yyval.str) = mm_strdup("document");
@@ -42897,8 +39580,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1892:
-
-/* Line 1455 of yacc.c  */
 #line 10998 "preproc.y"
     { 
  (yyval.str) = mm_strdup("domain");
@@ -42906,8 +39587,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1893:
-
-/* Line 1455 of yacc.c  */
 #line 11002 "preproc.y"
     { 
  (yyval.str) = mm_strdup("double");
@@ -42915,8 +39594,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1894:
-
-/* Line 1455 of yacc.c  */
 #line 11006 "preproc.y"
     { 
  (yyval.str) = mm_strdup("drop");
@@ -42924,8 +39601,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1895:
-
-/* Line 1455 of yacc.c  */
 #line 11010 "preproc.y"
     { 
  (yyval.str) = mm_strdup("each");
@@ -42933,8 +39608,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1896:
-
-/* Line 1455 of yacc.c  */
 #line 11014 "preproc.y"
     { 
  (yyval.str) = mm_strdup("enable");
@@ -42942,8 +39615,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1897:
-
-/* Line 1455 of yacc.c  */
 #line 11018 "preproc.y"
     { 
  (yyval.str) = mm_strdup("encoding");
@@ -42951,8 +39622,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1898:
-
-/* Line 1455 of yacc.c  */
 #line 11022 "preproc.y"
     { 
  (yyval.str) = mm_strdup("encrypted");
@@ -42960,8 +39629,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1899:
-
-/* Line 1455 of yacc.c  */
 #line 11026 "preproc.y"
     { 
  (yyval.str) = mm_strdup("enum");
@@ -42969,8 +39636,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1900:
-
-/* Line 1455 of yacc.c  */
 #line 11030 "preproc.y"
     { 
  (yyval.str) = mm_strdup("escape");
@@ -42978,8 +39643,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1901:
-
-/* Line 1455 of yacc.c  */
 #line 11034 "preproc.y"
     { 
  (yyval.str) = mm_strdup("exclude");
@@ -42987,8 +39650,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1902:
-
-/* Line 1455 of yacc.c  */
 #line 11038 "preproc.y"
     { 
  (yyval.str) = mm_strdup("excluding");
@@ -42996,8 +39657,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1903:
-
-/* Line 1455 of yacc.c  */
 #line 11042 "preproc.y"
     { 
  (yyval.str) = mm_strdup("exclusive");
@@ -43005,8 +39664,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1904:
-
-/* Line 1455 of yacc.c  */
 #line 11046 "preproc.y"
     { 
  (yyval.str) = mm_strdup("execute");
@@ -43014,8 +39671,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1905:
-
-/* Line 1455 of yacc.c  */
 #line 11050 "preproc.y"
     { 
  (yyval.str) = mm_strdup("explain");
@@ -43023,8 +39678,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1906:
-
-/* Line 1455 of yacc.c  */
 #line 11054 "preproc.y"
     { 
  (yyval.str) = mm_strdup("extension");
@@ -43032,8 +39685,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1907:
-
-/* Line 1455 of yacc.c  */
 #line 11058 "preproc.y"
     { 
  (yyval.str) = mm_strdup("external");
@@ -43041,8 +39692,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1908:
-
-/* Line 1455 of yacc.c  */
 #line 11062 "preproc.y"
     { 
  (yyval.str) = mm_strdup("family");
@@ -43050,8 +39699,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1909:
-
-/* Line 1455 of yacc.c  */
 #line 11066 "preproc.y"
     { 
  (yyval.str) = mm_strdup("first");
@@ -43059,8 +39706,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1910:
-
-/* Line 1455 of yacc.c  */
 #line 11070 "preproc.y"
     { 
  (yyval.str) = mm_strdup("following");
@@ -43068,8 +39713,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1911:
-
-/* Line 1455 of yacc.c  */
 #line 11074 "preproc.y"
     { 
  (yyval.str) = mm_strdup("force");
@@ -43077,8 +39720,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1912:
-
-/* Line 1455 of yacc.c  */
 #line 11078 "preproc.y"
     { 
  (yyval.str) = mm_strdup("forward");
@@ -43086,8 +39727,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1913:
-
-/* Line 1455 of yacc.c  */
 #line 11082 "preproc.y"
     { 
  (yyval.str) = mm_strdup("function");
@@ -43095,8 +39734,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1914:
-
-/* Line 1455 of yacc.c  */
 #line 11086 "preproc.y"
     { 
  (yyval.str) = mm_strdup("functions");
@@ -43104,8 +39741,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1915:
-
-/* Line 1455 of yacc.c  */
 #line 11090 "preproc.y"
     { 
  (yyval.str) = mm_strdup("global");
@@ -43113,8 +39748,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1916:
-
-/* Line 1455 of yacc.c  */
 #line 11094 "preproc.y"
     { 
  (yyval.str) = mm_strdup("granted");
@@ -43122,8 +39755,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1917:
-
-/* Line 1455 of yacc.c  */
 #line 11098 "preproc.y"
     { 
  (yyval.str) = mm_strdup("handler");
@@ -43131,8 +39762,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1918:
-
-/* Line 1455 of yacc.c  */
 #line 11102 "preproc.y"
     { 
  (yyval.str) = mm_strdup("header");
@@ -43140,8 +39769,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1919:
-
-/* Line 1455 of yacc.c  */
 #line 11106 "preproc.y"
     { 
  (yyval.str) = mm_strdup("hold");
@@ -43149,8 +39776,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1920:
-
-/* Line 1455 of yacc.c  */
 #line 11110 "preproc.y"
     { 
  (yyval.str) = mm_strdup("identity");
@@ -43158,8 +39783,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1921:
-
-/* Line 1455 of yacc.c  */
 #line 11114 "preproc.y"
     { 
  (yyval.str) = mm_strdup("if");
@@ -43167,8 +39790,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1922:
-
-/* Line 1455 of yacc.c  */
 #line 11118 "preproc.y"
     { 
  (yyval.str) = mm_strdup("immediate");
@@ -43176,8 +39797,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1923:
-
-/* Line 1455 of yacc.c  */
 #line 11122 "preproc.y"
     { 
  (yyval.str) = mm_strdup("immutable");
@@ -43185,8 +39804,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1924:
-
-/* Line 1455 of yacc.c  */
 #line 11126 "preproc.y"
     { 
  (yyval.str) = mm_strdup("implicit");
@@ -43194,8 +39811,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1925:
-
-/* Line 1455 of yacc.c  */
 #line 11130 "preproc.y"
     { 
  (yyval.str) = mm_strdup("including");
@@ -43203,8 +39818,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1926:
-
-/* Line 1455 of yacc.c  */
 #line 11134 "preproc.y"
     { 
  (yyval.str) = mm_strdup("increment");
@@ -43212,8 +39825,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1927:
-
-/* Line 1455 of yacc.c  */
 #line 11138 "preproc.y"
     { 
  (yyval.str) = mm_strdup("index");
@@ -43221,8 +39832,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1928:
-
-/* Line 1455 of yacc.c  */
 #line 11142 "preproc.y"
     { 
  (yyval.str) = mm_strdup("indexes");
@@ -43230,8 +39839,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1929:
-
-/* Line 1455 of yacc.c  */
 #line 11146 "preproc.y"
     { 
  (yyval.str) = mm_strdup("inherit");
@@ -43239,8 +39846,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1930:
-
-/* Line 1455 of yacc.c  */
 #line 11150 "preproc.y"
     { 
  (yyval.str) = mm_strdup("inherits");
@@ -43248,8 +39853,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1931:
-
-/* Line 1455 of yacc.c  */
 #line 11154 "preproc.y"
     { 
  (yyval.str) = mm_strdup("inline");
@@ -43257,8 +39860,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1932:
-
-/* Line 1455 of yacc.c  */
 #line 11158 "preproc.y"
     { 
  (yyval.str) = mm_strdup("insensitive");
@@ -43266,8 +39867,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1933:
-
-/* Line 1455 of yacc.c  */
 #line 11162 "preproc.y"
     { 
  (yyval.str) = mm_strdup("insert");
@@ -43275,8 +39874,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1934:
-
-/* Line 1455 of yacc.c  */
 #line 11166 "preproc.y"
     { 
  (yyval.str) = mm_strdup("instead");
@@ -43284,8 +39881,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1935:
-
-/* Line 1455 of yacc.c  */
 #line 11170 "preproc.y"
     { 
  (yyval.str) = mm_strdup("invoker");
@@ -43293,8 +39888,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1936:
-
-/* Line 1455 of yacc.c  */
 #line 11174 "preproc.y"
     { 
  (yyval.str) = mm_strdup("isolation");
@@ -43302,8 +39895,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1937:
-
-/* Line 1455 of yacc.c  */
 #line 11178 "preproc.y"
     { 
  (yyval.str) = mm_strdup("key");
@@ -43311,8 +39902,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1938:
-
-/* Line 1455 of yacc.c  */
 #line 11182 "preproc.y"
     { 
  (yyval.str) = mm_strdup("label");
@@ -43320,8 +39909,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1939:
-
-/* Line 1455 of yacc.c  */
 #line 11186 "preproc.y"
     { 
  (yyval.str) = mm_strdup("language");
@@ -43329,8 +39916,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1940:
-
-/* Line 1455 of yacc.c  */
 #line 11190 "preproc.y"
     { 
  (yyval.str) = mm_strdup("large");
@@ -43338,8 +39923,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1941:
-
-/* Line 1455 of yacc.c  */
 #line 11194 "preproc.y"
     { 
  (yyval.str) = mm_strdup("last");
@@ -43347,8 +39930,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1942:
-
-/* Line 1455 of yacc.c  */
 #line 11198 "preproc.y"
     { 
  (yyval.str) = mm_strdup("lc_collate");
@@ -43356,8 +39937,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1943:
-
-/* Line 1455 of yacc.c  */
 #line 11202 "preproc.y"
     { 
  (yyval.str) = mm_strdup("lc_ctype");
@@ -43365,8 +39944,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1944:
-
-/* Line 1455 of yacc.c  */
 #line 11206 "preproc.y"
     { 
  (yyval.str) = mm_strdup("level");
@@ -43374,8 +39951,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1945:
-
-/* Line 1455 of yacc.c  */
 #line 11210 "preproc.y"
     { 
  (yyval.str) = mm_strdup("listen");
@@ -43383,8 +39958,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1946:
-
-/* Line 1455 of yacc.c  */
 #line 11214 "preproc.y"
     { 
  (yyval.str) = mm_strdup("load");
@@ -43392,8 +39965,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1947:
-
-/* Line 1455 of yacc.c  */
 #line 11218 "preproc.y"
     { 
  (yyval.str) = mm_strdup("local");
@@ -43401,8 +39972,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1948:
-
-/* Line 1455 of yacc.c  */
 #line 11222 "preproc.y"
     { 
  (yyval.str) = mm_strdup("location");
@@ -43410,8 +39979,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1949:
-
-/* Line 1455 of yacc.c  */
 #line 11226 "preproc.y"
     { 
  (yyval.str) = mm_strdup("lock");
@@ -43419,8 +39986,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1950:
-
-/* Line 1455 of yacc.c  */
 #line 11230 "preproc.y"
     { 
  (yyval.str) = mm_strdup("mapping");
@@ -43428,8 +39993,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1951:
-
-/* Line 1455 of yacc.c  */
 #line 11234 "preproc.y"
     { 
  (yyval.str) = mm_strdup("match");
@@ -43437,8 +40000,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1952:
-
-/* Line 1455 of yacc.c  */
 #line 11238 "preproc.y"
     { 
  (yyval.str) = mm_strdup("maxvalue");
@@ -43446,8 +40007,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1953:
-
-/* Line 1455 of yacc.c  */
 #line 11242 "preproc.y"
     { 
  (yyval.str) = mm_strdup("minvalue");
@@ -43455,8 +40014,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1954:
-
-/* Line 1455 of yacc.c  */
 #line 11246 "preproc.y"
     { 
  (yyval.str) = mm_strdup("mode");
@@ -43464,8 +40021,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1955:
-
-/* Line 1455 of yacc.c  */
 #line 11250 "preproc.y"
     { 
  (yyval.str) = mm_strdup("move");
@@ -43473,8 +40028,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1956:
-
-/* Line 1455 of yacc.c  */
 #line 11254 "preproc.y"
     { 
  (yyval.str) = mm_strdup("name");
@@ -43482,8 +40035,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1957:
-
-/* Line 1455 of yacc.c  */
 #line 11258 "preproc.y"
     { 
  (yyval.str) = mm_strdup("names");
@@ -43491,8 +40042,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1958:
-
-/* Line 1455 of yacc.c  */
 #line 11262 "preproc.y"
     { 
  (yyval.str) = mm_strdup("next");
@@ -43500,8 +40049,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1959:
-
-/* Line 1455 of yacc.c  */
 #line 11266 "preproc.y"
     { 
  (yyval.str) = mm_strdup("no");
@@ -43509,8 +40056,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1960:
-
-/* Line 1455 of yacc.c  */
 #line 11270 "preproc.y"
     { 
  (yyval.str) = mm_strdup("nothing");
@@ -43518,8 +40063,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1961:
-
-/* Line 1455 of yacc.c  */
 #line 11274 "preproc.y"
     { 
  (yyval.str) = mm_strdup("notify");
@@ -43527,8 +40070,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1962:
-
-/* Line 1455 of yacc.c  */
 #line 11278 "preproc.y"
     { 
  (yyval.str) = mm_strdup("nowait");
@@ -43536,8 +40077,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1963:
-
-/* Line 1455 of yacc.c  */
 #line 11282 "preproc.y"
     { 
  (yyval.str) = mm_strdup("nulls");
@@ -43545,8 +40084,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1964:
-
-/* Line 1455 of yacc.c  */
 #line 11286 "preproc.y"
     { 
  (yyval.str) = mm_strdup("object");
@@ -43554,8 +40091,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1965:
-
-/* Line 1455 of yacc.c  */
 #line 11290 "preproc.y"
     { 
  (yyval.str) = mm_strdup("of");
@@ -43563,8 +40098,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1966:
-
-/* Line 1455 of yacc.c  */
 #line 11294 "preproc.y"
     { 
  (yyval.str) = mm_strdup("off");
@@ -43572,8 +40105,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1967:
-
-/* Line 1455 of yacc.c  */
 #line 11298 "preproc.y"
     { 
  (yyval.str) = mm_strdup("oids");
@@ -43581,8 +40112,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1968:
-
-/* Line 1455 of yacc.c  */
 #line 11302 "preproc.y"
     { 
  (yyval.str) = mm_strdup("operator");
@@ -43590,8 +40119,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1969:
-
-/* Line 1455 of yacc.c  */
 #line 11306 "preproc.y"
     { 
  (yyval.str) = mm_strdup("option");
@@ -43599,8 +40126,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1970:
-
-/* Line 1455 of yacc.c  */
 #line 11310 "preproc.y"
     { 
  (yyval.str) = mm_strdup("options");
@@ -43608,8 +40133,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1971:
-
-/* Line 1455 of yacc.c  */
 #line 11314 "preproc.y"
     { 
  (yyval.str) = mm_strdup("owned");
@@ -43617,8 +40140,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1972:
-
-/* Line 1455 of yacc.c  */
 #line 11318 "preproc.y"
     { 
  (yyval.str) = mm_strdup("owner");
@@ -43626,8 +40147,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1973:
-
-/* Line 1455 of yacc.c  */
 #line 11322 "preproc.y"
     { 
  (yyval.str) = mm_strdup("parser");
@@ -43635,8 +40154,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1974:
-
-/* Line 1455 of yacc.c  */
 #line 11326 "preproc.y"
     { 
  (yyval.str) = mm_strdup("partial");
@@ -43644,8 +40161,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1975:
-
-/* Line 1455 of yacc.c  */
 #line 11330 "preproc.y"
     { 
  (yyval.str) = mm_strdup("partition");
@@ -43653,8 +40168,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1976:
-
-/* Line 1455 of yacc.c  */
 #line 11334 "preproc.y"
     { 
  (yyval.str) = mm_strdup("passing");
@@ -43662,8 +40175,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1977:
-
-/* Line 1455 of yacc.c  */
 #line 11338 "preproc.y"
     { 
  (yyval.str) = mm_strdup("password");
@@ -43671,8 +40182,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1978:
-
-/* Line 1455 of yacc.c  */
 #line 11342 "preproc.y"
     { 
  (yyval.str) = mm_strdup("plans");
@@ -43680,8 +40189,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1979:
-
-/* Line 1455 of yacc.c  */
 #line 11346 "preproc.y"
     { 
  (yyval.str) = mm_strdup("preceding");
@@ -43689,8 +40196,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1980:
-
-/* Line 1455 of yacc.c  */
 #line 11350 "preproc.y"
     { 
  (yyval.str) = mm_strdup("prepare");
@@ -43698,8 +40203,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1981:
-
-/* Line 1455 of yacc.c  */
 #line 11354 "preproc.y"
     { 
  (yyval.str) = mm_strdup("prepared");
@@ -43707,8 +40210,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1982:
-
-/* Line 1455 of yacc.c  */
 #line 11358 "preproc.y"
     { 
  (yyval.str) = mm_strdup("preserve");
@@ -43716,8 +40217,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1983:
-
-/* Line 1455 of yacc.c  */
 #line 11362 "preproc.y"
     { 
  (yyval.str) = mm_strdup("prior");
@@ -43725,8 +40224,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1984:
-
-/* Line 1455 of yacc.c  */
 #line 11366 "preproc.y"
     { 
  (yyval.str) = mm_strdup("privileges");
@@ -43734,8 +40231,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1985:
-
-/* Line 1455 of yacc.c  */
 #line 11370 "preproc.y"
     { 
  (yyval.str) = mm_strdup("procedural");
@@ -43743,8 +40238,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1986:
-
-/* Line 1455 of yacc.c  */
 #line 11374 "preproc.y"
     { 
  (yyval.str) = mm_strdup("procedure");
@@ -43752,8 +40245,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1987:
-
-/* Line 1455 of yacc.c  */
 #line 11378 "preproc.y"
     { 
  (yyval.str) = mm_strdup("quote");
@@ -43761,8 +40252,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1988:
-
-/* Line 1455 of yacc.c  */
 #line 11382 "preproc.y"
     { 
  (yyval.str) = mm_strdup("range");
@@ -43770,8 +40259,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1989:
-
-/* Line 1455 of yacc.c  */
 #line 11386 "preproc.y"
     { 
  (yyval.str) = mm_strdup("read");
@@ -43779,8 +40266,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1990:
-
-/* Line 1455 of yacc.c  */
 #line 11390 "preproc.y"
     { 
  (yyval.str) = mm_strdup("reassign");
@@ -43788,8 +40273,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1991:
-
-/* Line 1455 of yacc.c  */
 #line 11394 "preproc.y"
     { 
  (yyval.str) = mm_strdup("recheck");
@@ -43797,8 +40280,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1992:
-
-/* Line 1455 of yacc.c  */
 #line 11398 "preproc.y"
     { 
  (yyval.str) = mm_strdup("recursive");
@@ -43806,8 +40287,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1993:
-
-/* Line 1455 of yacc.c  */
 #line 11402 "preproc.y"
     { 
  (yyval.str) = mm_strdup("ref");
@@ -43815,8 +40294,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1994:
-
-/* Line 1455 of yacc.c  */
 #line 11406 "preproc.y"
     { 
  (yyval.str) = mm_strdup("reindex");
@@ -43824,8 +40301,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1995:
-
-/* Line 1455 of yacc.c  */
 #line 11410 "preproc.y"
     { 
  (yyval.str) = mm_strdup("relative");
@@ -43833,8 +40308,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1996:
-
-/* Line 1455 of yacc.c  */
 #line 11414 "preproc.y"
     { 
  (yyval.str) = mm_strdup("release");
@@ -43842,8 +40315,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1997:
-
-/* Line 1455 of yacc.c  */
 #line 11418 "preproc.y"
     { 
  (yyval.str) = mm_strdup("rename");
@@ -43851,8 +40322,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1998:
-
-/* Line 1455 of yacc.c  */
 #line 11422 "preproc.y"
     { 
  (yyval.str) = mm_strdup("repeatable");
@@ -43860,8 +40329,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 1999:
-
-/* Line 1455 of yacc.c  */
 #line 11426 "preproc.y"
     { 
  (yyval.str) = mm_strdup("replace");
@@ -43869,8 +40336,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2000:
-
-/* Line 1455 of yacc.c  */
 #line 11430 "preproc.y"
     { 
  (yyval.str) = mm_strdup("replica");
@@ -43878,8 +40343,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2001:
-
-/* Line 1455 of yacc.c  */
 #line 11434 "preproc.y"
     { 
  (yyval.str) = mm_strdup("reset");
@@ -43887,8 +40350,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2002:
-
-/* Line 1455 of yacc.c  */
 #line 11438 "preproc.y"
     { 
  (yyval.str) = mm_strdup("restart");
@@ -43896,8 +40357,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2003:
-
-/* Line 1455 of yacc.c  */
 #line 11442 "preproc.y"
     { 
  (yyval.str) = mm_strdup("restrict");
@@ -43905,8 +40364,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2004:
-
-/* Line 1455 of yacc.c  */
 #line 11446 "preproc.y"
     { 
  (yyval.str) = mm_strdup("returns");
@@ -43914,8 +40371,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2005:
-
-/* Line 1455 of yacc.c  */
 #line 11450 "preproc.y"
     { 
  (yyval.str) = mm_strdup("revoke");
@@ -43923,8 +40378,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2006:
-
-/* Line 1455 of yacc.c  */
 #line 11454 "preproc.y"
     { 
  (yyval.str) = mm_strdup("role");
@@ -43932,8 +40385,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2007:
-
-/* Line 1455 of yacc.c  */
 #line 11458 "preproc.y"
     { 
  (yyval.str) = mm_strdup("rollback");
@@ -43941,8 +40392,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2008:
-
-/* Line 1455 of yacc.c  */
 #line 11462 "preproc.y"
     { 
  (yyval.str) = mm_strdup("rows");
@@ -43950,8 +40399,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2009:
-
-/* Line 1455 of yacc.c  */
 #line 11466 "preproc.y"
     { 
  (yyval.str) = mm_strdup("rule");
@@ -43959,8 +40406,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2010:
-
-/* Line 1455 of yacc.c  */
 #line 11470 "preproc.y"
     { 
  (yyval.str) = mm_strdup("savepoint");
@@ -43968,8 +40413,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2011:
-
-/* Line 1455 of yacc.c  */
 #line 11474 "preproc.y"
     { 
  (yyval.str) = mm_strdup("schema");
@@ -43977,8 +40420,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2012:
-
-/* Line 1455 of yacc.c  */
 #line 11478 "preproc.y"
     { 
  (yyval.str) = mm_strdup("scroll");
@@ -43986,8 +40427,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2013:
-
-/* Line 1455 of yacc.c  */
 #line 11482 "preproc.y"
     { 
  (yyval.str) = mm_strdup("search");
@@ -43995,8 +40434,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2014:
-
-/* Line 1455 of yacc.c  */
 #line 11486 "preproc.y"
     { 
  (yyval.str) = mm_strdup("security");
@@ -44004,8 +40441,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2015:
-
-/* Line 1455 of yacc.c  */
 #line 11490 "preproc.y"
     { 
  (yyval.str) = mm_strdup("sequence");
@@ -44013,8 +40448,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2016:
-
-/* Line 1455 of yacc.c  */
 #line 11494 "preproc.y"
     { 
  (yyval.str) = mm_strdup("sequences");
@@ -44022,8 +40455,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2017:
-
-/* Line 1455 of yacc.c  */
 #line 11498 "preproc.y"
     { 
  (yyval.str) = mm_strdup("serializable");
@@ -44031,8 +40462,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2018:
-
-/* Line 1455 of yacc.c  */
 #line 11502 "preproc.y"
     { 
  (yyval.str) = mm_strdup("server");
@@ -44040,8 +40469,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2019:
-
-/* Line 1455 of yacc.c  */
 #line 11506 "preproc.y"
     { 
  (yyval.str) = mm_strdup("session");
@@ -44049,8 +40476,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2020:
-
-/* Line 1455 of yacc.c  */
 #line 11510 "preproc.y"
     { 
  (yyval.str) = mm_strdup("set");
@@ -44058,8 +40483,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2021:
-
-/* Line 1455 of yacc.c  */
 #line 11514 "preproc.y"
     { 
  (yyval.str) = mm_strdup("share");
@@ -44067,8 +40490,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2022:
-
-/* Line 1455 of yacc.c  */
 #line 11518 "preproc.y"
     { 
  (yyval.str) = mm_strdup("show");
@@ -44076,8 +40497,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2023:
-
-/* Line 1455 of yacc.c  */
 #line 11522 "preproc.y"
     { 
  (yyval.str) = mm_strdup("simple");
@@ -44085,8 +40504,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2024:
-
-/* Line 1455 of yacc.c  */
 #line 11526 "preproc.y"
     { 
  (yyval.str) = mm_strdup("stable");
@@ -44094,8 +40511,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2025:
-
-/* Line 1455 of yacc.c  */
 #line 11530 "preproc.y"
     { 
  (yyval.str) = mm_strdup("standalone");
@@ -44103,8 +40518,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2026:
-
-/* Line 1455 of yacc.c  */
 #line 11534 "preproc.y"
     { 
  (yyval.str) = mm_strdup("start");
@@ -44112,8 +40525,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2027:
-
-/* Line 1455 of yacc.c  */
 #line 11538 "preproc.y"
     { 
  (yyval.str) = mm_strdup("statement");
@@ -44121,8 +40532,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2028:
-
-/* Line 1455 of yacc.c  */
 #line 11542 "preproc.y"
     { 
  (yyval.str) = mm_strdup("statistics");
@@ -44130,8 +40539,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2029:
-
-/* Line 1455 of yacc.c  */
 #line 11546 "preproc.y"
     { 
  (yyval.str) = mm_strdup("stdin");
@@ -44139,8 +40546,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2030:
-
-/* Line 1455 of yacc.c  */
 #line 11550 "preproc.y"
     { 
  (yyval.str) = mm_strdup("stdout");
@@ -44148,8 +40553,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2031:
-
-/* Line 1455 of yacc.c  */
 #line 11554 "preproc.y"
     { 
  (yyval.str) = mm_strdup("storage");
@@ -44157,8 +40560,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2032:
-
-/* Line 1455 of yacc.c  */
 #line 11558 "preproc.y"
     { 
  (yyval.str) = mm_strdup("strict");
@@ -44166,8 +40567,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2033:
-
-/* Line 1455 of yacc.c  */
 #line 11562 "preproc.y"
     { 
  (yyval.str) = mm_strdup("strip");
@@ -44175,8 +40574,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2034:
-
-/* Line 1455 of yacc.c  */
 #line 11566 "preproc.y"
     { 
  (yyval.str) = mm_strdup("sysid");
@@ -44184,8 +40581,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2035:
-
-/* Line 1455 of yacc.c  */
 #line 11570 "preproc.y"
     { 
  (yyval.str) = mm_strdup("system");
@@ -44193,8 +40588,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2036:
-
-/* Line 1455 of yacc.c  */
 #line 11574 "preproc.y"
     { 
  (yyval.str) = mm_strdup("tables");
@@ -44202,8 +40595,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2037:
-
-/* Line 1455 of yacc.c  */
 #line 11578 "preproc.y"
     { 
  (yyval.str) = mm_strdup("tablespace");
@@ -44211,8 +40602,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2038:
-
-/* Line 1455 of yacc.c  */
 #line 11582 "preproc.y"
     { 
  (yyval.str) = mm_strdup("temp");
@@ -44220,8 +40609,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2039:
-
-/* Line 1455 of yacc.c  */
 #line 11586 "preproc.y"
     { 
  (yyval.str) = mm_strdup("template");
@@ -44229,8 +40616,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2040:
-
-/* Line 1455 of yacc.c  */
 #line 11590 "preproc.y"
     { 
  (yyval.str) = mm_strdup("temporary");
@@ -44238,8 +40623,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2041:
-
-/* Line 1455 of yacc.c  */
 #line 11594 "preproc.y"
     { 
  (yyval.str) = mm_strdup("text");
@@ -44247,8 +40630,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2042:
-
-/* Line 1455 of yacc.c  */
 #line 11598 "preproc.y"
     { 
  (yyval.str) = mm_strdup("transaction");
@@ -44256,8 +40637,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2043:
-
-/* Line 1455 of yacc.c  */
 #line 11602 "preproc.y"
     { 
  (yyval.str) = mm_strdup("trigger");
@@ -44265,8 +40644,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2044:
-
-/* Line 1455 of yacc.c  */
 #line 11606 "preproc.y"
     { 
  (yyval.str) = mm_strdup("truncate");
@@ -44274,8 +40651,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2045:
-
-/* Line 1455 of yacc.c  */
 #line 11610 "preproc.y"
     { 
  (yyval.str) = mm_strdup("trusted");
@@ -44283,8 +40658,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2046:
-
-/* Line 1455 of yacc.c  */
 #line 11614 "preproc.y"
     { 
  (yyval.str) = mm_strdup("type");
@@ -44292,8 +40665,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2047:
-
-/* Line 1455 of yacc.c  */
 #line 11618 "preproc.y"
     { 
  (yyval.str) = mm_strdup("unbounded");
@@ -44301,8 +40672,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2048:
-
-/* Line 1455 of yacc.c  */
 #line 11622 "preproc.y"
     { 
  (yyval.str) = mm_strdup("uncommitted");
@@ -44310,8 +40679,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2049:
-
-/* Line 1455 of yacc.c  */
 #line 11626 "preproc.y"
     { 
  (yyval.str) = mm_strdup("unencrypted");
@@ -44319,8 +40686,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2050:
-
-/* Line 1455 of yacc.c  */
 #line 11630 "preproc.y"
     { 
  (yyval.str) = mm_strdup("unknown");
@@ -44328,8 +40693,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2051:
-
-/* Line 1455 of yacc.c  */
 #line 11634 "preproc.y"
     { 
  (yyval.str) = mm_strdup("unlisten");
@@ -44337,8 +40700,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2052:
-
-/* Line 1455 of yacc.c  */
 #line 11638 "preproc.y"
     { 
  (yyval.str) = mm_strdup("unlogged");
@@ -44346,8 +40707,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2053:
-
-/* Line 1455 of yacc.c  */
 #line 11642 "preproc.y"
     { 
  (yyval.str) = mm_strdup("until");
@@ -44355,8 +40714,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2054:
-
-/* Line 1455 of yacc.c  */
 #line 11646 "preproc.y"
     { 
  (yyval.str) = mm_strdup("update");
@@ -44364,8 +40721,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2055:
-
-/* Line 1455 of yacc.c  */
 #line 11650 "preproc.y"
     { 
  (yyval.str) = mm_strdup("vacuum");
@@ -44373,8 +40728,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2056:
-
-/* Line 1455 of yacc.c  */
 #line 11654 "preproc.y"
     { 
  (yyval.str) = mm_strdup("valid");
@@ -44382,8 +40735,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2057:
-
-/* Line 1455 of yacc.c  */
 #line 11658 "preproc.y"
     { 
  (yyval.str) = mm_strdup("validate");
@@ -44391,8 +40742,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2058:
-
-/* Line 1455 of yacc.c  */
 #line 11662 "preproc.y"
     { 
  (yyval.str) = mm_strdup("validator");
@@ -44400,8 +40749,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2059:
-
-/* Line 1455 of yacc.c  */
 #line 11666 "preproc.y"
     { 
  (yyval.str) = mm_strdup("value");
@@ -44409,8 +40756,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2060:
-
-/* Line 1455 of yacc.c  */
 #line 11670 "preproc.y"
     { 
  (yyval.str) = mm_strdup("varying");
@@ -44418,8 +40763,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2061:
-
-/* Line 1455 of yacc.c  */
 #line 11674 "preproc.y"
     { 
  (yyval.str) = mm_strdup("version");
@@ -44427,8 +40770,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2062:
-
-/* Line 1455 of yacc.c  */
 #line 11678 "preproc.y"
     { 
  (yyval.str) = mm_strdup("view");
@@ -44436,8 +40777,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2063:
-
-/* Line 1455 of yacc.c  */
 #line 11682 "preproc.y"
     { 
  (yyval.str) = mm_strdup("volatile");
@@ -44445,8 +40784,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2064:
-
-/* Line 1455 of yacc.c  */
 #line 11686 "preproc.y"
     { 
  (yyval.str) = mm_strdup("whitespace");
@@ -44454,8 +40791,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2065:
-
-/* Line 1455 of yacc.c  */
 #line 11690 "preproc.y"
     { 
  (yyval.str) = mm_strdup("without");
@@ -44463,8 +40798,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2066:
-
-/* Line 1455 of yacc.c  */
 #line 11694 "preproc.y"
     { 
  (yyval.str) = mm_strdup("work");
@@ -44472,8 +40805,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2067:
-
-/* Line 1455 of yacc.c  */
 #line 11698 "preproc.y"
     { 
  (yyval.str) = mm_strdup("wrapper");
@@ -44481,8 +40812,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2068:
-
-/* Line 1455 of yacc.c  */
 #line 11702 "preproc.y"
     { 
  (yyval.str) = mm_strdup("write");
@@ -44490,8 +40819,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2069:
-
-/* Line 1455 of yacc.c  */
 #line 11706 "preproc.y"
     { 
  (yyval.str) = mm_strdup("xml");
@@ -44499,8 +40826,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2070:
-
-/* Line 1455 of yacc.c  */
 #line 11710 "preproc.y"
     { 
  (yyval.str) = mm_strdup("yes");
@@ -44508,8 +40833,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2071:
-
-/* Line 1455 of yacc.c  */
 #line 11714 "preproc.y"
     { 
  (yyval.str) = mm_strdup("zone");
@@ -44517,8 +40840,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2072:
-
-/* Line 1455 of yacc.c  */
 #line 11722 "preproc.y"
     { 
  (yyval.str) = mm_strdup("between");
@@ -44526,8 +40847,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2073:
-
-/* Line 1455 of yacc.c  */
 #line 11726 "preproc.y"
     { 
  (yyval.str) = mm_strdup("bigint");
@@ -44535,8 +40854,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2074:
-
-/* Line 1455 of yacc.c  */
 #line 11730 "preproc.y"
     { 
  (yyval.str) = mm_strdup("bit");
@@ -44544,8 +40861,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2075:
-
-/* Line 1455 of yacc.c  */
 #line 11734 "preproc.y"
     { 
  (yyval.str) = mm_strdup("boolean");
@@ -44553,8 +40868,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2076:
-
-/* Line 1455 of yacc.c  */
 #line 11738 "preproc.y"
     { 
  (yyval.str) = mm_strdup("character");
@@ -44562,8 +40875,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2077:
-
-/* Line 1455 of yacc.c  */
 #line 11742 "preproc.y"
     { 
  (yyval.str) = mm_strdup("coalesce");
@@ -44571,8 +40882,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2078:
-
-/* Line 1455 of yacc.c  */
 #line 11746 "preproc.y"
     { 
  (yyval.str) = mm_strdup("dec");
@@ -44580,8 +40889,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2079:
-
-/* Line 1455 of yacc.c  */
 #line 11750 "preproc.y"
     { 
  (yyval.str) = mm_strdup("decimal");
@@ -44589,8 +40896,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2080:
-
-/* Line 1455 of yacc.c  */
 #line 11754 "preproc.y"
     { 
  (yyval.str) = mm_strdup("exists");
@@ -44598,8 +40903,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2081:
-
-/* Line 1455 of yacc.c  */
 #line 11758 "preproc.y"
     { 
  (yyval.str) = mm_strdup("extract");
@@ -44607,8 +40910,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2082:
-
-/* Line 1455 of yacc.c  */
 #line 11762 "preproc.y"
     { 
  (yyval.str) = mm_strdup("float");
@@ -44616,8 +40917,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2083:
-
-/* Line 1455 of yacc.c  */
 #line 11766 "preproc.y"
     { 
  (yyval.str) = mm_strdup("greatest");
@@ -44625,8 +40924,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2084:
-
-/* Line 1455 of yacc.c  */
 #line 11770 "preproc.y"
     { 
  (yyval.str) = mm_strdup("inout");
@@ -44634,8 +40931,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2085:
-
-/* Line 1455 of yacc.c  */
 #line 11774 "preproc.y"
     { 
  (yyval.str) = mm_strdup("integer");
@@ -44643,8 +40938,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2086:
-
-/* Line 1455 of yacc.c  */
 #line 11778 "preproc.y"
     { 
  (yyval.str) = mm_strdup("interval");
@@ -44652,8 +40945,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2087:
-
-/* Line 1455 of yacc.c  */
 #line 11782 "preproc.y"
     { 
  (yyval.str) = mm_strdup("least");
@@ -44661,8 +40952,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2088:
-
-/* Line 1455 of yacc.c  */
 #line 11786 "preproc.y"
     { 
  (yyval.str) = mm_strdup("national");
@@ -44670,8 +40959,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2089:
-
-/* Line 1455 of yacc.c  */
 #line 11790 "preproc.y"
     { 
  (yyval.str) = mm_strdup("nchar");
@@ -44679,8 +40966,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2090:
-
-/* Line 1455 of yacc.c  */
 #line 11794 "preproc.y"
     { 
  (yyval.str) = mm_strdup("none");
@@ -44688,8 +40973,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2091:
-
-/* Line 1455 of yacc.c  */
 #line 11798 "preproc.y"
     { 
  (yyval.str) = mm_strdup("nullif");
@@ -44697,8 +40980,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2092:
-
-/* Line 1455 of yacc.c  */
 #line 11802 "preproc.y"
     { 
  (yyval.str) = mm_strdup("numeric");
@@ -44706,8 +40987,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2093:
-
-/* Line 1455 of yacc.c  */
 #line 11806 "preproc.y"
     { 
  (yyval.str) = mm_strdup("out");
@@ -44715,8 +40994,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2094:
-
-/* Line 1455 of yacc.c  */
 #line 11810 "preproc.y"
     { 
  (yyval.str) = mm_strdup("overlay");
@@ -44724,8 +41001,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2095:
-
-/* Line 1455 of yacc.c  */
 #line 11814 "preproc.y"
     { 
  (yyval.str) = mm_strdup("position");
@@ -44733,8 +41008,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2096:
-
-/* Line 1455 of yacc.c  */
 #line 11818 "preproc.y"
     { 
  (yyval.str) = mm_strdup("precision");
@@ -44742,8 +41015,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2097:
-
-/* Line 1455 of yacc.c  */
 #line 11822 "preproc.y"
     { 
  (yyval.str) = mm_strdup("real");
@@ -44751,8 +41022,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2098:
-
-/* Line 1455 of yacc.c  */
 #line 11826 "preproc.y"
     { 
  (yyval.str) = mm_strdup("row");
@@ -44760,8 +41029,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2099:
-
-/* Line 1455 of yacc.c  */
 #line 11830 "preproc.y"
     { 
  (yyval.str) = mm_strdup("setof");
@@ -44769,8 +41036,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2100:
-
-/* Line 1455 of yacc.c  */
 #line 11834 "preproc.y"
     { 
  (yyval.str) = mm_strdup("smallint");
@@ -44778,8 +41043,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2101:
-
-/* Line 1455 of yacc.c  */
 #line 11838 "preproc.y"
     { 
  (yyval.str) = mm_strdup("substring");
@@ -44787,8 +41050,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2102:
-
-/* Line 1455 of yacc.c  */
 #line 11842 "preproc.y"
     { 
  (yyval.str) = mm_strdup("time");
@@ -44796,8 +41057,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2103:
-
-/* Line 1455 of yacc.c  */
 #line 11846 "preproc.y"
     { 
  (yyval.str) = mm_strdup("timestamp");
@@ -44805,8 +41064,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2104:
-
-/* Line 1455 of yacc.c  */
 #line 11850 "preproc.y"
     { 
  (yyval.str) = mm_strdup("treat");
@@ -44814,8 +41071,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2105:
-
-/* Line 1455 of yacc.c  */
 #line 11854 "preproc.y"
     { 
  (yyval.str) = mm_strdup("trim");
@@ -44823,8 +41078,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2106:
-
-/* Line 1455 of yacc.c  */
 #line 11858 "preproc.y"
     { 
  (yyval.str) = mm_strdup("varchar");
@@ -44832,8 +41085,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2107:
-
-/* Line 1455 of yacc.c  */
 #line 11862 "preproc.y"
     { 
  (yyval.str) = mm_strdup("xmlattributes");
@@ -44841,8 +41092,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2108:
-
-/* Line 1455 of yacc.c  */
 #line 11866 "preproc.y"
     { 
  (yyval.str) = mm_strdup("xmlconcat");
@@ -44850,8 +41099,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2109:
-
-/* Line 1455 of yacc.c  */
 #line 11870 "preproc.y"
     { 
  (yyval.str) = mm_strdup("xmlelement");
@@ -44859,8 +41106,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2110:
-
-/* Line 1455 of yacc.c  */
 #line 11874 "preproc.y"
     { 
  (yyval.str) = mm_strdup("xmlexists");
@@ -44868,8 +41113,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2111:
-
-/* Line 1455 of yacc.c  */
 #line 11878 "preproc.y"
     { 
  (yyval.str) = mm_strdup("xmlforest");
@@ -44877,8 +41120,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2112:
-
-/* Line 1455 of yacc.c  */
 #line 11882 "preproc.y"
     { 
  (yyval.str) = mm_strdup("xmlparse");
@@ -44886,8 +41127,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2113:
-
-/* Line 1455 of yacc.c  */
 #line 11886 "preproc.y"
     { 
  (yyval.str) = mm_strdup("xmlpi");
@@ -44895,8 +41134,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2114:
-
-/* Line 1455 of yacc.c  */
 #line 11890 "preproc.y"
     { 
  (yyval.str) = mm_strdup("xmlroot");
@@ -44904,8 +41141,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2115:
-
-/* Line 1455 of yacc.c  */
 #line 11894 "preproc.y"
     { 
  (yyval.str) = mm_strdup("xmlserialize");
@@ -44913,8 +41148,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2116:
-
-/* Line 1455 of yacc.c  */
 #line 11902 "preproc.y"
     { 
  (yyval.str) = mm_strdup("authorization");
@@ -44922,8 +41155,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2117:
-
-/* Line 1455 of yacc.c  */
 #line 11906 "preproc.y"
     { 
  (yyval.str) = mm_strdup("binary");
@@ -44931,8 +41162,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2118:
-
-/* Line 1455 of yacc.c  */
 #line 11910 "preproc.y"
     { 
  (yyval.str) = mm_strdup("concurrently");
@@ -44940,8 +41169,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2119:
-
-/* Line 1455 of yacc.c  */
 #line 11914 "preproc.y"
     { 
  (yyval.str) = mm_strdup("cross");
@@ -44949,8 +41176,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2120:
-
-/* Line 1455 of yacc.c  */
 #line 11918 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_schema");
@@ -44958,8 +41183,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2121:
-
-/* Line 1455 of yacc.c  */
 #line 11922 "preproc.y"
     { 
  (yyval.str) = mm_strdup("freeze");
@@ -44967,8 +41190,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2122:
-
-/* Line 1455 of yacc.c  */
 #line 11926 "preproc.y"
     { 
  (yyval.str) = mm_strdup("full");
@@ -44976,8 +41197,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2123:
-
-/* Line 1455 of yacc.c  */
 #line 11930 "preproc.y"
     { 
  (yyval.str) = mm_strdup("ilike");
@@ -44985,8 +41204,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2124:
-
-/* Line 1455 of yacc.c  */
 #line 11934 "preproc.y"
     { 
  (yyval.str) = mm_strdup("inner");
@@ -44994,8 +41211,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2125:
-
-/* Line 1455 of yacc.c  */
 #line 11938 "preproc.y"
     { 
  (yyval.str) = mm_strdup("is");
@@ -45003,8 +41218,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2126:
-
-/* Line 1455 of yacc.c  */
 #line 11942 "preproc.y"
     { 
  (yyval.str) = mm_strdup("isnull");
@@ -45012,8 +41225,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2127:
-
-/* Line 1455 of yacc.c  */
 #line 11946 "preproc.y"
     { 
  (yyval.str) = mm_strdup("join");
@@ -45021,8 +41232,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2128:
-
-/* Line 1455 of yacc.c  */
 #line 11950 "preproc.y"
     { 
  (yyval.str) = mm_strdup("left");
@@ -45030,8 +41239,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2129:
-
-/* Line 1455 of yacc.c  */
 #line 11954 "preproc.y"
     { 
  (yyval.str) = mm_strdup("like");
@@ -45039,8 +41246,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2130:
-
-/* Line 1455 of yacc.c  */
 #line 11958 "preproc.y"
     { 
  (yyval.str) = mm_strdup("natural");
@@ -45048,8 +41253,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2131:
-
-/* Line 1455 of yacc.c  */
 #line 11962 "preproc.y"
     { 
  (yyval.str) = mm_strdup("notnull");
@@ -45057,8 +41260,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2132:
-
-/* Line 1455 of yacc.c  */
 #line 11966 "preproc.y"
     { 
  (yyval.str) = mm_strdup("outer");
@@ -45066,8 +41267,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2133:
-
-/* Line 1455 of yacc.c  */
 #line 11970 "preproc.y"
     { 
  (yyval.str) = mm_strdup("over");
@@ -45075,8 +41274,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2134:
-
-/* Line 1455 of yacc.c  */
 #line 11974 "preproc.y"
     { 
  (yyval.str) = mm_strdup("overlaps");
@@ -45084,8 +41281,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2135:
-
-/* Line 1455 of yacc.c  */
 #line 11978 "preproc.y"
     { 
  (yyval.str) = mm_strdup("right");
@@ -45093,8 +41288,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2136:
-
-/* Line 1455 of yacc.c  */
 #line 11982 "preproc.y"
     { 
  (yyval.str) = mm_strdup("similar");
@@ -45102,8 +41295,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2137:
-
-/* Line 1455 of yacc.c  */
 #line 11986 "preproc.y"
     { 
  (yyval.str) = mm_strdup("verbose");
@@ -45111,8 +41302,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2138:
-
-/* Line 1455 of yacc.c  */
 #line 11994 "preproc.y"
     { 
  (yyval.str) = mm_strdup("all");
@@ -45120,8 +41309,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2139:
-
-/* Line 1455 of yacc.c  */
 #line 11998 "preproc.y"
     { 
  (yyval.str) = mm_strdup("analyse");
@@ -45129,8 +41316,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2140:
-
-/* Line 1455 of yacc.c  */
 #line 12002 "preproc.y"
     { 
  (yyval.str) = mm_strdup("analyze");
@@ -45138,8 +41323,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2141:
-
-/* Line 1455 of yacc.c  */
 #line 12006 "preproc.y"
     { 
  (yyval.str) = mm_strdup("and");
@@ -45147,8 +41330,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2142:
-
-/* Line 1455 of yacc.c  */
 #line 12010 "preproc.y"
     { 
  (yyval.str) = mm_strdup("any");
@@ -45156,8 +41337,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2143:
-
-/* Line 1455 of yacc.c  */
 #line 12014 "preproc.y"
     { 
  (yyval.str) = mm_strdup("array");
@@ -45165,8 +41344,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2144:
-
-/* Line 1455 of yacc.c  */
 #line 12018 "preproc.y"
     { 
  (yyval.str) = mm_strdup("as");
@@ -45174,8 +41351,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2145:
-
-/* Line 1455 of yacc.c  */
 #line 12022 "preproc.y"
     { 
  (yyval.str) = mm_strdup("asc");
@@ -45183,8 +41358,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2146:
-
-/* Line 1455 of yacc.c  */
 #line 12026 "preproc.y"
     { 
  (yyval.str) = mm_strdup("asymmetric");
@@ -45192,8 +41365,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2147:
-
-/* Line 1455 of yacc.c  */
 #line 12030 "preproc.y"
     { 
  (yyval.str) = mm_strdup("both");
@@ -45201,8 +41372,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2148:
-
-/* Line 1455 of yacc.c  */
 #line 12034 "preproc.y"
     { 
  (yyval.str) = mm_strdup("case");
@@ -45210,8 +41379,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2149:
-
-/* Line 1455 of yacc.c  */
 #line 12038 "preproc.y"
     { 
  (yyval.str) = mm_strdup("cast");
@@ -45219,8 +41386,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2150:
-
-/* Line 1455 of yacc.c  */
 #line 12042 "preproc.y"
     { 
  (yyval.str) = mm_strdup("check");
@@ -45228,8 +41393,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2151:
-
-/* Line 1455 of yacc.c  */
 #line 12046 "preproc.y"
     { 
  (yyval.str) = mm_strdup("collate");
@@ -45237,8 +41400,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2152:
-
-/* Line 1455 of yacc.c  */
 #line 12050 "preproc.y"
     { 
  (yyval.str) = mm_strdup("column");
@@ -45246,8 +41407,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2153:
-
-/* Line 1455 of yacc.c  */
 #line 12054 "preproc.y"
     { 
  (yyval.str) = mm_strdup("constraint");
@@ -45255,8 +41414,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2154:
-
-/* Line 1455 of yacc.c  */
 #line 12058 "preproc.y"
     { 
  (yyval.str) = mm_strdup("create");
@@ -45264,8 +41421,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2155:
-
-/* Line 1455 of yacc.c  */
 #line 12062 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_catalog");
@@ -45273,8 +41428,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2156:
-
-/* Line 1455 of yacc.c  */
 #line 12066 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_date");
@@ -45282,8 +41435,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2157:
-
-/* Line 1455 of yacc.c  */
 #line 12070 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_role");
@@ -45291,8 +41442,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2158:
-
-/* Line 1455 of yacc.c  */
 #line 12074 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_time");
@@ -45300,8 +41449,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2159:
-
-/* Line 1455 of yacc.c  */
 #line 12078 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_timestamp");
@@ -45309,8 +41456,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2160:
-
-/* Line 1455 of yacc.c  */
 #line 12082 "preproc.y"
     { 
  (yyval.str) = mm_strdup("current_user");
@@ -45318,8 +41463,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2161:
-
-/* Line 1455 of yacc.c  */
 #line 12086 "preproc.y"
     { 
  (yyval.str) = mm_strdup("default");
@@ -45327,8 +41470,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2162:
-
-/* Line 1455 of yacc.c  */
 #line 12090 "preproc.y"
     { 
  (yyval.str) = mm_strdup("deferrable");
@@ -45336,8 +41477,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2163:
-
-/* Line 1455 of yacc.c  */
 #line 12094 "preproc.y"
     { 
  (yyval.str) = mm_strdup("desc");
@@ -45345,8 +41484,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2164:
-
-/* Line 1455 of yacc.c  */
 #line 12098 "preproc.y"
     { 
  (yyval.str) = mm_strdup("distinct");
@@ -45354,8 +41491,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2165:
-
-/* Line 1455 of yacc.c  */
 #line 12102 "preproc.y"
     { 
  (yyval.str) = mm_strdup("do");
@@ -45363,8 +41498,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2166:
-
-/* Line 1455 of yacc.c  */
 #line 12106 "preproc.y"
     { 
  (yyval.str) = mm_strdup("else");
@@ -45372,8 +41505,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2167:
-
-/* Line 1455 of yacc.c  */
 #line 12110 "preproc.y"
     { 
  (yyval.str) = mm_strdup("end");
@@ -45381,8 +41512,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2168:
-
-/* Line 1455 of yacc.c  */
 #line 12114 "preproc.y"
     { 
  (yyval.str) = mm_strdup("except");
@@ -45390,8 +41519,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2169:
-
-/* Line 1455 of yacc.c  */
 #line 12118 "preproc.y"
     { 
  (yyval.str) = mm_strdup("false");
@@ -45399,8 +41526,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2170:
-
-/* Line 1455 of yacc.c  */
 #line 12122 "preproc.y"
     { 
  (yyval.str) = mm_strdup("fetch");
@@ -45408,8 +41533,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2171:
-
-/* Line 1455 of yacc.c  */
 #line 12126 "preproc.y"
     { 
  (yyval.str) = mm_strdup("for");
@@ -45417,8 +41540,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2172:
-
-/* Line 1455 of yacc.c  */
 #line 12130 "preproc.y"
     { 
  (yyval.str) = mm_strdup("foreign");
@@ -45426,8 +41547,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2173:
-
-/* Line 1455 of yacc.c  */
 #line 12134 "preproc.y"
     { 
  (yyval.str) = mm_strdup("from");
@@ -45435,8 +41554,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2174:
-
-/* Line 1455 of yacc.c  */
 #line 12138 "preproc.y"
     { 
  (yyval.str) = mm_strdup("grant");
@@ -45444,8 +41561,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2175:
-
-/* Line 1455 of yacc.c  */
 #line 12142 "preproc.y"
     { 
  (yyval.str) = mm_strdup("group");
@@ -45453,8 +41568,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2176:
-
-/* Line 1455 of yacc.c  */
 #line 12146 "preproc.y"
     { 
  (yyval.str) = mm_strdup("having");
@@ -45462,8 +41575,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2177:
-
-/* Line 1455 of yacc.c  */
 #line 12150 "preproc.y"
     { 
  (yyval.str) = mm_strdup("in");
@@ -45471,8 +41582,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2178:
-
-/* Line 1455 of yacc.c  */
 #line 12154 "preproc.y"
     { 
  (yyval.str) = mm_strdup("initially");
@@ -45480,8 +41589,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2179:
-
-/* Line 1455 of yacc.c  */
 #line 12158 "preproc.y"
     { 
  (yyval.str) = mm_strdup("intersect");
@@ -45489,8 +41596,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2180:
-
-/* Line 1455 of yacc.c  */
 #line 12162 "preproc.y"
     { 
  (yyval.str) = mm_strdup("into");
@@ -45498,8 +41603,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2181:
-
-/* Line 1455 of yacc.c  */
 #line 12166 "preproc.y"
     { 
  (yyval.str) = mm_strdup("leading");
@@ -45507,8 +41610,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2182:
-
-/* Line 1455 of yacc.c  */
 #line 12170 "preproc.y"
     { 
  (yyval.str) = mm_strdup("limit");
@@ -45516,8 +41617,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2183:
-
-/* Line 1455 of yacc.c  */
 #line 12174 "preproc.y"
     { 
  (yyval.str) = mm_strdup("localtime");
@@ -45525,8 +41624,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2184:
-
-/* Line 1455 of yacc.c  */
 #line 12178 "preproc.y"
     { 
  (yyval.str) = mm_strdup("localtimestamp");
@@ -45534,8 +41631,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2185:
-
-/* Line 1455 of yacc.c  */
 #line 12182 "preproc.y"
     { 
  (yyval.str) = mm_strdup("not");
@@ -45543,8 +41638,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2186:
-
-/* Line 1455 of yacc.c  */
 #line 12186 "preproc.y"
     { 
  (yyval.str) = mm_strdup("null");
@@ -45552,8 +41645,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2187:
-
-/* Line 1455 of yacc.c  */
 #line 12190 "preproc.y"
     { 
  (yyval.str) = mm_strdup("offset");
@@ -45561,8 +41652,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2188:
-
-/* Line 1455 of yacc.c  */
 #line 12194 "preproc.y"
     { 
  (yyval.str) = mm_strdup("on");
@@ -45570,8 +41659,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2189:
-
-/* Line 1455 of yacc.c  */
 #line 12198 "preproc.y"
     { 
  (yyval.str) = mm_strdup("only");
@@ -45579,8 +41666,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2190:
-
-/* Line 1455 of yacc.c  */
 #line 12202 "preproc.y"
     { 
  (yyval.str) = mm_strdup("or");
@@ -45588,8 +41673,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2191:
-
-/* Line 1455 of yacc.c  */
 #line 12206 "preproc.y"
     { 
  (yyval.str) = mm_strdup("order");
@@ -45597,8 +41680,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2192:
-
-/* Line 1455 of yacc.c  */
 #line 12210 "preproc.y"
     { 
  (yyval.str) = mm_strdup("placing");
@@ -45606,8 +41687,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2193:
-
-/* Line 1455 of yacc.c  */
 #line 12214 "preproc.y"
     { 
  (yyval.str) = mm_strdup("primary");
@@ -45615,8 +41694,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2194:
-
-/* Line 1455 of yacc.c  */
 #line 12218 "preproc.y"
     { 
  (yyval.str) = mm_strdup("references");
@@ -45624,8 +41701,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2195:
-
-/* Line 1455 of yacc.c  */
 #line 12222 "preproc.y"
     { 
  (yyval.str) = mm_strdup("returning");
@@ -45633,8 +41708,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2196:
-
-/* Line 1455 of yacc.c  */
 #line 12226 "preproc.y"
     { 
  (yyval.str) = mm_strdup("select");
@@ -45642,8 +41715,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2197:
-
-/* Line 1455 of yacc.c  */
 #line 12230 "preproc.y"
     { 
  (yyval.str) = mm_strdup("session_user");
@@ -45651,8 +41722,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2198:
-
-/* Line 1455 of yacc.c  */
 #line 12234 "preproc.y"
     { 
  (yyval.str) = mm_strdup("some");
@@ -45660,8 +41729,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2199:
-
-/* Line 1455 of yacc.c  */
 #line 12238 "preproc.y"
     { 
  (yyval.str) = mm_strdup("symmetric");
@@ -45669,8 +41736,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2200:
-
-/* Line 1455 of yacc.c  */
 #line 12242 "preproc.y"
     { 
  (yyval.str) = mm_strdup("table");
@@ -45678,8 +41743,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2201:
-
-/* Line 1455 of yacc.c  */
 #line 12246 "preproc.y"
     { 
  (yyval.str) = mm_strdup("then");
@@ -45687,8 +41750,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2202:
-
-/* Line 1455 of yacc.c  */
 #line 12250 "preproc.y"
     { 
  (yyval.str) = mm_strdup("trailing");
@@ -45696,8 +41757,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2203:
-
-/* Line 1455 of yacc.c  */
 #line 12254 "preproc.y"
     { 
  (yyval.str) = mm_strdup("true");
@@ -45705,8 +41764,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2204:
-
-/* Line 1455 of yacc.c  */
 #line 12258 "preproc.y"
     { 
  (yyval.str) = mm_strdup("unique");
@@ -45714,8 +41771,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2205:
-
-/* Line 1455 of yacc.c  */
 #line 12262 "preproc.y"
     { 
  (yyval.str) = mm_strdup("user");
@@ -45723,8 +41778,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2206:
-
-/* Line 1455 of yacc.c  */
 #line 12266 "preproc.y"
     { 
  (yyval.str) = mm_strdup("using");
@@ -45732,8 +41785,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2207:
-
-/* Line 1455 of yacc.c  */
 #line 12270 "preproc.y"
     { 
  (yyval.str) = mm_strdup("variadic");
@@ -45741,8 +41792,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2208:
-
-/* Line 1455 of yacc.c  */
 #line 12274 "preproc.y"
     { 
  (yyval.str) = mm_strdup("when");
@@ -45750,8 +41799,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2209:
-
-/* Line 1455 of yacc.c  */
 #line 12278 "preproc.y"
     { 
  (yyval.str) = mm_strdup("where");
@@ -45759,8 +41806,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2210:
-
-/* Line 1455 of yacc.c  */
 #line 12282 "preproc.y"
     { 
  (yyval.str) = mm_strdup("window");
@@ -45768,8 +41813,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2211:
-
-/* Line 1455 of yacc.c  */
 #line 12286 "preproc.y"
     { 
  (yyval.str) = mm_strdup("with");
@@ -45777,15 +41820,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2214:
-
-/* Line 1455 of yacc.c  */
 #line 12299 "preproc.y"
     { connection = NULL; ;}
     break;
 
   case 2216:
-
-/* Line 1455 of yacc.c  */
 #line 12302 "preproc.y"
     {
                         fprintf(yyout, "%s", (yyvsp[(2) - (2)].str));
@@ -45795,29 +41834,21 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2218:
-
-/* Line 1455 of yacc.c  */
 #line 12308 "preproc.y"
     { fprintf(yyout, "%s", (yyvsp[(1) - (1)].str)); free((yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 2219:
-
-/* Line 1455 of yacc.c  */
 #line 12309 "preproc.y"
     { fprintf(yyout, "%s", (yyvsp[(1) - (1)].str)); free((yyvsp[(1) - (1)].str)); ;}
     break;
 
   case 2220:
-
-/* Line 1455 of yacc.c  */
 #line 12310 "preproc.y"
     { braces_open++; fputs("{", yyout); ;}
     break;
 
   case 2221:
-
-/* Line 1455 of yacc.c  */
 #line 12312 "preproc.y"
     {
 			remove_typedefs(braces_open);
@@ -45832,15 +41863,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2222:
-
-/* Line 1455 of yacc.c  */
 #line 12324 "preproc.y"
     {FoundInto = 0;;}
     break;
 
   case 2223:
-
-/* Line 1455 of yacc.c  */
 #line 12325 "preproc.y"
     {
 			if (FoundInto == 1)
@@ -45851,8 +41878,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2224:
-
-/* Line 1455 of yacc.c  */
 #line 12334 "preproc.y"
     {
                         connection = (yyvsp[(2) - (2)].str);
@@ -45867,36 +41892,26 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2225:
-
-/* Line 1455 of yacc.c  */
 #line 12350 "preproc.y"
     { (yyval.str) = cat_str(5, (yyvsp[(3) - (5)].str), mm_strdup(","), (yyvsp[(5) - (5)].str), mm_strdup(","), (yyvsp[(4) - (5)].str)); ;}
     break;
 
   case 2226:
-
-/* Line 1455 of yacc.c  */
 #line 12352 "preproc.y"
     { (yyval.str) = mm_strdup("NULL, NULL, NULL, \"DEFAULT\""); ;}
     break;
 
   case 2227:
-
-/* Line 1455 of yacc.c  */
 #line 12355 "preproc.y"
     { (yyval.str) = cat_str(3, mm_strdup("NULL,"), (yyvsp[(2) - (2)].str), mm_strdup(", NULL")); ;}
     break;
 
   case 2228:
-
-/* Line 1455 of yacc.c  */
 #line 12357 "preproc.y"
     { (yyval.str) = cat2_str((yyvsp[(2) - (2)].str), mm_strdup(", NULL, NULL, NULL")); ;}
     break;
 
   case 2229:
-
-/* Line 1455 of yacc.c  */
 #line 12361 "preproc.y"
     {
 			/* old style: dbname[@server][:port] */
@@ -45912,8 +41927,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2230:
-
-/* Line 1455 of yacc.c  */
 #line 12373 "preproc.y"
     {
 			/* new style: <tcp|unix>:postgresql://server[:port][/dbname] */
@@ -45933,8 +41946,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2231:
-
-/* Line 1455 of yacc.c  */
 #line 12389 "preproc.y"
     {
 			(yyval.str) = (yyvsp[(1) - (1)].str);
@@ -45942,8 +41953,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2232:
-
-/* Line 1455 of yacc.c  */
 #line 12393 "preproc.y"
     {
 			/* We can only process double quoted strings not single quotes ones,
@@ -45956,22 +41965,16 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2233:
-
-/* Line 1455 of yacc.c  */
 #line 12403 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2234:
-
-/* Line 1455 of yacc.c  */
 #line 12404 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2235:
-
-/* Line 1455 of yacc.c  */
 #line 12408 "preproc.y"
     {
 			if (strcmp((yyvsp[(2) - (2)].str), "postgresql") != 0 && strcmp((yyvsp[(2) - (2)].str), "postgres") != 0)
@@ -45985,8 +41988,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2236:
-
-/* Line 1455 of yacc.c  */
 #line 12420 "preproc.y"
     {
 			if (strcmp((yyvsp[(1) - (2)].str), "@") != 0 && strcmp((yyvsp[(1) - (2)].str), "//") != 0)
@@ -45997,113 +41998,81 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2237:
-
-/* Line 1455 of yacc.c  */
 #line 12428 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2238:
-
-/* Line 1455 of yacc.c  */
 #line 12429 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2239:
-
-/* Line 1455 of yacc.c  */
 #line 12432 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2240:
-
-/* Line 1455 of yacc.c  */
 #line 12433 "preproc.y"
     { (yyval.str) = make3_str((yyvsp[(1) - (3)].str), mm_strdup("."), (yyvsp[(3) - (3)].str)); ;}
     break;
 
   case 2241:
-
-/* Line 1455 of yacc.c  */
 #line 12434 "preproc.y"
     { (yyval.str) = make_name(); ;}
     break;
 
   case 2242:
-
-/* Line 1455 of yacc.c  */
 #line 12437 "preproc.y"
     { (yyval.str) = make2_str(mm_strdup(":"), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2243:
-
-/* Line 1455 of yacc.c  */
 #line 12438 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2244:
-
-/* Line 1455 of yacc.c  */
 #line 12441 "preproc.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 2245:
-
-/* Line 1455 of yacc.c  */
 #line 12442 "preproc.y"
     { (yyval.str) = mm_strdup("NULL"); ;}
     break;
 
   case 2246:
-
-/* Line 1455 of yacc.c  */
 #line 12445 "preproc.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 2247:
-
-/* Line 1455 of yacc.c  */
 #line 12446 "preproc.y"
     { (yyval.str) = mm_strdup("NULL, NULL"); ;}
     break;
 
   case 2248:
-
-/* Line 1455 of yacc.c  */
 #line 12450 "preproc.y"
     { (yyval.str) = cat2_str((yyvsp[(1) - (1)].str), mm_strdup(", NULL")); ;}
     break;
 
   case 2249:
-
-/* Line 1455 of yacc.c  */
 #line 12452 "preproc.y"
     { (yyval.str) = cat_str(3, (yyvsp[(1) - (3)].str), mm_strdup(","), (yyvsp[(3) - (3)].str)); ;}
     break;
 
   case 2250:
-
-/* Line 1455 of yacc.c  */
 #line 12454 "preproc.y"
     { (yyval.str) = cat_str(3, (yyvsp[(1) - (4)].str), mm_strdup(","), (yyvsp[(4) - (4)].str)); ;}
     break;
 
   case 2251:
-
-/* Line 1455 of yacc.c  */
 #line 12456 "preproc.y"
     { (yyval.str) = cat_str(3, (yyvsp[(1) - (3)].str), mm_strdup(","), (yyvsp[(3) - (3)].str)); ;}
     break;
 
   case 2252:
-
-/* Line 1455 of yacc.c  */
 #line 12460 "preproc.y"
     {
 			if ((yyvsp[(1) - (1)].str)[0] == '\"')
@@ -46114,8 +42083,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2253:
-
-/* Line 1455 of yacc.c  */
 #line 12467 "preproc.y"
     {
 			if ((yyvsp[(1) - (1)].str)[0] == '\"')
@@ -46126,8 +42093,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2254:
-
-/* Line 1455 of yacc.c  */
 #line 12474 "preproc.y"
     {
 			enum ECPGttype type = argsinsert->variable->type->type;
@@ -46145,8 +42110,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2255:
-
-/* Line 1455 of yacc.c  */
 #line 12490 "preproc.y"
     {
 			/* check if we have a string variable */
@@ -46182,8 +42145,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2256:
-
-/* Line 1455 of yacc.c  */
 #line 12524 "preproc.y"
     {
 			if (strlen((yyvsp[(1) - (2)].str)) == 0)
@@ -46197,22 +42158,16 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2257:
-
-/* Line 1455 of yacc.c  */
 #line 12533 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2258:
-
-/* Line 1455 of yacc.c  */
 #line 12537 "preproc.y"
     { (yyval.str) = make2_str((yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2259:
-
-/* Line 1455 of yacc.c  */
 #line 12539 "preproc.y"
     {
 				if (strlen((yyvsp[(3) - (4)].str)) == 0)
@@ -46226,36 +42181,26 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2260:
-
-/* Line 1455 of yacc.c  */
 #line 12551 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2261:
-
-/* Line 1455 of yacc.c  */
 #line 12553 "preproc.y"
     { (yyval.str) = make2_str(mm_strdup("="), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2262:
-
-/* Line 1455 of yacc.c  */
 #line 12555 "preproc.y"
     { (yyval.str) = make2_str(mm_strdup("="), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2263:
-
-/* Line 1455 of yacc.c  */
 #line 12557 "preproc.y"
     { (yyval.str) = make2_str(mm_strdup("="), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2264:
-
-/* Line 1455 of yacc.c  */
 #line 12560 "preproc.y"
     {
                                         if ((yyvsp[(1) - (1)].str)[0] == '\"' && (yyvsp[(1) - (1)].str)[strlen((yyvsp[(1) - (1)].str))-1] == '\"') /* already quoted? */
@@ -46273,15 +42218,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2265:
-
-/* Line 1455 of yacc.c  */
 #line 12573 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2266:
-
-/* Line 1455 of yacc.c  */
 #line 12581 "preproc.y"
     {
 			struct cursor *ptr, *this;
@@ -46344,8 +42285,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2267:
-
-/* Line 1455 of yacc.c  */
 #line 12642 "preproc.y"
     {
 			  /* execute immediate means prepare the statement and
@@ -46355,85 +42294,61 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2269:
-
-/* Line 1455 of yacc.c  */
 #line 12652 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2270:
-
-/* Line 1455 of yacc.c  */
 #line 12653 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2271:
-
-/* Line 1455 of yacc.c  */
 #line 12656 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2272:
-
-/* Line 1455 of yacc.c  */
 #line 12658 "preproc.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 2273:
-
-/* Line 1455 of yacc.c  */
 #line 12659 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2274:
-
-/* Line 1455 of yacc.c  */
 #line 12662 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2275:
-
-/* Line 1455 of yacc.c  */
 #line 12663 "preproc.y"
     { (yyval.str) = mm_strdup("year to minute"); ;}
     break;
 
   case 2276:
-
-/* Line 1455 of yacc.c  */
 #line 12664 "preproc.y"
     { (yyval.str) = mm_strdup("year to second"); ;}
     break;
 
   case 2277:
-
-/* Line 1455 of yacc.c  */
 #line 12665 "preproc.y"
     { (yyval.str) = mm_strdup("day to day"); ;}
     break;
 
   case 2278:
-
-/* Line 1455 of yacc.c  */
 #line 12666 "preproc.y"
     { (yyval.str) = mm_strdup("month to month"); ;}
     break;
 
   case 2279:
-
-/* Line 1455 of yacc.c  */
 #line 12673 "preproc.y"
     { fputs("/* exec sql begin declare section */", yyout); ;}
     break;
 
   case 2280:
-
-/* Line 1455 of yacc.c  */
 #line 12675 "preproc.y"
     {
 			fprintf(yyout, "%s/* exec sql end declare section */", (yyvsp[(3) - (4)].str));
@@ -46443,78 +42358,56 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2281:
-
-/* Line 1455 of yacc.c  */
 #line 12682 "preproc.y"
     {;}
     break;
 
   case 2282:
-
-/* Line 1455 of yacc.c  */
 #line 12684 "preproc.y"
     {;}
     break;
 
   case 2283:
-
-/* Line 1455 of yacc.c  */
 #line 12686 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2284:
-
-/* Line 1455 of yacc.c  */
 #line 12687 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2285:
-
-/* Line 1455 of yacc.c  */
 #line 12690 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2286:
-
-/* Line 1455 of yacc.c  */
 #line 12691 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2287:
-
-/* Line 1455 of yacc.c  */
 #line 12692 "preproc.y"
     { (yyval.str) = cat2_str((yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2288:
-
-/* Line 1455 of yacc.c  */
 #line 12693 "preproc.y"
     { (yyval.str) = cat2_str((yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2289:
-
-/* Line 1455 of yacc.c  */
 #line 12696 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2290:
-
-/* Line 1455 of yacc.c  */
 #line 12697 "preproc.y"
     { (yyval.str) = cat2_str((yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2291:
-
-/* Line 1455 of yacc.c  */
 #line 12701 "preproc.y"
     {
 		/* reset this variable so we see if there was */
@@ -46524,8 +42417,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2292:
-
-/* Line 1455 of yacc.c  */
 #line 12707 "preproc.y"
     {
 		add_typedef((yyvsp[(5) - (7)].str), (yyvsp[(6) - (7)].index).index1, (yyvsp[(6) - (7)].index).index2, (yyvsp[(3) - (7)].type).type_enum, (yyvsp[(3) - (7)].type).type_dimension, (yyvsp[(3) - (7)].type).type_index, initializer, *(yyvsp[(4) - (7)].str) ? 1 : 0);
@@ -46537,8 +42428,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2293:
-
-/* Line 1455 of yacc.c  */
 #line 12717 "preproc.y"
     {
 			actual_type[struct_level].type_enum = (yyvsp[(2) - (2)].type).type_enum;
@@ -46552,8 +42441,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2294:
-
-/* Line 1455 of yacc.c  */
 #line 12727 "preproc.y"
     {
 			(yyval.str) = cat_str(5, actual_startline[struct_level], (yyvsp[(1) - (5)].str), (yyvsp[(2) - (5)].type).type_str, (yyvsp[(4) - (5)].str), mm_strdup(";\n"));
@@ -46561,8 +42448,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2295:
-
-/* Line 1455 of yacc.c  */
 #line 12731 "preproc.y"
     {
 			actual_type[struct_level].type_enum = (yyvsp[(1) - (1)].type).type_enum;
@@ -46576,8 +42461,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2296:
-
-/* Line 1455 of yacc.c  */
 #line 12741 "preproc.y"
     {
 			(yyval.str) = cat_str(4, actual_startline[struct_level], (yyvsp[(1) - (4)].type).type_str, (yyvsp[(3) - (4)].str), mm_strdup(";\n"));
@@ -46585,8 +42468,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2297:
-
-/* Line 1455 of yacc.c  */
 #line 12745 "preproc.y"
     {
 			(yyval.str) = cat2_str((yyvsp[(1) - (2)].str), mm_strdup(";"));
@@ -46594,85 +42475,61 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2298:
-
-/* Line 1455 of yacc.c  */
 #line 12750 "preproc.y"
     { (yyval.str) =cat2_str(mm_strdup(":"), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2299:
-
-/* Line 1455 of yacc.c  */
 #line 12751 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2300:
-
-/* Line 1455 of yacc.c  */
 #line 12755 "preproc.y"
     {(yyval.str) = cat2_str ((yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2301:
-
-/* Line 1455 of yacc.c  */
 #line 12756 "preproc.y"
     {(yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2302:
-
-/* Line 1455 of yacc.c  */
 #line 12757 "preproc.y"
     {(yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2303:
-
-/* Line 1455 of yacc.c  */
 #line 12760 "preproc.y"
     { (yyval.str) = mm_strdup("extern"); ;}
     break;
 
   case 2304:
-
-/* Line 1455 of yacc.c  */
 #line 12761 "preproc.y"
     { (yyval.str) = mm_strdup("static"); ;}
     break;
 
   case 2305:
-
-/* Line 1455 of yacc.c  */
 #line 12762 "preproc.y"
     { (yyval.str) = mm_strdup("register"); ;}
     break;
 
   case 2306:
-
-/* Line 1455 of yacc.c  */
 #line 12763 "preproc.y"
     { (yyval.str) = mm_strdup("auto"); ;}
     break;
 
   case 2307:
-
-/* Line 1455 of yacc.c  */
 #line 12766 "preproc.y"
     { (yyval.str) = mm_strdup("const"); ;}
     break;
 
   case 2308:
-
-/* Line 1455 of yacc.c  */
 #line 12767 "preproc.y"
     { (yyval.str) = mm_strdup("volatile"); ;}
     break;
 
   case 2309:
-
-/* Line 1455 of yacc.c  */
 #line 12771 "preproc.y"
     {
 			(yyval.type).type_enum = (yyvsp[(1) - (1)].type_enum);
@@ -46684,8 +42541,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2310:
-
-/* Line 1455 of yacc.c  */
 #line 12779 "preproc.y"
     {
 			(yyval.type).type_str = (yyvsp[(1) - (1)].str);
@@ -46706,8 +42561,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2311:
-
-/* Line 1455 of yacc.c  */
 #line 12796 "preproc.y"
     {
 			(yyval.type).type_str = (yyvsp[(1) - (1)].str);
@@ -46719,8 +42572,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2312:
-
-/* Line 1455 of yacc.c  */
 #line 12804 "preproc.y"
     {
 			if (strcmp((yyvsp[(1) - (5)].str), "numeric") == 0)
@@ -46747,8 +42598,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2313:
-
-/* Line 1455 of yacc.c  */
 #line 12827 "preproc.y"
     {
 			if (strlen((yyvsp[(2) - (2)].str)) != 0 && strcmp ((yyvsp[(1) - (2)].str), "datetime") != 0 && strcmp ((yyvsp[(1) - (2)].str), "interval") != 0)
@@ -46858,8 +42707,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2314:
-
-/* Line 1455 of yacc.c  */
 #line 12933 "preproc.y"
     {
 			/* this is for named structs/unions */
@@ -46895,36 +42742,26 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2315:
-
-/* Line 1455 of yacc.c  */
 #line 12967 "preproc.y"
     { (yyval.str) = cat_str(3, mm_strdup("enum"), (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)); ;}
     break;
 
   case 2316:
-
-/* Line 1455 of yacc.c  */
 #line 12969 "preproc.y"
     { (yyval.str) = cat2_str(mm_strdup("enum"), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2317:
-
-/* Line 1455 of yacc.c  */
 #line 12971 "preproc.y"
     { (yyval.str) = cat2_str(mm_strdup("enum"), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2318:
-
-/* Line 1455 of yacc.c  */
 #line 12975 "preproc.y"
     { (yyval.str) = cat_str(3, mm_strdup("{"), (yyvsp[(2) - (3)].str), mm_strdup("}")); ;}
     break;
 
   case 2319:
-
-/* Line 1455 of yacc.c  */
 #line 12978 "preproc.y"
     {
 			struct_member_list[struct_level++] = NULL;
@@ -46935,8 +42772,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2320:
-
-/* Line 1455 of yacc.c  */
 #line 12985 "preproc.y"
     {
 			struct typedefs *ptr, *this;
@@ -46982,15 +42817,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2321:
-
-/* Line 1455 of yacc.c  */
 #line 13028 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2322:
-
-/* Line 1455 of yacc.c  */
 #line 13030 "preproc.y"
     {
 			struct_member_list[struct_level++] = NULL;
@@ -47000,8 +42831,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2323:
-
-/* Line 1455 of yacc.c  */
 #line 13036 "preproc.y"
     {
 			ECPGfree_struct_member(struct_member_list[struct_level]);
@@ -47012,8 +42841,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2324:
-
-/* Line 1455 of yacc.c  */
 #line 13045 "preproc.y"
     {
 			(yyval.struct_union).su = mm_strdup("struct");
@@ -47023,8 +42850,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2325:
-
-/* Line 1455 of yacc.c  */
 #line 13051 "preproc.y"
     {
 			(yyval.struct_union).su = mm_strdup("union");
@@ -47033,8 +42858,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2326:
-
-/* Line 1455 of yacc.c  */
 #line 13058 "preproc.y"
     {
 			ECPGstruct_sizeof = mm_strdup(""); /* This must not be NULL to distinguish from simple types. */
@@ -47043,71 +42866,51 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2327:
-
-/* Line 1455 of yacc.c  */
 #line 13062 "preproc.y"
     { (yyval.str) = mm_strdup("union"); ;}
     break;
 
   case 2328:
-
-/* Line 1455 of yacc.c  */
 #line 13065 "preproc.y"
     { (yyval.type_enum)=(yyvsp[(1) - (1)].type_enum); ;}
     break;
 
   case 2329:
-
-/* Line 1455 of yacc.c  */
 #line 13066 "preproc.y"
     { (yyval.type_enum)=(yyvsp[(2) - (2)].type_enum); ;}
     break;
 
   case 2330:
-
-/* Line 1455 of yacc.c  */
 #line 13069 "preproc.y"
     { (yyval.type_enum) = ECPGt_unsigned_short; ;}
     break;
 
   case 2331:
-
-/* Line 1455 of yacc.c  */
 #line 13070 "preproc.y"
     { (yyval.type_enum) = ECPGt_unsigned_short; ;}
     break;
 
   case 2332:
-
-/* Line 1455 of yacc.c  */
 #line 13071 "preproc.y"
     { (yyval.type_enum) = ECPGt_unsigned_int; ;}
     break;
 
   case 2333:
-
-/* Line 1455 of yacc.c  */
 #line 13072 "preproc.y"
     { (yyval.type_enum) = ECPGt_unsigned_int; ;}
     break;
 
   case 2334:
-
-/* Line 1455 of yacc.c  */
 #line 13073 "preproc.y"
     { (yyval.type_enum) = ECPGt_unsigned_long; ;}
     break;
 
   case 2335:
-
-/* Line 1455 of yacc.c  */
 #line 13074 "preproc.y"
     { (yyval.type_enum) = ECPGt_unsigned_long; ;}
     break;
 
   case 2336:
-
-/* Line 1455 of yacc.c  */
 #line 13076 "preproc.y"
     {
 #ifdef HAVE_LONG_LONG_INT
@@ -47119,8 +42922,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2337:
-
-/* Line 1455 of yacc.c  */
 #line 13084 "preproc.y"
     {
 #ifdef HAVE_LONG_LONG_INT
@@ -47132,50 +42933,36 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2338:
-
-/* Line 1455 of yacc.c  */
 #line 13091 "preproc.y"
     { (yyval.type_enum) = ECPGt_unsigned_char; ;}
     break;
 
   case 2339:
-
-/* Line 1455 of yacc.c  */
 #line 13094 "preproc.y"
     { (yyval.type_enum) = ECPGt_short; ;}
     break;
 
   case 2340:
-
-/* Line 1455 of yacc.c  */
 #line 13095 "preproc.y"
     { (yyval.type_enum) = ECPGt_short; ;}
     break;
 
   case 2341:
-
-/* Line 1455 of yacc.c  */
 #line 13096 "preproc.y"
     { (yyval.type_enum) = ECPGt_int; ;}
     break;
 
   case 2342:
-
-/* Line 1455 of yacc.c  */
 #line 13097 "preproc.y"
     { (yyval.type_enum) = ECPGt_long; ;}
     break;
 
   case 2343:
-
-/* Line 1455 of yacc.c  */
 #line 13098 "preproc.y"
     { (yyval.type_enum) = ECPGt_long; ;}
     break;
 
   case 2344:
-
-/* Line 1455 of yacc.c  */
 #line 13100 "preproc.y"
     {
 #ifdef HAVE_LONG_LONG_INT
@@ -47187,8 +42974,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2345:
-
-/* Line 1455 of yacc.c  */
 #line 13108 "preproc.y"
     {
 #ifdef HAVE_LONG_LONG_INT
@@ -47200,43 +42985,31 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2346:
-
-/* Line 1455 of yacc.c  */
 #line 13115 "preproc.y"
     { (yyval.type_enum) = ECPGt_bool; ;}
     break;
 
   case 2347:
-
-/* Line 1455 of yacc.c  */
 #line 13116 "preproc.y"
     { (yyval.type_enum) = ECPGt_char; ;}
     break;
 
   case 2348:
-
-/* Line 1455 of yacc.c  */
 #line 13117 "preproc.y"
     { (yyval.type_enum) = ECPGt_double; ;}
     break;
 
   case 2351:
-
-/* Line 1455 of yacc.c  */
 #line 13125 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2352:
-
-/* Line 1455 of yacc.c  */
 #line 13127 "preproc.y"
     { (yyval.str) = cat_str(3, (yyvsp[(1) - (3)].str), mm_strdup(","), (yyvsp[(3) - (3)].str)); ;}
     break;
 
   case 2353:
-
-/* Line 1455 of yacc.c  */
 #line 13131 "preproc.y"
     {
 			struct ECPGtype * type;
@@ -47325,15 +43098,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2354:
-
-/* Line 1455 of yacc.c  */
 #line 13218 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2355:
-
-/* Line 1455 of yacc.c  */
 #line 13220 "preproc.y"
     {
 			initializer = 1;
@@ -47342,29 +43111,21 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2356:
-
-/* Line 1455 of yacc.c  */
 #line 13226 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2357:
-
-/* Line 1455 of yacc.c  */
 #line 13227 "preproc.y"
     { (yyval.str) = mm_strdup("*"); ;}
     break;
 
   case 2358:
-
-/* Line 1455 of yacc.c  */
 #line 13228 "preproc.y"
     { (yyval.str) = mm_strdup("**"); ;}
     break;
 
   case 2359:
-
-/* Line 1455 of yacc.c  */
 #line 13235 "preproc.y"
     {
 			/* this is only supported for compatibility */
@@ -47373,92 +43134,66 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2360:
-
-/* Line 1455 of yacc.c  */
 #line 13243 "preproc.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 2361:
-
-/* Line 1455 of yacc.c  */
 #line 13246 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2362:
-
-/* Line 1455 of yacc.c  */
 #line 13247 "preproc.y"
     { (yyval.str) = mm_strdup("\"CURRENT\""); ;}
     break;
 
   case 2363:
-
-/* Line 1455 of yacc.c  */
 #line 13248 "preproc.y"
     { (yyval.str) = mm_strdup("\"ALL\""); ;}
     break;
 
   case 2364:
-
-/* Line 1455 of yacc.c  */
 #line 13249 "preproc.y"
     { (yyval.str) = mm_strdup("\"CURRENT\""); ;}
     break;
 
   case 2365:
-
-/* Line 1455 of yacc.c  */
 #line 13252 "preproc.y"
     { (yyval.str) = make3_str(mm_strdup("\""), (yyvsp[(1) - (1)].str), mm_strdup("\"")); ;}
     break;
 
   case 2366:
-
-/* Line 1455 of yacc.c  */
 #line 13253 "preproc.y"
     { (yyval.str) = mm_strdup("\"DEFAULT\""); ;}
     break;
 
   case 2367:
-
-/* Line 1455 of yacc.c  */
 #line 13254 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2368:
-
-/* Line 1455 of yacc.c  */
 #line 13258 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2369:
-
-/* Line 1455 of yacc.c  */
 #line 13260 "preproc.y"
     { (yyval.str) = make3_str(mm_strdup("\""), (yyvsp[(1) - (1)].str), mm_strdup("\"")); ;}
     break;
 
   case 2370:
-
-/* Line 1455 of yacc.c  */
 #line 13267 "preproc.y"
     { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
     break;
 
   case 2371:
-
-/* Line 1455 of yacc.c  */
 #line 13268 "preproc.y"
     { (yyval.str) = mm_strdup("all"); ;}
     break;
 
   case 2372:
-
-/* Line 1455 of yacc.c  */
 #line 13275 "preproc.y"
     {
 			if ((yyvsp[(2) - (3)].str)[0] == ':')
@@ -47468,36 +43203,26 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2373:
-
-/* Line 1455 of yacc.c  */
 #line 13282 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2374:
-
-/* Line 1455 of yacc.c  */
 #line 13283 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2375:
-
-/* Line 1455 of yacc.c  */
 #line 13286 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2376:
-
-/* Line 1455 of yacc.c  */
 #line 13287 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2377:
-
-/* Line 1455 of yacc.c  */
 #line 13291 "preproc.y"
     {
 			add_variable_to_head(&argsinsert, descriptor_variable((yyvsp[(4) - (4)].str),0), &no_indicator);
@@ -47506,8 +43231,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2378:
-
-/* Line 1455 of yacc.c  */
 #line 13296 "preproc.y"
     {
 			add_variable_to_head(&argsinsert, sqlda_variable((yyvsp[(3) - (3)].str)), &no_indicator);
@@ -47516,8 +43239,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2379:
-
-/* Line 1455 of yacc.c  */
 #line 13303 "preproc.y"
     {
 			add_variable_to_head(&argsresult, descriptor_variable((yyvsp[(4) - (4)].str),1), &no_indicator);
@@ -47526,8 +43247,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2380:
-
-/* Line 1455 of yacc.c  */
 #line 13308 "preproc.y"
     {
 			add_variable_to_head(&argsresult, sqlda_variable((yyvsp[(3) - (3)].str)), &no_indicator);
@@ -47536,8 +43255,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2381:
-
-/* Line 1455 of yacc.c  */
 #line 13315 "preproc.y"
     {
 			add_variable_to_head(&argsresult, sqlda_variable((yyvsp[(2) - (2)].str)), &no_indicator);
@@ -47546,8 +43263,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2384:
-
-/* Line 1455 of yacc.c  */
 #line 13324 "preproc.y"
     {
 			char *length = mm_alloc(32);
@@ -47558,85 +43273,61 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2385:
-
-/* Line 1455 of yacc.c  */
 #line 13330 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2386:
-
-/* Line 1455 of yacc.c  */
 #line 13331 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2387:
-
-/* Line 1455 of yacc.c  */
 #line 13334 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2388:
-
-/* Line 1455 of yacc.c  */
 #line 13335 "preproc.y"
     { (yyval.str) = cat_str(2, mm_strdup("+"), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2389:
-
-/* Line 1455 of yacc.c  */
 #line 13336 "preproc.y"
     { (yyval.str) = cat_str(2, mm_strdup("-"), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2390:
-
-/* Line 1455 of yacc.c  */
 #line 13337 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2391:
-
-/* Line 1455 of yacc.c  */
 #line 13338 "preproc.y"
     { (yyval.str) = cat_str(2, mm_strdup("+"), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2392:
-
-/* Line 1455 of yacc.c  */
 #line 13339 "preproc.y"
     { (yyval.str) = cat_str(2, mm_strdup("-"), (yyvsp[(2) - (2)].str)); ;}
     break;
 
   case 2393:
-
-/* Line 1455 of yacc.c  */
 #line 13340 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2394:
-
-/* Line 1455 of yacc.c  */
 #line 13341 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2395:
-
-/* Line 1455 of yacc.c  */
 #line 13342 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2396:
-
-/* Line 1455 of yacc.c  */
 #line 13349 "preproc.y"
     {
 		const char *con = connection ? connection : "NULL";
@@ -47647,8 +43338,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2397:
-
-/* Line 1455 of yacc.c  */
 #line 13356 "preproc.y"
     {
 		const char *con = connection ? connection : "NULL";
@@ -47664,8 +43353,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2398:
-
-/* Line 1455 of yacc.c  */
 #line 13368 "preproc.y"
     {
 		const char *con = connection ? connection : "NULL";
@@ -47675,8 +43362,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2399:
-
-/* Line 1455 of yacc.c  */
 #line 13374 "preproc.y"
     {
 		const char *con = connection ? connection : "NULL";
@@ -47687,8 +43372,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2400:
-
-/* Line 1455 of yacc.c  */
 #line 13381 "preproc.y"
     {
 		const char *con = connection ? connection : "NULL";
@@ -47698,22 +43381,16 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2401:
-
-/* Line 1455 of yacc.c  */
 #line 13388 "preproc.y"
     { (yyval.str) = mm_strdup("output"); ;}
     break;
 
   case 2402:
-
-/* Line 1455 of yacc.c  */
 #line 13389 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2403:
-
-/* Line 1455 of yacc.c  */
 #line 13402 "preproc.y"
     {
 			add_descriptor((yyvsp[(3) - (3)].str),connection);
@@ -47722,8 +43399,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2404:
-
-/* Line 1455 of yacc.c  */
 #line 13413 "preproc.y"
     {
 			drop_descriptor((yyvsp[(3) - (3)].str),connection);
@@ -47732,29 +43407,21 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2405:
-
-/* Line 1455 of yacc.c  */
 #line 13424 "preproc.y"
     {  (yyval.str) = (yyvsp[(3) - (4)].str); ;}
     break;
 
   case 2408:
-
-/* Line 1455 of yacc.c  */
 #line 13432 "preproc.y"
     { push_assignment((yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].dtype_enum)); ;}
     break;
 
   case 2409:
-
-/* Line 1455 of yacc.c  */
 #line 13437 "preproc.y"
     { (yyval.str) = (yyvsp[(3) - (4)].str); ;}
     break;
 
   case 2412:
-
-/* Line 1455 of yacc.c  */
 #line 13445 "preproc.y"
     {
 			push_assignment((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].dtype_enum));
@@ -47762,8 +43429,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2413:
-
-/* Line 1455 of yacc.c  */
 #line 13451 "preproc.y"
     {
                         char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
@@ -47775,43 +43440,31 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2414:
-
-/* Line 1455 of yacc.c  */
 #line 13458 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2415:
-
-/* Line 1455 of yacc.c  */
 #line 13461 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_count; ;}
     break;
 
   case 2416:
-
-/* Line 1455 of yacc.c  */
 #line 13469 "preproc.y"
     {  (yyval.descriptor).str = (yyvsp[(5) - (6)].str); (yyval.descriptor).name = (yyvsp[(3) - (6)].str); ;}
     break;
 
   case 2419:
-
-/* Line 1455 of yacc.c  */
 #line 13476 "preproc.y"
     { push_assignment((yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].dtype_enum)); ;}
     break;
 
   case 2420:
-
-/* Line 1455 of yacc.c  */
 #line 13480 "preproc.y"
     {  (yyval.descriptor).str = (yyvsp[(5) - (6)].str); (yyval.descriptor).name = (yyvsp[(3) - (6)].str); ;}
     break;
 
   case 2423:
-
-/* Line 1455 of yacc.c  */
 #line 13488 "preproc.y"
     {
 			push_assignment((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].dtype_enum));
@@ -47819,8 +43472,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2424:
-
-/* Line 1455 of yacc.c  */
 #line 13494 "preproc.y"
     {
                         char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
@@ -47832,15 +43483,11 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2425:
-
-/* Line 1455 of yacc.c  */
 #line 13501 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2426:
-
-/* Line 1455 of yacc.c  */
 #line 13503 "preproc.y"
     {
                         char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
@@ -47853,8 +43500,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2427:
-
-/* Line 1455 of yacc.c  */
 #line 13512 "preproc.y"
     {
                         char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
@@ -47867,8 +43512,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2428:
-
-/* Line 1455 of yacc.c  */
 #line 13521 "preproc.y"
     {
                         char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
@@ -47882,162 +43525,116 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2429:
-
-/* Line 1455 of yacc.c  */
 #line 13532 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_cardinality; ;}
     break;
 
   case 2430:
-
-/* Line 1455 of yacc.c  */
 #line 13533 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_data; ;}
     break;
 
   case 2431:
-
-/* Line 1455 of yacc.c  */
 #line 13534 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_di_code; ;}
     break;
 
   case 2432:
-
-/* Line 1455 of yacc.c  */
 #line 13535 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_di_precision; ;}
     break;
 
   case 2433:
-
-/* Line 1455 of yacc.c  */
 #line 13536 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_indicator; ;}
     break;
 
   case 2434:
-
-/* Line 1455 of yacc.c  */
 #line 13537 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_key_member; ;}
     break;
 
   case 2435:
-
-/* Line 1455 of yacc.c  */
 #line 13538 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_length; ;}
     break;
 
   case 2436:
-
-/* Line 1455 of yacc.c  */
 #line 13539 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_name; ;}
     break;
 
   case 2437:
-
-/* Line 1455 of yacc.c  */
 #line 13540 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_nullable; ;}
     break;
 
   case 2438:
-
-/* Line 1455 of yacc.c  */
 #line 13541 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_octet; ;}
     break;
 
   case 2439:
-
-/* Line 1455 of yacc.c  */
 #line 13542 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_precision; ;}
     break;
 
   case 2440:
-
-/* Line 1455 of yacc.c  */
 #line 13543 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_length; ;}
     break;
 
   case 2441:
-
-/* Line 1455 of yacc.c  */
 #line 13544 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_ret_octet; ;}
     break;
 
   case 2442:
-
-/* Line 1455 of yacc.c  */
 #line 13545 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_scale; ;}
     break;
 
   case 2443:
-
-/* Line 1455 of yacc.c  */
 #line 13546 "preproc.y"
     { (yyval.dtype_enum) = ECPGd_type; ;}
     break;
 
   case 2444:
-
-/* Line 1455 of yacc.c  */
 #line 13553 "preproc.y"
     { (yyval.str) = (yyvsp[(4) - (4)].str); ;}
     break;
 
   case 2445:
-
-/* Line 1455 of yacc.c  */
 #line 13554 "preproc.y"
     { (yyval.str) = (yyvsp[(4) - (4)].str); ;}
     break;
 
   case 2446:
-
-/* Line 1455 of yacc.c  */
 #line 13557 "preproc.y"
     { (yyval.str) = mm_strdup("on"); ;}
     break;
 
   case 2447:
-
-/* Line 1455 of yacc.c  */
 #line 13558 "preproc.y"
     { (yyval.str) = mm_strdup("off"); ;}
     break;
 
   case 2448:
-
-/* Line 1455 of yacc.c  */
 #line 13565 "preproc.y"
     { (yyval.str) = (yyvsp[(4) - (4)].str); ;}
     break;
 
   case 2449:
-
-/* Line 1455 of yacc.c  */
 #line 13566 "preproc.y"
     { (yyval.str) = (yyvsp[(4) - (4)].str); ;}
     break;
 
   case 2450:
-
-/* Line 1455 of yacc.c  */
 #line 13567 "preproc.y"
     { (yyval.str) = (yyvsp[(3) - (3)].str); ;}
     break;
 
   case 2451:
-
-/* Line 1455 of yacc.c  */
 #line 13574 "preproc.y"
     {
 			/* reset this variable so we see if there was */
@@ -48047,8 +43644,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2452:
-
-/* Line 1455 of yacc.c  */
 #line 13580 "preproc.y"
     {
 			add_typedef((yyvsp[(3) - (7)].str), (yyvsp[(6) - (7)].index).index1, (yyvsp[(6) - (7)].index).index2, (yyvsp[(5) - (7)].type).type_enum, (yyvsp[(5) - (7)].type).type_dimension, (yyvsp[(5) - (7)].type).type_index, initializer, *(yyvsp[(7) - (7)].str) ? 1 : 0);
@@ -48061,22 +43656,16 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2453:
-
-/* Line 1455 of yacc.c  */
 #line 13590 "preproc.y"
     { (yyval.str) = mm_strdup("reference"); ;}
     break;
 
   case 2454:
-
-/* Line 1455 of yacc.c  */
 #line 13591 "preproc.y"
     { (yyval.str) = EMPTY; ;}
     break;
 
   case 2455:
-
-/* Line 1455 of yacc.c  */
 #line 13598 "preproc.y"
     {
 			/* reset this variable so we see if there was */
@@ -48086,8 +43675,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2456:
-
-/* Line 1455 of yacc.c  */
 #line 13604 "preproc.y"
     {
 			struct variable *p = find_variable((yyvsp[(3) - (7)].str));
@@ -48149,8 +43736,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2457:
-
-/* Line 1455 of yacc.c  */
 #line 13668 "preproc.y"
     {
 			when_error.code = (yyvsp[(3) - (3)].action).code;
@@ -48160,8 +43745,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2458:
-
-/* Line 1455 of yacc.c  */
 #line 13674 "preproc.y"
     {
 			when_nf.code = (yyvsp[(4) - (4)].action).code;
@@ -48171,8 +43754,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2459:
-
-/* Line 1455 of yacc.c  */
 #line 13680 "preproc.y"
     {
 			when_warn.code = (yyvsp[(3) - (3)].action).code;
@@ -48182,8 +43763,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2460:
-
-/* Line 1455 of yacc.c  */
 #line 13688 "preproc.y"
     {
 			(yyval.action).code = W_NOTHING;
@@ -48193,8 +43772,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2461:
-
-/* Line 1455 of yacc.c  */
 #line 13694 "preproc.y"
     {
 			(yyval.action).code = W_SQLPRINT;
@@ -48204,8 +43781,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2462:
-
-/* Line 1455 of yacc.c  */
 #line 13700 "preproc.y"
     {
 			(yyval.action).code = W_STOP;
@@ -48215,8 +43790,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2463:
-
-/* Line 1455 of yacc.c  */
 #line 13706 "preproc.y"
     {
 			(yyval.action).code = W_GOTO;
@@ -48226,8 +43799,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2464:
-
-/* Line 1455 of yacc.c  */
 #line 13712 "preproc.y"
     {
 			(yyval.action).code = W_GOTO;
@@ -48237,8 +43808,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2465:
-
-/* Line 1455 of yacc.c  */
 #line 13718 "preproc.y"
     {
 			(yyval.action).code = W_DO;
@@ -48248,8 +43817,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2466:
-
-/* Line 1455 of yacc.c  */
 #line 13724 "preproc.y"
     {
 			(yyval.action).code = W_BREAK;
@@ -48259,8 +43826,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2467:
-
-/* Line 1455 of yacc.c  */
 #line 13730 "preproc.y"
     {
 			(yyval.action).code = W_DO;
@@ -48270,8 +43835,6 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2468:
-
-/* Line 1455 of yacc.c  */
 #line 13736 "preproc.y"
     {
 			(yyval.action).code = W_DO;
@@ -48281,687 +43844,491 @@ mmerror(PARSE_ERROR, ET_WARNING, "unsupp
     break;
 
   case 2469:
-
-/* Line 1455 of yacc.c  */
 #line 13746 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2470:
-
-/* Line 1455 of yacc.c  */
 #line 13747 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2471:
-
-/* Line 1455 of yacc.c  */
 #line 13750 "preproc.y"
     { (yyval.str) = mm_strdup("break"); ;}
     break;
 
   case 2472:
-
-/* Line 1455 of yacc.c  */
 #line 13751 "preproc.y"
     { (yyval.str) = mm_strdup("call"); ;}
     break;
 
   case 2473:
-
-/* Line 1455 of yacc.c  */
 #line 13752 "preproc.y"
     { (yyval.str) = mm_strdup("cardinality"); ;}
     break;
 
   case 2474:
-
-/* Line 1455 of yacc.c  */
 #line 13753 "preproc.y"
     { (yyval.str) = mm_strdup("count"); ;}
     break;
 
   case 2475:
-
-/* Line 1455 of yacc.c  */
 #line 13754 "preproc.y"
     { (yyval.str) = mm_strdup("datetime_interval_code"); ;}
     break;
 
   case 2476:
-
-/* Line 1455 of yacc.c  */
 #line 13755 "preproc.y"
     { (yyval.str) = mm_strdup("datetime_interval_precision"); ;}
     break;
 
   case 2477:
-
-/* Line 1455 of yacc.c  */
 #line 13756 "preproc.y"
     { (yyval.str) = mm_strdup("found"); ;}
     break;
 
   case 2478:
-
-/* Line 1455 of yacc.c  */
 #line 13757 "preproc.y"
     { (yyval.str) = mm_strdup("go"); ;}
     break;
 
   case 2479:
-
-/* Line 1455 of yacc.c  */
 #line 13758 "preproc.y"
     { (yyval.str) = mm_strdup("goto"); ;}
     break;
 
   case 2480:
-
-/* Line 1455 of yacc.c  */
 #line 13759 "preproc.y"
     { (yyval.str) = mm_strdup("identified"); ;}
     break;
 
   case 2481:
-
-/* Line 1455 of yacc.c  */
 #line 13760 "preproc.y"
     { (yyval.str) = mm_strdup("indicator"); ;}
     break;
 
   case 2482:
-
-/* Line 1455 of yacc.c  */
 #line 13761 "preproc.y"
     { (yyval.str) = mm_strdup("key_member"); ;}
     break;
 
   case 2483:
-
-/* Line 1455 of yacc.c  */
 #line 13762 "preproc.y"
     { (yyval.str) = mm_strdup("length"); ;}
     break;
 
   case 2484:
-
-/* Line 1455 of yacc.c  */
 #line 13763 "preproc.y"
     { (yyval.str) = mm_strdup("nullable"); ;}
     break;
 
   case 2485:
-
-/* Line 1455 of yacc.c  */
 #line 13764 "preproc.y"
     { (yyval.str) = mm_strdup("octet_length"); ;}
     break;
 
   case 2486:
-
-/* Line 1455 of yacc.c  */
 #line 13765 "preproc.y"
     { (yyval.str) = mm_strdup("returned_length"); ;}
     break;
 
   case 2487:
-
-/* Line 1455 of yacc.c  */
 #line 13766 "preproc.y"
     { (yyval.str) = mm_strdup("returned_octet_length"); ;}
     break;
 
   case 2488:
-
-/* Line 1455 of yacc.c  */
 #line 13767 "preproc.y"
     { (yyval.str) = mm_strdup("scale"); ;}
     break;
 
   case 2489:
-
-/* Line 1455 of yacc.c  */
 #line 13768 "preproc.y"
     { (yyval.str) = mm_strdup("section"); ;}
     break;
 
   case 2490:
-
-/* Line 1455 of yacc.c  */
 #line 13769 "preproc.y"
     { (yyval.str) = mm_strdup("sql"); ;}
     break;
 
   case 2491:
-
-/* Line 1455 of yacc.c  */
 #line 13770 "preproc.y"
     { (yyval.str) = mm_strdup("sqlerror"); ;}
     break;
 
   case 2492:
-
-/* Line 1455 of yacc.c  */
 #line 13771 "preproc.y"
     { (yyval.str) = mm_strdup("sqlprint"); ;}
     break;
 
   case 2493:
-
-/* Line 1455 of yacc.c  */
 #line 13772 "preproc.y"
     { (yyval.str) = mm_strdup("sqlwarning"); ;}
     break;
 
   case 2494:
-
-/* Line 1455 of yacc.c  */
 #line 13773 "preproc.y"
     { (yyval.str) = mm_strdup("stop"); ;}
     break;
 
   case 2495:
-
-/* Line 1455 of yacc.c  */
 #line 13776 "preproc.y"
     { (yyval.str) = mm_strdup("connect"); ;}
     break;
 
   case 2496:
-
-/* Line 1455 of yacc.c  */
 #line 13777 "preproc.y"
     { (yyval.str) = mm_strdup("describe"); ;}
     break;
 
   case 2497:
-
-/* Line 1455 of yacc.c  */
 #line 13778 "preproc.y"
     { (yyval.str) = mm_strdup("disconnect"); ;}
     break;
 
   case 2498:
-
-/* Line 1455 of yacc.c  */
 #line 13779 "preproc.y"
     { (yyval.str) = mm_strdup("open"); ;}
     break;
 
   case 2499:
-
-/* Line 1455 of yacc.c  */
 #line 13780 "preproc.y"
     { (yyval.str) = mm_strdup("var"); ;}
     break;
 
   case 2500:
-
-/* Line 1455 of yacc.c  */
 #line 13781 "preproc.y"
     { (yyval.str) = mm_strdup("whenever"); ;}
     break;
 
   case 2501:
-
-/* Line 1455 of yacc.c  */
 #line 13785 "preproc.y"
     { (yyval.str) = mm_strdup("bool"); ;}
     break;
 
   case 2502:
-
-/* Line 1455 of yacc.c  */
 #line 13786 "preproc.y"
     { (yyval.str) = mm_strdup("long"); ;}
     break;
 
   case 2503:
-
-/* Line 1455 of yacc.c  */
 #line 13787 "preproc.y"
     { (yyval.str) = mm_strdup("output"); ;}
     break;
 
   case 2504:
-
-/* Line 1455 of yacc.c  */
 #line 13788 "preproc.y"
     { (yyval.str) = mm_strdup("short"); ;}
     break;
 
   case 2505:
-
-/* Line 1455 of yacc.c  */
 #line 13789 "preproc.y"
     { (yyval.str) = mm_strdup("struct"); ;}
     break;
 
   case 2506:
-
-/* Line 1455 of yacc.c  */
 #line 13790 "preproc.y"
     { (yyval.str) = mm_strdup("signed"); ;}
     break;
 
   case 2507:
-
-/* Line 1455 of yacc.c  */
 #line 13791 "preproc.y"
     { (yyval.str) = mm_strdup("unsigned"); ;}
     break;
 
   case 2508:
-
-/* Line 1455 of yacc.c  */
 #line 13794 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2509:
-
-/* Line 1455 of yacc.c  */
 #line 13797 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2510:
-
-/* Line 1455 of yacc.c  */
 #line 13798 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2511:
-
-/* Line 1455 of yacc.c  */
 #line 13799 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2512:
-
-/* Line 1455 of yacc.c  */
 #line 13800 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2513:
-
-/* Line 1455 of yacc.c  */
 #line 13801 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2514:
-
-/* Line 1455 of yacc.c  */
 #line 13802 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2515:
-
-/* Line 1455 of yacc.c  */
 #line 13803 "preproc.y"
     { (yyval.str) = mm_strdup("char"); ;}
     break;
 
   case 2516:
-
-/* Line 1455 of yacc.c  */
 #line 13804 "preproc.y"
     { (yyval.str) = mm_strdup("values"); ;}
     break;
 
   case 2517:
-
-/* Line 1455 of yacc.c  */
 #line 13817 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2518:
-
-/* Line 1455 of yacc.c  */
 #line 13818 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2519:
-
-/* Line 1455 of yacc.c  */
 #line 13819 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2520:
-
-/* Line 1455 of yacc.c  */
 #line 13820 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2521:
-
-/* Line 1455 of yacc.c  */
 #line 13821 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2522:
-
-/* Line 1455 of yacc.c  */
 #line 13822 "preproc.y"
     { (yyval.str) = mm_strdup("char"); ;}
     break;
 
   case 2523:
-
-/* Line 1455 of yacc.c  */
 #line 13823 "preproc.y"
     { (yyval.str) = mm_strdup("values"); ;}
     break;
 
   case 2524:
-
-/* Line 1455 of yacc.c  */
 #line 13828 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2525:
-
-/* Line 1455 of yacc.c  */
 #line 13829 "preproc.y"
     { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
     break;
 
   case 2526:
-
-/* Line