Commit 869a8da4 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

merge of lost change

parent 17e6f085

mysql-test/r/keywords.result

+6 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/keywords.test

+4 −0
Original line number Diff line number Diff line
@@ -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;

sql/sql_yacc.yy

+2 −0
Original line number Diff line number Diff line
@@ -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			{}