diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 23:23:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 23:23:28 +0100 |
| commit | c386daf0c07ff07d83bb29f3e152a1bde803bedb (patch) | |
| tree | 28aff1f7690059f4a4ec46067f71c16dba56d5a5 /sql/table.cc | |
| parent | 9a06e531f4876124fbe0abbd1b5ceb7d510bce94 (diff) | |
| download | mariadb-git-c386daf0c07ff07d83bb29f3e152a1bde803bedb.tar.gz | |
post-fix patch for MDEV-5850: MySQL Bug#21317: SHOW CREATE DATABASE does not obey to lower_case_table_names
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 20343a108f6..210a9246a16 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -3468,11 +3468,15 @@ bool check_db_name(LEX_STRING *org_name) return 1; if (lower_case_table_names == 1 && name != any_db) - org_name->length= my_casedn_str(files_charset_info, name); + { + org_name->length= name_length= my_casedn_str(files_charset_info, name); + if (check_for_path_chars) + org_name->length+= MYSQL50_TABLE_NAME_PREFIX_LENGTH; + } if (db_name_is_in_ignore_db_dirs_list(name)) return 1; - return check_table_name(name, org_name->length, check_for_path_chars); + return check_table_name(name, name_length, check_for_path_chars); } |