diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-11-22 18:04:38 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-22 18:04:38 +0100 |
commit | d2755a2c9c109ddb4e2e0c9feda89431a6c4fd50 (patch) | |
tree | c6e4678908c750d7f558e98cedc349aa1d350892 /sql/sql_parse.h | |
parent | af32b02c06f32a89dc9f52e556bc5dd3bf49c19e (diff) | |
parent | 42221abaed700f6dc5d280b462755851780e8487 (diff) | |
download | mariadb-git-d2755a2c9c109ddb4e2e0c9feda89431a6c4fd50.tar.gz |
5.3->5.5 merge
Diffstat (limited to 'sql/sql_parse.h')
-rw-r--r-- | sql/sql_parse.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_parse.h b/sql/sql_parse.h index 2c31f71af53..4510ebe94e2 100644 --- a/sql/sql_parse.h +++ b/sql/sql_parse.h @@ -50,8 +50,6 @@ bool parse_sql(THD *thd, Parser_state *parser_state, Object_creation_ctx *creation_ctx); -uint kill_one_thread(THD *thd, ulong id, bool only_kill_query); - void free_items(Item *item); void cleanup_items(Item *item); |