diff options
| author | Mayank Prasad <mayank.prasad@oracle.com> | 2012-07-10 19:59:59 +0530 |
|---|---|---|
| committer | Mayank Prasad <mayank.prasad@oracle.com> | 2012-07-10 19:59:59 +0530 |
| commit | 7dcc643d10e158d83e5412adc89c5c6463530ff4 (patch) | |
| tree | 46fc7fc42a24bd04b20145fbe6b38d30e428fed2 /sql/sql_show.cc | |
| parent | 96bb813a456a6095ba98de6bb5b23b3223698413 (diff) | |
| download | mariadb-git-7dcc643d10e158d83e5412adc89c5c6463530ff4.tar.gz | |
Bug#13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ |HANDLE_FATAL_SIGNAL IN STRNLEN
Follow up patch to resolve pb2 failure on windows platform
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 189532b2479..e9873d2325f 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2784,9 +2784,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)) |