From 0b06ec79ae617967821ccbcc388dfca85dad81c2 Mon Sep 17 00:00:00 2001
From: Jan Mercl <0xjnml@gmail.com>
Date: Thu, 10 Sep 2015 14:45:19 +0200
Subject: [PATCH] parser/parser.y: S/R conflicts 11->10.

---
 parser/parser.y | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/parser/parser.y b/parser/parser.y
index b0c94ad273..3109617716 100644
--- a/parser/parser.y
+++ b/parser/parser.y
@@ -465,6 +465,9 @@ import (
 
 %token	tableRefPriority
 
+%precedence lowerThanCalcFoundRows
+%precedence calcFoundRows
+
 %left   join inner cross left right full
 /* A dummy token to force the priority of TableRef production in a join. */
 %left   tableRefPriority
@@ -2417,6 +2420,7 @@ SelectStmtOpts:
 	}
 
 SelectStmtCalcFoundRows:
+	%prec lowerThanCalcFoundRows
 	{
 		$$ = false
 	}