From 3bd0819a91bfebc9ead12eaf6b95e12c444e3a0e Mon Sep 17 00:00:00 2001
From: unknown <sasha@mysql.sashanet.com>
Date: Wed, 24 Oct 2001 11:52:19 -0600
Subject: [PATCH] merge of lost change

mysql-test/r/keywords.result:
  merged lost change back
---
 mysql-test/r/keywords.result | 6 ++++++
 mysql-test/t/keywords.test   | 4 ++++
 sql/sql_yacc.yy              | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/mysql-test/r/keywords.result b/mysql-test/r/keywords.result
index 9553fffc23d..2ca36425841 100644
--- a/mysql-test/r/keywords.result
+++ b/mysql-test/r/keywords.result
@@ -8,3 +8,9 @@ select t1.time+0,t1.date+0,t1.timestamp+0,concat(date," ",time) from t1;
 t1.time+0	t1.date+0	t1.timestamp+0	concat(date," ",time)
 122222	19970203	19970102000000	1997-02-03 12:22:22
 drop table t1;
+create table events(binlog int);
+insert into events values(1);
+select events.binlog from events;
+binlog
+1
+drop table events;
diff --git a/mysql-test/t/keywords.test b/mysql-test/t/keywords.test
index b9a1f34c715..3bd757aa069 100644
--- a/mysql-test/t/keywords.test
+++ b/mysql-test/t/keywords.test
@@ -8,3 +8,7 @@ insert into t1 values ("12:22:22","97:02:03","1997-01-02");
 select * from t1;
 select t1.time+0,t1.date+0,t1.timestamp+0,concat(date," ",time) from t1;
 drop table t1;
+create table events(binlog int);
+insert into events values(1);
+select events.binlog from events;
+drop table events;
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 5096a737b8e..bbec84148cc 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -2831,6 +2831,7 @@ keyword:
 	| BACKUP_SYM		{}
 	| BEGIN_SYM		{}
 	| BERKELEY_DB_SYM	{}
+	| BINLOG_SYM		{}
 	| BIT_SYM		{}
 	| BOOL_SYM		{}
 	| BOOLEAN_SYM		{}
@@ -2857,6 +2858,7 @@ keyword:
 	| END			{}
 	| ENUM			{}
 	| ESCAPE_SYM		{}
+	| EVENTS_SYM		{}
 	| EXTENDED_SYM		{}
 	| FAST_SYM		{}
 	| FULL			{}