diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-04-27 03:02:25 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-04-27 03:02:25 +0300 |
| commit | 79d3149d3f0af1dab06bbfe044f1a6b1acee5cfa (patch) | |
| tree | 69897d6ec8685387706fd214d29f39468149cbc0 /innobase/fil | |
| parent | 45baf2b5d9799318a27fb7e2ab281c02339f6c1b (diff) | |
| parent | 705d1631248a0b3159b58572a0b8c9e35e0598cc (diff) | |
| download | mariadb-git-79d3149d3f0af1dab06bbfe044f1a6b1acee5cfa.tar.gz | |
Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/dict0dict.h:
Auto merged
Diffstat (limited to 'innobase/fil')
| -rw-r--r-- | innobase/fil/fil0fil.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c index e8efdcfbce0..8600f583dbd 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -25,6 +25,7 @@ Created 10/25/1995 Heikki Tuuri #include "srv0start.h" #include "mtr0mtr.h" #include "mtr0log.h" +#include "dict0dict.h" /* @@ -2743,7 +2744,15 @@ fil_load_single_table_tablespace( sprintf(filepath, "%s/%s/%s", fil_path_to_mysql_datadir, dbname, filename); srv_normalize_path_for_win(filepath); +#ifdef __WIN__ + /* If lower_case_table_names is 0 or 2, then MySQL allows database + directory names with upper case letters. On Windows, all table and + database names in InnoDB are internally always in lower case. Put the + file path to lower case, so that we are consistent with InnoDB's + internal data dictionary. */ + dict_casedn_str(filepath); +#endif file = os_file_create_simple_no_error_handling(filepath, OS_FILE_OPEN, OS_FILE_READ_ONLY, &success); if (!success) { |