diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-09-16 18:31:30 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-09-16 18:31:30 -0600 |
| commit | 5d4cae7243809082e1a14441c304dcf54edd0ffc (patch) | |
| tree | bd0f71c45f8199761c5b4706c94501d0b17807eb /sql/sql_lex.h | |
| parent | 5a4aa474d879ac9598941665bef6f0938efc91e1 (diff) | |
| parent | f22a1bfd20faeb5e44f57bf9d598f20280c25c8d (diff) | |
| download | mariadb-git-5d4cae7243809082e1a14441c304dcf54edd0ffc.tar.gz | |
resolved conflicts
sql/sql_lex.h:
Auto merged
Docs/manual.texi:
merged/resolved conflicts
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 1047cffffe1..6ee5a4dfccb 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -126,7 +126,8 @@ typedef struct st_lex { udf_func udf; HA_CHECK_OPT check_opt; // check/repair options HA_CREATE_INFO create_info; - LEX_MASTER_INFO mi; // used by CHANGE MASTER + LEX_MASTER_INFO mi; // used by CHANGE MASTER + char* backup_dir; // used by RESTORE/BACKUP ulong thread_id,type; ulong options; enum_sql_command sql_command; |