diff options
author | monty@mysql.com <> | 2005-02-03 13:18:30 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2005-02-03 13:18:30 +0200 |
commit | 422c2eb868036e8741c4e6d62d7267930c4e69bd (patch) | |
tree | e52c0cca0b1936bb8b6332b6f0e724b9666f65f1 /innobase/fil | |
parent | 12bf600d18b98a8d82167e21a2904ca40071dd75 (diff) | |
parent | e7450d9781781666503837d748cf313e3f406f59 (diff) | |
download | mariadb-git-422c2eb868036e8741c4e6d62d7267930c4e69bd.tar.gz |
4.1 -> 5.0 merge
Diffstat (limited to 'innobase/fil')
-rw-r--r-- | innobase/fil/fil0fil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c index 9b2f7ffe575..8da6ad08538 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -3013,8 +3013,8 @@ fil_load_single_table_tablespaces(void) /* printf( " Looking at file %s\n", fileinfo.name); */ - if (fileinfo.type == OS_FILE_TYPE_DIR - || dbinfo.type == OS_FILE_TYPE_UNKNOWN) { + if (fileinfo.type == OS_FILE_TYPE_DIR) { + goto next_file_item; } |