diff options
| author | Marc Alff <marc.alff@sun.com> | 2008-07-14 19:43:12 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2008-07-14 19:43:12 -0600 |
| commit | f34c99b4d8b60e6ae5cddde206ef4da30811e5fe (patch) | |
| tree | 302ecb26a02762cc90a264a5d6a12c76a15939fd /sql/mysql_priv.h | |
| parent | a3619d2e865eb5705a8acfc10db91ae700bb7043 (diff) | |
| parent | 5f9f35e291eba2e6b8fbdc7e763c14c370c676ec (diff) | |
| download | mariadb-git-f34c99b4d8b60e6ae5cddde206ef4da30811e5fe.tar.gz | |
Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 0060e7873e1..88aba4c9662 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -44,6 +44,8 @@ #include "sql_plugin.h" #include "scheduler.h" +class Parser_state; + /** Query type constants. @@ -804,8 +806,8 @@ bool check_string_char_length(LEX_STRING *str, const char *err_msg, bool test_if_data_home_dir(const char *dir); bool parse_sql(THD *thd, - class Lex_input_stream *lip, - class Object_creation_ctx *creation_ctx); + Parser_state *parser_state, + Object_creation_ctx *creation_ctx); enum enum_mysql_completiontype { ROLLBACK_RELEASE=-2, ROLLBACK=1, ROLLBACK_AND_CHAIN=7, |