diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-05 19:08:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-05 19:08:55 +0200 |
| commit | f6633bf058802ad7da8196d01fd19d75c53f7274 (patch) | |
| tree | b7ba9832aae2a3d0c72d2bf3d89cf2a5f13a44f6 /win | |
| parent | fc5932a1b733b331be20c3f1b45c61c798227dba (diff) | |
| parent | e555540ab6b9c3e0d4fdd00af093b115a9401d0a (diff) | |
| download | mariadb-git-f6633bf058802ad7da8196d01fd19d75c53f7274.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/ca/CustomAction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp index 9a174b8529e..9281ce27d34 100644 --- a/win/packaging/ca/CustomAction.cpp +++ b/win/packaging/ca/CustomAction.cpp @@ -180,7 +180,7 @@ extern "C" UINT __stdcall CheckDirectoryEmpty(MSIHANDLE hInstall, empty= true; for(;;) { - if (wcscmp(data.cFileName, L".") || wcscmp(data.cFileName, L"..")) + if (wcscmp(data.cFileName, L".") && wcscmp(data.cFileName, L"..")) { empty= false; break; |