diff options
| author | unknown <monty@mysql.com> | 2004-06-02 12:13:49 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-02 12:13:49 +0300 |
| commit | b94f62f766981bad7f314ffe037febb16da64d82 (patch) | |
| tree | 71a72f1db1c7c43e5a2a16708782b1da24bd9d83 /innobase/os/os0file.c | |
| parent | 5bf17d04f556c370de6a3567efccbe35baf35d37 (diff) | |
| download | mariadb-git-b94f62f766981bad7f314ffe037febb16da64d82.tar.gz | |
after merge fixes
innobase/os/os0file.c:
after merge fix
sql/ha_innodb.cc:
after merge fix
sql/sql_select.cc:
after merge fix (The patch for 4.0 didn't make sence in 4.1)
Diffstat (limited to 'innobase/os/os0file.c')
| -rw-r--r-- | innobase/os/os0file.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 6aca90885a6..fafed2a484c 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -539,7 +539,7 @@ os_file_opendir( if (dir == INVALID_HANDLE_VALUE) { if (error_is_fatal) { - os_file_handle_error(NULL, dirname, "opendir"); + os_file_handle_error(dirname, "opendir"); } return(NULL); @@ -550,7 +550,7 @@ os_file_opendir( dir = opendir(dirname); if (dir == NULL && error_is_fatal) { - os_file_handle_error(0, dirname, "opendir"); + os_file_handle_error(dirname, "opendir"); } return(dir); @@ -733,7 +733,7 @@ os_file_create_directory( if (!(rcode != 0 || (GetLastError() == ERROR_FILE_EXISTS && !fail_if_exists))) { /* failure */ - os_file_handle_error(NULL, pathname, "CreateDirectory"); + os_file_handle_error(Npathname, "CreateDirectory"); return(FALSE); } @@ -746,7 +746,7 @@ os_file_create_directory( if (!(rcode == 0 || (errno == EEXIST && !fail_if_exists))) { /* failure */ - os_file_handle_error(0, pathname, "mkdir"); + os_file_handle_error(pathname, "mkdir"); return(FALSE); } @@ -1274,7 +1274,7 @@ loop: ret = unlink((const char*)name); if (ret != 0 && errno != ENOENT) { - os_file_handle_error(0, name, "delete"); + os_file_handle_error(name, "delete"); return(FALSE); } @@ -1336,7 +1336,7 @@ loop: ret = unlink((const char*)name); if (ret != 0) { - os_file_handle_error(0, name, "delete"); + os_file_handle_error(name, "delete"); return(FALSE); } @@ -1366,7 +1366,7 @@ os_file_rename( return(TRUE); } - os_file_handle_error(NULL, oldpath, "rename"); + os_file_handle_error(oldpath, "rename"); return(FALSE); #else @@ -1375,7 +1375,7 @@ os_file_rename( ret = rename((const char*)oldpath, (const char*)newpath); if (ret != 0) { - os_file_handle_error(0, oldpath, "rename"); + os_file_handle_error(oldpath, "rename"); return(FALSE); } |