database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge remote-tracking branch 'origin/5.5' into 10.0

Browse Source
This commit is contained in:
vicentiu
2017-01-06 17:09:59 +02:00
parent e4978d26b7 ae1b3d1991
commit e9aed131ea
76 changed files with 933 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_parse.h
View File

@ -76,6 +76,7 @@ bool check_string_byte_length(LEX_STRING *str, const char *err_msg,
bool check_string_char_length(LEX_STRING *str, const char *err_msg,
uint max_char_length, CHARSET_INFO *cs,
bool no_error);
bool check_ident_length(LEX_STRING *ident);
CHARSET_INFO* merge_charset_and_collation(CHARSET_INFO *cs, CHARSET_INFO *cl);
bool check_host_name(LEX_STRING *str);
bool check_identifier_name(LEX_STRING *str, uint max_char_length,