diff options
| author | andrey@lmy004. <> | 2006-07-10 14:42:29 +0200 |
|---|---|---|
| committer | andrey@lmy004. <> | 2006-07-10 14:42:29 +0200 |
| commit | 2319aac01e7c3cf0037b454df4207a9a198baf54 (patch) | |
| tree | 28a786dfaf77132889807ad9f7ff5dbd568f9707 /sql/sql_lex.h | |
| parent | c15805f741b41806c37bb217e84136b8c2debfd9 (diff) | |
| parent | e3d0524bbd79f85d166e7ec369d6a1f612a8c3d1 (diff) | |
| download | mariadb-git-2319aac01e7c3cf0037b454df4207a9a198baf54.tar.gz | |
Manual merge
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index c889c2c5f94..77630065d3a 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -27,7 +27,7 @@ class sp_instr; class sp_pcontext; class st_alter_tablespace; class partition_info; -class Event_timed; +class Event_parse_data; #ifdef MYSQL_SERVER /* @@ -1021,8 +1021,7 @@ typedef struct st_lex : public Query_tables_list st_sp_chistics sp_chistics; - Event_timed *et; - bool et_compile_phase; + Event_parse_data *event_parse_data; bool only_view; /* used for SHOW CREATE TABLE/VIEW */ /* |