mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +01:00
746f0b3b76
Run bootstrap in separate thread Fix bug in FLUSH TABLES table_name Docs/manual.texi: Updated ChangeLog client/mysql.cc: Added info about compressed protocol include/getopt.h: Fix for OS2 include/global.h: Fix for OS2 include/my_sys.h: Fix for OS2 include/mysql_com.h: Fix for OS2 include/thr_alarm.h: Cleanup up alarm struct for OS2 port isam/isamchk.c: Fix for OS2 libmysql/libmysql.c: cleanup libmysql/net.c: Use new thr_alarm libmysql/violite.c: Fix for OS2 myisam/ChangeLog: Changes myisam/mi_create.c: Use less stack myisam/myisamchk.c: Fix for OS2 mysys/default.c: Fix for OS2 mysys/getopt.c: Fix for OS2 mysys/mf_format.c: Safety mysys/mf_path.c: Fix for OS2 mysys/my_create.c: Fix for OS2 mysys/my_lock.c: Fix for OS2 mysys/my_open.c: Fix for OS2 mysys/thr_alarm.c: Use new thr_alarm struct readline/input.c: Fix for OS2 readline/rltty.c: Fix for OS2 sql/ha_myisam.cc: Remove unnecessary fn_format sql/my_lock.c: Use new thr_alarm sql/mysql_priv.h: Changed bootstrap to run in separate thread to avoid problem with small stack sql/mysqld.cc: Changed bootstrap to run in separate thread to avoid problem with small stack sql/net_serv.cc: Use new thr_alarm sql/sql_base.cc: Fix problem with FLUSH TABLE table_name sql/sql_class.cc: Fix for new bootstrap sql/sql_class.h: cleanup sql/sql_delete.cc: cleanup sql/sql_load.cc: Fix for OS2 sql/sql_parse.cc: Changed bootstrap to run in separate thread to avoid problem with small stack sql/sql_select.cc: Reset used structure elements sql/sql_table.cc: For OS2 sql/violite.c: For OS2
116 lines
3.5 KiB
C
116 lines
3.5 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA */
|
|
|
|
#define USES_TYPES
|
|
#include "mysys_priv.h"
|
|
#include "mysys_err.h"
|
|
#include <errno.h>
|
|
#if defined(MSDOS) || defined(__WIN__) || defined(__EMX__)
|
|
#include <share.h>
|
|
#endif
|
|
|
|
/* Open a file */
|
|
|
|
File my_open(const char *FileName, int Flags, myf MyFlags)
|
|
/* Path-name of file */
|
|
/* Read | write .. */
|
|
/* Special flags */
|
|
{
|
|
File fd;
|
|
DBUG_ENTER("my_open");
|
|
DBUG_PRINT("my",("Name: '%s' Flags: %d MyFlags: %d",
|
|
FileName, Flags, MyFlags));
|
|
#if defined(MSDOS) || defined(__WIN__) || defined(__EMX__)
|
|
if (Flags & O_SHARE)
|
|
fd = sopen((my_string) FileName, (Flags & ~O_SHARE) | O_BINARY, SH_DENYNO);
|
|
else
|
|
fd = open((my_string) FileName, Flags | O_BINARY);
|
|
#elif !defined(NO_OPEN_3)
|
|
fd = open(FileName, Flags, my_umask); /* Normal unix */
|
|
#else
|
|
fd = open((my_string) FileName, Flags);
|
|
#endif
|
|
|
|
if ((int) fd >= 0)
|
|
{
|
|
if ((int) fd >= MY_NFILE)
|
|
{
|
|
#if defined(THREAD) && !defined(HAVE_PREAD)
|
|
(void) my_close(fd,MyFlags);
|
|
my_errno=EMFILE;
|
|
if (MyFlags & (MY_FFNF | MY_FAE | MY_WME))
|
|
my_error(EE_OUT_OF_FILERESOURCES, MYF(ME_BELL+ME_WAITTANG),
|
|
FileName, my_errno);
|
|
DBUG_RETURN(-1);
|
|
#else
|
|
thread_safe_increment(my_file_opened,&THR_LOCK_open);
|
|
#endif
|
|
DBUG_RETURN(fd); /* safeguard */
|
|
}
|
|
pthread_mutex_lock(&THR_LOCK_open);
|
|
if ((my_file_info[fd].name = (char*) my_strdup(FileName,MyFlags)))
|
|
{
|
|
my_file_opened++;
|
|
my_file_info[fd].type = FILE_BY_OPEN;
|
|
#if defined(THREAD) && !defined(HAVE_PREAD)
|
|
pthread_mutex_init(&my_file_info[fd].mutex,NULL);
|
|
#endif
|
|
pthread_mutex_unlock(&THR_LOCK_open);
|
|
DBUG_PRINT("exit",("fd: %d",fd));
|
|
DBUG_RETURN(fd);
|
|
}
|
|
pthread_mutex_unlock(&THR_LOCK_open);
|
|
(void) my_close(fd,MyFlags);
|
|
my_errno=ENOMEM;
|
|
}
|
|
else
|
|
my_errno=errno;
|
|
DBUG_PRINT("error",("Got error %d on open",my_errno));
|
|
if (MyFlags & (MY_FFNF | MY_FAE | MY_WME))
|
|
my_error(EE_FILENOTFOUND, MYF(ME_BELL+ME_WAITTANG), FileName,my_errno);
|
|
DBUG_RETURN(fd);
|
|
} /* my_open */
|
|
|
|
|
|
/* Close a file */
|
|
|
|
int my_close(File fd, myf MyFlags)
|
|
{
|
|
int err;
|
|
DBUG_ENTER("my_close");
|
|
DBUG_PRINT("my",("fd: %d MyFlags: %d",fd, MyFlags));
|
|
|
|
pthread_mutex_lock(&THR_LOCK_open);
|
|
if ((err = close(fd)))
|
|
{
|
|
DBUG_PRINT("error",("Got error %d on close",err));
|
|
my_errno=errno;
|
|
if (MyFlags & (MY_FAE | MY_WME))
|
|
my_error(EE_BADCLOSE, MYF(ME_BELL+ME_WAITTANG),my_filename(fd),errno);
|
|
}
|
|
if ((uint) fd < MY_NFILE && my_file_info[fd].type != UNOPEN)
|
|
{
|
|
my_free(my_file_info[fd].name, MYF(0));
|
|
#if defined(THREAD) && !defined(HAVE_PREAD)
|
|
pthread_mutex_destroy(&my_file_info[fd].mutex);
|
|
#endif
|
|
my_file_info[fd].type = UNOPEN;
|
|
my_file_opened--;
|
|
}
|
|
pthread_mutex_unlock(&THR_LOCK_open);
|
|
DBUG_RETURN(err);
|
|
} /* my_close */
|