Correct an erroneous manual merge.

1f9a4add · joerg@trift2 · d4d4f852 · 1f9a4add
Commit 1f9a4add authored Aug 22, 2007 by joerg@trift2
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

sql/sql_yacc.yy sql/sql_yacc.yy +0 -1

No files found.
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -4581,7 +4581,6 @@ row_types:
        | DYNAMIC_SYM    { $$= ROW_TYPE_DYNAMIC; }
        | COMPRESSED_SYM { $$= ROW_TYPE_COMPRESSED; }
        | REDUNDANT_SYM  { $$= ROW_TYPE_REDUNDANT; }
-        | COMPACT_SYM    { $$= ROW_TYPE_COMPACT; }
 	| COMPACT_SYM    { $$= ROW_TYPE_COMPACT; }
 	| PAGE_SYM       { $$= ROW_TYPE_PAGE; }
        ;