mirror of
https://github.com/MariaDB/server.git
synced 2025-01-25 00:04:33 +01:00
84f81dc593
Call pthread_mutex_destroy() on not used mutex. Changed comments in .h and .c files from // -> /* */ Added detection of mutex on which one didn't call pthread_mutex_destroy() Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression" Added optimisation for ORDER BY NULL BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75: Delete: sql/ChangeLog BUILD/compile-pentium-valgrind-max: Don't use valgrind with safemalloc as this can hide some bugs Makefile.am: Added platform dirs bdb/os/os_handle.c: Portability fix client/mysql.cc: Fixes for Netware. Fixed duplicate output when using 'tee' Simple optimisations client/mysqldump.c: Portability fix client/mysqltest.c: Portability fix configure.in: Fixes for Netware extra/resolveip.c: Fixes for Netware include/Makefile.am: Fixes for Netware include/config-win.h: Portability fix include/my_global.h: Fixes for Netware include/my_net.h: Fixes for Netware include/my_pthread.h: Fixes for Netware Added detection of mutexes that was not destroyed include/my_sys.h: Fixes for Netware Added 'extern' before external functions include/mysql.h: Fixes for Netware innobase/configure.in: Fixes for Netware innobase/include/os0thread.h: Fixes for Netware innobase/os/os0sync.c: Fixes for Netware innobase/os/os0thread.c: Fixes for Netware innobase/srv/srv0srv.c: Fixes for Netware innobase/srv/srv0start.c: Fixes for Netware innobase/sync/sync0sync.c: Fixes for Netware isam/test3.c: Disable test on Netware libmysql/Makefile.shared: Added my_sleep libmysql/get_password.c: Fixes for Netware libmysql/libmysql.c: Fixes for Netware Made mysql_once_init() global libmysql/manager.c: Fixes for Netware myisam/mi_test3.c: Disable test for netware mysql-test/mysql-test-run.sh: Give warning if output file contains errors mysql-test/r/count_distinct.result: More tests mysql-test/r/group_by.result: Test of ORDER BY NULL mysql-test/t/backup.test: Fixes for Netware mysql-test/t/count_distinct.test: More tests mysql-test/t/func_crypt.test: Fixes for Netware mysql-test/t/grant_cache.test: Fixes for Netware mysql-test/t/group_by.test: Tests of ORDER BY NULL mysql-test/t/rpl000015.test: Fixes for Netware mysql-test/t/rpl000017.test: Fixes for Netware mysql-test/t/rpl_rotate_logs.test: Fixes for Netware mysys/Makefile.am: Added my_sleep.c and my_netware.c mysys/charset.c: Fixes for Netware mysys/default.c: Fixes for Netware mysys/mf_tempfile.c: Fixes for Netware mysys/my_clock.c: Fixes for Netware mysys/my_copy.c: Fixes for Netware mysys/my_getwd.c: Changed function comment from // -> /* */ mysys/my_init.c: Fixes for Netware mysys/my_lock.c: Fixes for Netware mysys/my_messnc.c: Fixes for Netware mysys/my_os2cond.c: Removed comment mysys/my_os2dirsrch.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2dirsrch.h: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2file64.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2mutex.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2thread.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2tls.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_pthread.c: Fixes for Netware mysys/my_redel.c: Fixes for Netware mysys/my_tempnam.c: Fixes for Netware mysys/my_thr_init.c: Remove created mutexes when program ends. mysys/mysys_priv.h: Cleanup mysys/safemalloc.c: Prefix error messages with "Error:" mysys/thr_alarm.c: Destroy internal mutex on end_thr_alarm. mysys/thr_mutex.c: Added detection of mutex on which one didn't call pthread_mutex_destroy() scripts/make_binary_distribution.sh: Fixes for Netware sql/des_key_file.cc: Free mutex at end sql/ha_innodb.cc: Free mutex at end sql/ha_myisam.cc: Changed warnings from REPAIR Note: (For mysql-test-run) sql/hostname.cc: Fixes for Netware sql/item.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/item_func.cc: Free used mutexes sql/item_sum.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/log.cc: Free used mutexes sql/my_lock.c: Fixes for Netware sql/mysql_priv.h: Fixes for Netware sql/mysqld.cc: Fixes for Netware Added Have_crypt Properly free mutexes from MYSQL_LOG by calling cleanup Free mutex before exit sql/repl_failsafe.cc: Fixes for Netware sql/set_var.cc: Added have_crypt sql/share/english/errmsg.txt: Added version socket and port to stderr log sql/slave.cc: Remove global MASTER_INFO variable and use instead an allocated variable. This allows us to correctly free used mutex. sql/slave.h: Move constructors and destuctors to slave.cc (To make it easier to clear all needed variables) sql/sql_base.cc: Safety fix sql/sql_class.h: Portability fixes. Added 'cleanup' to log handling to be able to free mutexes. sql/sql_insert.cc: Fixes for Netware mysys/my_sleep.c: E sql/sql_parse.cc: Fixes for Netware sql/sql_select.cc: Added optimisation for ORDER BY NULL sql/sql_select.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_table.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_udf.cc: Free mutex on end vio/test-ssl.c: Simple code cleanup vio/test-sslclient.c: Simple code cleanup vio/test-sslserver.c: Simple code cleanup vio/viotest-ssl.c: Simple code cleanup
165 lines
3.9 KiB
C
165 lines
3.9 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1998, 1999, 2000
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
|
|
#include "db_config.h"
|
|
|
|
#ifndef lint
|
|
static const char revid[] = "$Id: os_handle.c,v 11.19 2000/11/30 00:58:42 ubell Exp $";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <fcntl.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "os_jump.h"
|
|
|
|
/*
|
|
* __os_openhandle --
|
|
* Open a file, using POSIX 1003.1 open flags.
|
|
*
|
|
* PUBLIC: int __os_openhandle __P((DB_ENV *, const char *, int, int, DB_FH *));
|
|
*/
|
|
int
|
|
__os_openhandle(dbenv, name, flags, mode, fhp)
|
|
DB_ENV *dbenv;
|
|
const char *name;
|
|
int flags, mode;
|
|
DB_FH *fhp;
|
|
{
|
|
int ret, nrepeat;
|
|
#ifdef HAVE_VXWORKS
|
|
int newflags;
|
|
#endif
|
|
|
|
memset(fhp, 0, sizeof(*fhp));
|
|
|
|
/* If the application specified an interface, use it. */
|
|
if (__db_jump.j_open != NULL) {
|
|
if ((fhp->fd = __db_jump.j_open(name, flags, mode)) == -1)
|
|
return (__os_get_errno());
|
|
F_SET(fhp, DB_FH_VALID);
|
|
return (0);
|
|
}
|
|
|
|
for (ret = 0, nrepeat = 1; nrepeat < 4; ++nrepeat) {
|
|
#ifdef HAVE_VXWORKS
|
|
/*
|
|
* VxWorks does not support O_CREAT on open, you have to use
|
|
* creat() instead. (It does not support O_EXCL or O_TRUNC
|
|
* either, even though they are defined "for future support".)
|
|
* If O_EXCL is specified, single thread and try to open the
|
|
* file. If successful, return EEXIST. Otherwise, call creat
|
|
* and then end single threading.
|
|
*/
|
|
if (LF_ISSET(O_CREAT)) {
|
|
DB_BEGIN_SINGLE_THREAD;
|
|
newflags = flags & ~(O_CREAT | O_EXCL);
|
|
if (LF_ISSET(O_EXCL)) {
|
|
if ((fhp->fd =
|
|
open(name, newflags, mode)) != -1) {
|
|
/*
|
|
* If we get here, we want O_EXCL
|
|
* create, and it exists. Close and
|
|
* return EEXISTS.
|
|
*/
|
|
(void)close(fhp->fd);
|
|
DB_END_SINGLE_THREAD;
|
|
return (EEXIST);
|
|
}
|
|
/*
|
|
* XXX
|
|
* Assume any error means non-existence.
|
|
* Unfortunately return values (even for
|
|
* non-existence) are driver specific so
|
|
* there is no single error we can use to
|
|
* verify we truly got the equivalent of
|
|
* ENOENT.
|
|
*/
|
|
}
|
|
fhp->fd = creat(name, newflags);
|
|
DB_END_SINGLE_THREAD;
|
|
} else
|
|
|
|
/* FALLTHROUGH */
|
|
#endif
|
|
#ifdef __VMS
|
|
/*
|
|
* !!!
|
|
* Open with full sharing on VMS.
|
|
*
|
|
* We use these flags because they are the ones set by the VMS
|
|
* CRTL mmap() call when it opens a file, and we have to be
|
|
* able to open files that mmap() has previously opened, e.g.,
|
|
* when we're joining already existing DB regions.
|
|
*/
|
|
fhp->fd = open(name, flags, mode, "shr=get,put,upd,del,upi");
|
|
#else
|
|
fhp->fd = open(name, flags, mode);
|
|
#endif
|
|
|
|
if (fhp->fd == -1) {
|
|
/*
|
|
* If it's a "temporary" error, we retry up to 3 times,
|
|
* waiting up to 12 seconds. While it's not a problem
|
|
* if we can't open a database, an inability to open a
|
|
* log file is cause for serious dismay.
|
|
*/
|
|
ret = __os_get_errno();
|
|
if (ret == ENFILE || ret == EMFILE || ret == ENOSPC) {
|
|
(void)__os_sleep(dbenv, nrepeat * 2, 0);
|
|
continue;
|
|
}
|
|
} else {
|
|
#if defined(HAVE_FCNTL_F_SETFD)
|
|
/* Deny file descriptor access to any child process. */
|
|
if (fcntl(fhp->fd, F_SETFD, FD_CLOEXEC) == -1) {
|
|
ret = __os_get_errno();
|
|
__db_err(dbenv, "fcntl(F_SETFD): %s",
|
|
strerror(ret));
|
|
(void)__os_closehandle(fhp);
|
|
} else
|
|
#endif
|
|
F_SET(fhp, DB_FH_VALID);
|
|
}
|
|
break;
|
|
}
|
|
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* __os_closehandle --
|
|
* Close a file.
|
|
*
|
|
* PUBLIC: int __os_closehandle __P((DB_FH *));
|
|
*/
|
|
int
|
|
__os_closehandle(fhp)
|
|
DB_FH *fhp;
|
|
{
|
|
int ret;
|
|
|
|
/* Don't close file descriptors that were never opened. */
|
|
DB_ASSERT(F_ISSET(fhp, DB_FH_VALID) && fhp->fd != -1);
|
|
|
|
ret = __db_jump.j_close != NULL ?
|
|
__db_jump.j_close(fhp->fd) : close(fhp->fd);
|
|
|
|
/*
|
|
* Smash the POSIX file descriptor -- it's never tested, but we want
|
|
* to catch any mistakes.
|
|
*/
|
|
fhp->fd = -1;
|
|
F_CLR(fhp, DB_FH_VALID);
|
|
|
|
return (ret == 0 ? 0 : __os_get_errno());
|
|
}
|