diff options
| author | unknown <sergefp@mysql.com> | 2004-05-21 04:31:07 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-05-21 04:31:07 +0400 |
| commit | fc68be78eb830df4bf8afe0096f0e5bf08fcd47f (patch) | |
| tree | 54a9ba750dfa70a76b61860ee2ae149ebbefbf31 /sql/sql_lex.h | |
| parent | ee0732603e811234dd14fd21b041b3330e532658 (diff) | |
| parent | e7710af7f4c41e77355f5599aafb04999b358292 (diff) | |
| download | mariadb-git-fc68be78eb830df4bf8afe0096f0e5bf08fcd47f.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
sql/item.cc:
Auto merged
sql/mysql_priv.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_prepare.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 2df2c998ff0..b64cc7a074b 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -76,6 +76,7 @@ enum enum_sql_command { SQLCOM_SHOW_COLUMN_TYPES, SQLCOM_SHOW_STORAGE_ENGINES, SQLCOM_SHOW_PRIVILEGES, SQLCOM_HELP, SQLCOM_DROP_USER, SQLCOM_REVOKE_ALL, SQLCOM_CHECKSUM, + SQLCOM_PREPARE, SQLCOM_EXECUTE, SQLCOM_DEALLOCATE_PREPARE, /* This should be the last !!! */ SQLCOM_END }; @@ -606,6 +607,17 @@ typedef struct st_lex bool in_comment, ignore_space, verbose, simple_alter, no_write_to_binlog; bool derived_tables; bool safe_to_cache_query; + /* 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; + /* 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; st_lex() {} inline void uncacheable(uint8 cause) { |