diff options
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 5d232d60e79..c7830a21fcf 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -87,6 +87,8 @@ enum enum_sql_command { SQLCOM_PREPARE, SQLCOM_EXECUTE, SQLCOM_DEALLOCATE_PREPARE, SQLCOM_CREATE_VIEW, SQLCOM_DROP_VIEW, SQLCOM_CREATE_TRIGGER, SQLCOM_DROP_TRIGGER, + SQLCOM_XA_START, SQLCOM_XA_END, SQLCOM_XA_PREPARE, + SQLCOM_XA_COMMIT, SQLCOM_XA_ROLLBACK, SQLCOM_XA_RECOVER, /* This should be the last !!! */ SQLCOM_END @@ -636,6 +638,9 @@ struct st_trg_chistics extern sys_var_long_ptr trg_new_row_fake_var; +enum xa_option_words {XA_NONE, XA_JOIN, XA_RESUME, XA_ONE_PHASE, + XA_SUSPEND, XA_FOR_MIGRATE}; + /* The state of the lex parsing. This is saved in the THD struct */ typedef struct st_lex @@ -655,12 +660,12 @@ typedef struct st_lex char *backup_dir; /* For RESTORE/BACKUP */ char* to_log; /* For PURGE MASTER LOGS TO */ char* x509_subject,*x509_issuer,*ssl_cipher; - char* found_colon; /* For multi queries - next query */ + char* found_semicolon; /* For multi queries - next query */ String *wild; sql_exchange *exchange; select_result *result; Item *default_value, *on_update_value; - LEX_STRING *comment, name_and_length; + LEX_STRING comment, ident; LEX_USER *grant_user; gptr yacc_yyss,yacc_yyvs; THD *thd; @@ -690,7 +695,6 @@ typedef struct st_lex List<LEX_STRING> view_list; // view list (list of field names in view) SQL_LIST proc_list, auxilliary_table_list, save_list; create_field *last_field; - char *savepoint_name; // Transaction savepoint id udf_func udf; HA_CHECK_OPT check_opt; // check/repair options HA_CREATE_INFO create_info; @@ -704,7 +708,10 @@ typedef struct st_lex enum enum_duplicates duplicates; enum enum_tx_isolation tx_isolation; enum enum_ha_read_modes ha_read_mode; + union { enum ha_rkey_function ha_rkey_mode; + enum xa_option_words xa_opt; + }; enum enum_var_type option_type; enum enum_view_create_mode create_view_mode; enum enum_drop_mode drop_mode; |