diff options
| author | reggie@monster. <> | 2005-06-02 12:36:55 -0500 |
|---|---|---|
| committer | reggie@monster. <> | 2005-06-02 12:36:55 -0500 |
| commit | 0e139b89083f03b811581ba84622bd5c3ad4a730 (patch) | |
| tree | 6f4d33cd5a73a3f2cc72d481a029c768e42f916d | |
| parent | 83fae6432360d12feb19b1ad15f6b4df8bedd556 (diff) | |
| parent | 7b9d4eaa92d50985af37a49f96a827256a54f129 (diff) | |
| download | mariadb-git-0e139b89083f03b811581ba84622bd5c3ad4a730.tar.gz | |
Merge monster.:D:/Work/mysql-4.1 into monster.:D:/Work/mysql5.0
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | mysys/my_access.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 5b842d47fdc..eaf79d29cee 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -237,6 +237,7 @@ rburnett@bk-internal.mysql.com rburnett@build.mysql.com reggie@bob.(none) reggie@mdk10.(none) +reggie@monster. root@home.(none) root@mc04.(none) root@x3.internalnet diff --git a/mysys/my_access.c b/mysys/my_access.c index 28210bdfc7d..89e90e16f18 100644 --- a/mysys/my_access.c +++ b/mysys/my_access.c @@ -44,7 +44,7 @@ int my_access(const char *path, int amode) result= GetFileAttributesEx(path, GetFileExInfoStandard, &fileinfo); if (! result || - (fileinfo.dwFileAttributes & FILE_ATTRIBUTE_READONLY) && (amode & W_OK)) + (fileinfo.dwFileAttributes & FILE_ATTRIBUTE_READONLY) && (amode & F_OK)) { my_errno= errno= EACCES; return -1; |