mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 02:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

InnoDB: Remove os_file_lock() from the 4.0 tree (unfix Bug #3608)

Browse source
This commit is contained in:
marko@hundin.mysql.fi 2004-05-13 15:28:56 +03:00
parent 17d5da7e33
commit c838192066
1 changed files with 0 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
innobase/os/os0file.c
View file

@ -358,32 +358,6 @@ os_file_handle_error(
return(FALSE); return(FALSE);
} }
#if !defined(__WIN__) && !defined(UNIV_HOTBACKUP)
/********************************************************************
Obtain an exclusive lock on a file. */
static
int
os_file_lock(
/*=========*/
/* out: 0 on success */
int fd, /* in: file descriptor */
const char* name) /* in: file name */
{
struct flock lk;
lk.l_type = F_WRLCK;
lk.l_whence = SEEK_SET;
lk.l_start = lk.l_len = 0;
if (fcntl(fd, F_SETLK, &lk) == -1) {
fprintf(stderr,
"InnoDB: Unable to lock %s", name);
perror (": fcntl");
close(fd);
return(-1);
}
return 0;
}
#endif /* !defined(__WIN__) && !defined(UNIV_HOTBACKUP) */
/******************************************************************** /********************************************************************
Creates the seek mutexes used in positioned reads and writes. */ Creates the seek mutexes used in positioned reads and writes. */
@ -504,11 +478,6 @@ try_again:
if (retry) { if (retry) {
goto try_again; goto try_again;
} }
#ifndef UNIV_HOTBACKUP
} else if (os_file_lock(file, name)) {
*success = FALSE;
file = -1;
#endif
} else { } else {
*success = TRUE; *success = TRUE;
} }
@ -603,11 +572,6 @@ os_file_create_simple_no_error_handling(
if (file == -1) { if (file == -1) {
*success = FALSE; *success = FALSE;
#ifndef UNIV_HOTBACKUP
} else if (os_file_lock(file, name)) {
*success = FALSE;
file = -1;
#endif
} else { } else {
*success = TRUE; *success = TRUE;
} }
@ -808,11 +772,6 @@ try_again:
if (retry) { if (retry) {
goto try_again; goto try_again;
} }
#ifndef UNIV_HOTBACKUP
} else if (os_file_lock(file, name)) {
*success = FALSE;
file = -1;
#endif
} else { } else {
*success = TRUE; *success = TRUE;
} }