summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-11-21 15:56:48 +0200
committermonty@mashka.mysql.fi <>2002-11-21 15:56:48 +0200
commitdac6498f9b5b28d94473baf46c6e6f174943728d (patch)
treed3df5d3fc1abf364dcbcc8eb2305a1cf62540192 /sql/sql_lex.h
parent305d16a7cb3955c20ab5d119b3eb0968008683b6 (diff)
parente60050c4dd652c7a431aebeb95b7dd944be87bf8 (diff)
downloadmariadb-git-dac6498f9b5b28d94473baf46c6e6f174943728d.tar.gz
Merge with 4.0
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 6bafef8a469..9f8e3200246 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -436,9 +436,9 @@ typedef struct st_lex
uint grant, grant_tot_col, which_columns;
uint fk_delete_opt, fk_update_opt, fk_match_option;
uint param_count;
- bool drop_primary, drop_if_exists, local_file, olap;
+ bool drop_primary, drop_if_exists, drop_temporary, local_file;
bool in_comment, ignore_space, verbose, simple_alter;
- bool derived_tables, describe;
+ bool derived_tables, describe, olap;
uint slave_thd_opt;
CHARSET_INFO *charset;
char *help_arg;