summaryrefslogtreecommitdiff
path: root/sql/sql_parse.h
diff options
context:
space:
mode:
author <Li-Bing.Song@sun.com>2010-07-29 11:24:35 +0800
committer <Li-Bing.Song@sun.com>2010-07-29 11:24:35 +0800
commitc61ce4143c144765e4134490adc1e18f4cc600fc (patch)
tree1cb3a7a9fbd34fa79c77f469bbe557f689c64a68 /sql/sql_parse.h
parenta0d5be1fd3d23174b62bafbb3ea838d4799fcdc4 (diff)
parent2ad690fdf8a1141be8439a7e2d53974a0d3ec923 (diff)
downloadmariadb-git-c61ce4143c144765e4134490adc1e18f4cc600fc.tar.gz
Manual merge
Diffstat (limited to 'sql/sql_parse.h')
-rw-r--r--sql/sql_parse.h2
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);