diff options
| author | unknown <Li-Bing.Song@sun.com> | 2010-07-29 11:24:35 +0800 |
|---|---|---|
| committer | unknown <Li-Bing.Song@sun.com> | 2010-07-29 11:24:35 +0800 |
| commit | cb63e6d0214a2542fbb774c279af1a32abba68dd (patch) | |
| tree | 1cb3a7a9fbd34fa79c77f469bbe557f689c64a68 /sql/sql_parse.h | |
| parent | b0b0d055ee6e5229e7e9733e0f59cf31d96f614c (diff) | |
| parent | 2124538d9cea1cea39b01f0b8b99052b36004fb9 (diff) | |
| download | mariadb-git-cb63e6d0214a2542fbb774c279af1a32abba68dd.tar.gz | |
Manual merge
Diffstat (limited to 'sql/sql_parse.h')
| -rw-r--r-- | sql/sql_parse.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.h b/sql/sql_parse.h index 475811d45b7..b55e8a46bc3 100644 --- a/sql/sql_parse.h +++ b/sql/sql_parse.h @@ -84,7 +84,7 @@ bool is_update_query(enum enum_sql_command command); bool is_log_table_write_query(enum enum_sql_command command); bool alloc_query(THD *thd, const char *packet, uint packet_length); void mysql_init_select(LEX *lex); -void mysql_parse(THD *thd, const char *inBuf, uint length, +void mysql_parse(THD *thd, char *rawbuf, uint length, Parser_state *parser_state); void mysql_reset_thd_for_next_command(THD *thd); bool mysql_new_select(LEX *lex, bool move_down); |