bk commit into 4.0 tree

[sasha]

Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated to 
the main repository and within 24 hours after the push to the public repository. 
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2001-10-24 11:52:19-06:00, sasha@stripped
  merge of lost change

  mysql-test/r/keywords.result
    1.5 01/10/24 11:52:18 sasha@stripped +6 -0
    merged lost change back

  mysql-test/t/keywords.test
    1.4 01/10/24 11:52:18 sasha@stripped +4 -0
    merge of lost change

  sql/sql_yacc.yy
    1.119 01/10/24 11:52:18 sasha@stripped +2 -0
    merge of lost change

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql-4.0

--- 1.118/sql/sql_yacc.yy	Sat Oct 20 02:04:22 2001
+++ 1.119/sql/sql_yacc.yy	Wed Oct 24 11:52:18 2001
@@ -2831,6 +2831,7 @@
 	| BACKUP_SYM		{}
 	| BEGIN_SYM		{}
 	| BERKELEY_DB_SYM	{}
+	| BINLOG_SYM		{}
 	| BIT_SYM		{}
 	| BOOL_SYM		{}
 	| BOOLEAN_SYM		{}
@@ -2857,6 +2858,7 @@
 	| END			{}
 	| ENUM			{}
 	| ESCAPE_SYM		{}
+	| EVENTS_SYM		{}
 	| EXTENDED_SYM		{}
 	| FAST_SYM		{}
 	| FULL			{}

--- 1.4/mysql-test/r/keywords.result	Wed Oct 10 18:59:44 2001
+++ 1.5/mysql-test/r/keywords.result	Wed Oct 24 11:52:18 2001
@@ -8,3 +8,9 @@
 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;

--- 1.3/mysql-test/t/keywords.test	Wed Oct 10 18:59:42 2001
+++ 1.4/mysql-test/t/keywords.test	Wed Oct 24 11:52:18 2001
@@ -8,3 +8,7 @@
 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;