database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge of lost change

Browse Source 
mysql-test/r/keywords.result:
  merged lost change back
This commit is contained in:
unknown
2001-10-24 11:52:19 -06:00
parent aba008d6b3
commit 3bd0819a91
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/keywords.result
View File

@ -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) t1.time+0 t1.date+0 t1.timestamp+0 concat(date," ",time)
122222 19970203 19970102000000 1997-02-03 12:22:22 122222 19970203 19970102000000 1997-02-03 12:22:22
drop table t1; drop table t1;
create table events(binlog int);
insert into events values(1);
select events.binlog from events;
binlog
1
drop table events;

4
mysql-test/t/keywords.test
View File

@ -8,3 +8,7 @@ insert into t1 values ("12:22:22","97:02:03","1997-01-02");
select * from t1; select * from t1;
select t1.time+0,t1.date+0,t1.timestamp+0,concat(date," ",time) from t1; select t1.time+0,t1.date+0,t1.timestamp+0,concat(date," ",time) from t1;
drop table t1; drop table t1;
create table events(binlog int);
insert into events values(1);
select events.binlog from events;
drop table events;

2
sql/sql_yacc.yy
View File

@ -2831,6 +2831,7 @@ keyword:
| BACKUP_SYM {} | BACKUP_SYM {}
| BEGIN_SYM {} | BEGIN_SYM {}
| BERKELEY_DB_SYM {} | BERKELEY_DB_SYM {}
| BINLOG_SYM {}
| BIT_SYM {} | BIT_SYM {}
| BOOL_SYM {} | BOOL_SYM {}
| BOOLEAN_SYM {} | BOOLEAN_SYM {}
@ -2857,6 +2858,7 @@ keyword:
| END {} | END {}
| ENUM {} | ENUM {}
| ESCAPE_SYM {} | ESCAPE_SYM {}
| EVENTS_SYM {}
| EXTENDED_SYM {} | EXTENDED_SYM {}
| FAST_SYM {} | FAST_SYM {}
| FULL {} | FULL {}