Merge pull request pingcap#121 from cznic/master

parser/parser.y: S/R conflicts 2->1.
liqingrikeiikyeong · Sep 11, 2015 · 00ba6dc · 00ba6dc
2 parents 6d058fe + 1d23a43
commit 00ba6dc
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/parser/parser.y b/parser/parser.y
@@ -2103,10 +2103,7 @@ TableIdent:
 	}
 
 TableIdentList:
-	{
-		$$ = []table.Ident{}
-	}
-|	TableIdent
+	TableIdent
 	{
 		tbl := []table.Ident{$1.(table.Ident)}
 		$$ = tbl