database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Merge next-mr -> next-4284.

Browse Source
This commit is contained in:
Konstantin Osipov
2009-12-15 22:59:07 +03:00
parent 5e57d0916c 408dd52a6a
commit e931ef415a
69 changed files with 951 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysql_priv.h
View File

@@ -880,6 +880,8 @@ bool check_string_char_length(LEX_STRING *str, const char *err_msg,
bool no_error);
bool check_host_name(LEX_STRING *str);
CHARSET_INFO *merge_charset_and_collation(CHARSET_INFO *cs, CHARSET_INFO *cl);
bool parse_sql(THD *thd,
Parser_state *parser_state,
Object_creation_ctx *creation_ctx);