From ee81c73a0d428e0a03fd4c07d02abbdf8db41b11 Mon Sep 17 00:00:00 2001
From: "pem@mysql.com" <>
Date: Mon, 11 Jul 2005 19:10:51 +0200
Subject: [PATCH] Post-review fix.

---
 sql/sql_yacc.yy | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 6880a2ef6d3..84de06d5604 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -7388,7 +7388,9 @@ keyword:
 
 /*
  * Keywords that we allow for labels in SPs.
- * Anything that's the beginning of a statement must be in keyword above.
+ * Anything that's the beginning of a statement or characteristics
+ * must be in keyword above, otherwise we get (harmful) shift/reduce
+ * conflicts.
  */
 keyword_sp:
 	ACTION			{}