diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-06-30 16:33:13 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-06-30 16:33:13 +0200 |
commit | d38b15de65c9a78aae09fe34238cd4700c88fea9 (patch) | |
tree | 18d139ff5af9717b63fe56d3fc62c4050a2a40ab /storage/xtradb | |
parent | d3cc15eb82c4d3704fa6b636ed2cd9a59479f022 (diff) | |
parent | 4f40f87c48a9ee252f797b5d760a6b6f07cc3815 (diff) | |
download | mariadb-git-d38b15de65c9a78aae09fe34238cd4700c88fea9.tar.gz |
Merge branch '10.0-galera' into 10.1
Diffstat (limited to 'storage/xtradb')
-rw-r--r-- | storage/xtradb/os/os0file.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc index 7fbee0312ee..32536306320 100644 --- a/storage/xtradb/os/os0file.cc +++ b/storage/xtradb/os/os0file.cc @@ -2072,7 +2072,6 @@ os_file_create_func( file = INVALID_HANDLE_VALUE; } } - #else /* __WIN__ */ int create_flag; const char* mode_str = NULL; |