diff options
| author | unknown <sergefp@mysql.com> | 2004-05-15 00:06:16 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-05-15 00:06:16 +0400 |
| commit | 201412da7571f5078dae6cdb2067f64a3de5bef8 (patch) | |
| tree | 2b847992c4d6ac40460d6727558f05df45a64c69 /sql/sql_lex.h | |
| parent | dd4be0244d57da44351d6788dc9e29d2bcb60ea3 (diff) | |
| parent | d55809d8911f0a2c479d99770624deb07a71a974 (diff) | |
| download | mariadb-git-201412da7571f5078dae6cdb2067f64a3de5bef8.tar.gz | |
Trivial manual merge
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
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 557c037c799..a525bc485c1 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 }; @@ -605,6 +606,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) { |