1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge 5.5->5.5-mwl248

This commit is contained in:
Igor Babaev
2012-08-14 12:42:14 -07:00
201 changed files with 6162 additions and 2267 deletions

View File

@ -3225,9 +3225,12 @@ int make_db_list(THD *thd, List<LEX_STRING> *files,
/*
If we have db lookup vaule we just add it to list and
exit from the function
exit from the function.
We don't do this for database names longer than the maximum
path length.
*/
if (lookup_field_vals->db_value.str)
if (lookup_field_vals->db_value.str &&
lookup_field_vals->db_value.length < FN_REFLEN)
{
if (is_infoschema_db(lookup_field_vals->db_value.str,
lookup_field_vals->db_value.length))