diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-05-15 17:23:14 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-05-15 17:23:14 +0300 |
| commit | 68f972b5d470eed86347f0948fbf672d52ee1a5d (patch) | |
| tree | 3ef66e167be8a5565c27caf74763a41737bb2f63 /sql/sql_lex.h | |
| parent | 51594771687dfdee9d5d544863ccf77e8c8b74bd (diff) | |
| parent | 23283a5b93a9d851451df33d22463107401bc461 (diff) | |
| download | mariadb-git-68f972b5d470eed86347f0948fbf672d52ee1a5d.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 6961ab8c712..8713e8f0be7 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -176,6 +176,7 @@ typedef struct st_lex { HA_CHECK_OPT check_opt; // check/repair options HA_CREATE_INFO create_info; LEX_MASTER_INFO mi; // used by CHANGE MASTER + USER_RESOURCES mqh; ulong thread_id,type; enum_sql_command sql_command; enum lex_states next_state; @@ -184,7 +185,7 @@ typedef struct st_lex { enum enum_ha_read_modes ha_read_mode; enum ha_rkey_function ha_rkey_mode; enum enum_enable_or_disable alter_keys_onoff; - uint grant,grant_tot_col,which_columns, union_option, mqh; + uint grant,grant_tot_col,which_columns, union_option; thr_lock_type lock_option; bool drop_primary,drop_if_exists,local_file; bool in_comment,ignore_space,verbose,simple_alter, option_type; |