diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2001-06-13 13:36:53 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2001-06-13 13:36:53 +0300 |
| commit | 1f07c0b7a528fc96ea5e1ce66030c945430876d4 (patch) | |
| tree | ed6a4df0c1beb0b1d4a69e75c57f45d04567ee69 /sql/sql_lex.h | |
| parent | 9cda81a4b88e9fe47c08d06581fc821e388668dc (diff) | |
| download | mariadb-git-1f07c0b7a528fc96ea5e1ce66030c945430876d4.tar.gz | |
Second phase of UNIONS (please do not test it yet) and some other
changes. This is mostly a merge between my repository and central
one, so that I can take a test for multi table delete and fix it.
sql/mysql_priv.h:
Added new functions needed for UNIONS, EXCEPT's etc
sql/sql_class.h:
A little change in multi_delete class
sql/sql_lex.h:
Added command for UNION's
sql/sql_parse.cc:
One new function and SQLCOM_UNION_SELECT.
Please do not test UNION's. This is just a start of the work on them
sql/sql_yacc.yy:
Parsing stuff for the UNION's
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index d4483361961..be4a7d1273f 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -55,7 +55,7 @@ enum enum_sql_command { SQLCOM_RESET, SQLCOM_PURGE, SQLCOM_SHOW_BINLOGS, SQLCOM_SHOW_OPEN_TABLES, SQLCOM_LOAD_MASTER_DATA, SQLCOM_HA_OPEN, SQLCOM_HA_CLOSE, SQLCOM_HA_READ, - SQLCOM_SHOW_SLAVE_HOSTS, SQLCOM_MULTI_DELETE + SQLCOM_SHOW_SLAVE_HOSTS, SQLCOM_MULTI_DELETE, SQLCOM_UNION_SELECT }; enum lex_states { STATE_START, STATE_CHAR, STATE_IDENT, |