diff options
| author | unknown <sergefp@mysql.com> | 2004-04-05 19:52:10 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-04-05 19:52:10 +0400 |
| commit | fbfdff7fb0b0e508db55151480c0135376b2bcd2 (patch) | |
| tree | 407b4365ecfe2d3c7bbae1190bc79ebb9fc9ba5c /sql/sql_lex.h | |
| parent | 66de313563a74099d416767fec884ab590530d31 (diff) | |
| parent | ef8a5401f146e0aa17d9cc342c52a82e16e7c6ef (diff) | |
| download | mariadb-git-fbfdff7fb0b0e508db55151480c0135376b2bcd2.tar.gz | |
Post-merge fixes
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
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
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 5538fb0e832..34b8745e112 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 }; @@ -583,6 +584,11 @@ 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) */ + LEX_STRING prepared_stmt_code; /* Statement query (in PREPARE )*/ + /* Names of user variables holding parameters (in EXECUTE) */ + List<LEX_STRING> prepared_stmt_params; st_lex() {} inline void uncacheable(uint8 cause) { |