summaryrefslogtreecommitdiff
path: root/storage/innobase/srv/srv0start.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-01-24 22:42:35 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-01-24 22:42:35 +0200
commit78829a5780d3e48da376c1ca4e62731da450c551 (patch)
tree6561f2b6f09662220b9965bb14d745f69a4ecd34 /storage/innobase/srv/srv0start.cc
parentd6ba8496175a2dd85d772f8486eb032c31969f59 (diff)
parent947b6b849d907dc0793f076aec7e553869db744f (diff)
downloadmariadb-git-78829a5780d3e48da376c1ca4e62731da450c551.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/srv/srv0start.cc')
-rw-r--r--storage/innobase/srv/srv0start.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
index e15afcf9cd7..108e9182f00 100644
--- a/storage/innobase/srv/srv0start.cc
+++ b/storage/innobase/srv/srv0start.cc
@@ -1626,6 +1626,10 @@ dberr_t srv_start(bool create_new_db)
break;
}
+ if (stat_info.type != OS_FILE_TYPE_FILE) {
+ break;
+ }
+
if (!srv_file_check_mode(logfilename)) {
return(srv_init_abort(DB_ERROR));
}