diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-25 00:57:34 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-25 00:57:34 +0200 |
| commit | 1a6373e8e2f0c8c5ca6b8ef5076dcb2948eeb41a (patch) | |
| tree | ff2e875015b39ca3c66eba19d145dd014d4e768e /sql/sql_db.cc | |
| parent | b16c389248d03f0c3de549884f607f3f191827b4 (diff) | |
| parent | 5e100a64b51aa2dd09a9a1679413fa03797a95a2 (diff) | |
| download | mariadb-git-1a6373e8e2f0c8c5ca6b8ef5076dcb2948eeb41a.tar.gz | |
Merge with MySQL 5.1.53
Open issues:
- A better fix for #57688; Igor is working on this
- Test failure in index_merge_innodb.test ; Igor promised to look at this
- Some Innodb tests fails (need to merge with latest xtradb) ; Kristian promised to look at this.
- Failing tests: innodb_plugin.innodb_bug56143 innodb_plugin.innodb_bug56632 innodb_plugin.innodb_bug56680 innodb_plugin.innodb_bug57255
- Werror is disabled; Should be enabled after merge with xtradb.
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 1dd659283ac..7aa48524b20 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -1197,6 +1197,12 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db, VOID(filename_to_tablename(file->name, table_list->table_name, MYSQL50_TABLE_NAME_PREFIX_LENGTH + strlen(file->name) + 1)); + + /* To be able to correctly look up the table in the table cache. */ + if (lower_case_table_names) + table_list->table_name_length= my_casedn_str(files_charset_info, + table_list->table_name); + table_list->alias= table_list->table_name; // If lower_case_table_names=2 table_list->internal_tmp_table= is_prefix(file->name, tmp_file_prefix); /* Link into list */ |