diff options
| author | unknown <serg@serg.mylan> | 2005-04-04 00:50:05 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-04-04 00:50:05 +0200 |
| commit | ec34a3c1eefc557604935e092b57a18ad49a2b8b (patch) | |
| tree | 3fdc4c1722aa761278c731cc61aa182bf7a1463d /sql/sql_lex.h | |
| parent | a98d00a10e846a561e02a5566e2e9d251cf6e82b (diff) | |
| download | mariadb-git-ec34a3c1eefc557604935e092b57a18ad49a2b8b.tar.gz | |
XID SQL syntax
minor cleanups
XA tests
include/m_ctype.h:
minor cleanup
sql/field.cc:
minor cleanup
sql/handler.cc:
XID SQL syntax
sql/handler.h:
XID SQL syntax
sql/item_sum.h:
minor cleanup
sql/lock.cc:
comments
sql/sql_class.cc:
minor cleanup
sql/sql_lex.h:
XID SQL syntax
sql/sql_parse.cc:
XID SQL syntax
sql/sql_yacc.yy:
XID SQL syntax
cleanups
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 2391c0b7ef9..34ed1e83c86 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -696,6 +696,7 @@ typedef struct st_lex Item *default_value, *on_update_value; LEX_STRING comment, ident; LEX_USER *grant_user; + XID *xid; gptr yacc_yyss,yacc_yyvs; THD *thd; CHARSET_INFO *charset; @@ -738,7 +739,7 @@ typedef struct st_lex enum enum_tx_isolation tx_isolation; enum enum_ha_read_modes ha_read_mode; union { - enum ha_rkey_function ha_rkey_mode; + enum ha_rkey_function ha_rkey_mode; enum xa_option_words xa_opt; }; enum enum_var_type option_type; @@ -764,15 +765,15 @@ typedef struct st_lex ALTER_INFO alter_info; /* Prepared statements SQL syntax:*/ LEX_STRING prepared_stmt_name; /* Statement name (in all queries) */ - /* + /* Prepared statement query text or name of variable that holds the prepared statement (in PREPARE ... queries) */ - LEX_STRING prepared_stmt_code; + LEX_STRING prepared_stmt_code; /* If true, prepared_stmt_code is a name of variable that holds the query */ bool prepared_stmt_code_is_varref; /* Names of user variables holding parameters (in EXECUTE) */ - List<LEX_STRING> prepared_stmt_params; + List<LEX_STRING> prepared_stmt_params; /* Points to part of global table list which contains time zone tables implicitly used by the statement. |