diff options
author | unknown <sergefp@mysql.com> | 2004-06-04 05:37:14 +0400 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2004-06-04 05:37:14 +0400 |
commit | e9c4cea9dea039c79c99940007833d7dde2c59dc (patch) | |
tree | c875aca91162dc7f6890e041f5c1faa5dcf5c929 /sql/sql_lex.h | |
parent | f0beff16f37c2adee70d8226190b4c529e8b14b1 (diff) | |
parent | 948903fc4f47af2cf328424931a64030bec44442 (diff) | |
download | mariadb-git-e9c4cea9dea039c79c99940007833d7dde2c59dc.tar.gz |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
sql/lex.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 b2211fe1b0e..36e05b40c7d 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -612,7 +612,7 @@ typedef struct st_lex uint fk_delete_opt, fk_update_opt, fk_match_option; uint slave_thd_opt; uint8 describe; - bool drop_if_exists, drop_temporary, local_file; + bool drop_if_exists, drop_temporary, local_file, one_shot_set; bool in_comment, ignore_space, verbose, no_write_to_binlog; bool derived_tables; bool safe_to_cache_query; |