mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +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
187 lines
4.4 KiB
C
187 lines
4.4 KiB
C
/* Copyright (C) Yuri Dario & 2000 MySQL AB
|
|
All the above parties has a full, independent copyright to
|
|
the following code, including the right to use the code in
|
|
any manner without any demands from the other parties.
|
|
|
|
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 */
|
|
|
|
/*****************************************************************************
|
|
** The following is a simple implementation of posix conditions
|
|
*****************************************************************************/
|
|
|
|
#undef SAFE_MUTEX /* Avoid safe_mutex redefinitions */
|
|
#include "mysys_priv.h"
|
|
#if defined(THREAD) && defined(OS2)
|
|
#include <m_string.h>
|
|
#include <process.h>
|
|
#include <sys/timeb.h>
|
|
|
|
int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr)
|
|
{
|
|
APIRET rc = 0;
|
|
HEV event;
|
|
cond->waiting=0;
|
|
/* Warp3 FP29 or Warp4 FP4 or better required */
|
|
rc = DosCreateEventSem( NULL, &cond->semaphore, 0x0800, 0);
|
|
if (rc)
|
|
return ENOMEM;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int pthread_cond_destroy(pthread_cond_t *cond)
|
|
{
|
|
APIRET rc;
|
|
|
|
do {
|
|
rc = DosCloseEventSem(cond->semaphore);
|
|
if (rc == 301) DosPostEventSem(cond->semaphore);
|
|
} while (rc == 301);
|
|
if (rc)
|
|
return EINVAL;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
|
|
{
|
|
APIRET rc;
|
|
int rval;
|
|
|
|
rval = 0;
|
|
cond->waiting++;
|
|
|
|
if (mutex) pthread_mutex_unlock(mutex);
|
|
|
|
rc = DosWaitEventSem(cond->semaphore,SEM_INDEFINITE_WAIT);
|
|
if (rc != 0)
|
|
rval = EINVAL;
|
|
|
|
if (mutex) pthread_mutex_lock(mutex);
|
|
|
|
cond->waiting--;
|
|
|
|
return rval;
|
|
}
|
|
|
|
int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
|
|
struct timespec *abstime)
|
|
{
|
|
struct timeb curtime;
|
|
int result;
|
|
long timeout;
|
|
APIRET rc;
|
|
int rval;
|
|
|
|
_ftime(&curtime);
|
|
timeout= ((long) (abstime->ts_sec - curtime.time)*1000L +
|
|
(long)((abstime->ts_nsec/1000) - curtime.millitm)/1000L);
|
|
if (timeout < 0) /* Some safety */
|
|
timeout = 0L;
|
|
|
|
rval = 0;
|
|
cond->waiting++;
|
|
|
|
if (mutex) pthread_mutex_unlock(mutex);
|
|
|
|
rc = DosWaitEventSem(cond->semaphore, timeout);
|
|
if (rc != 0)
|
|
rval = ETIME;
|
|
|
|
if (mutex) pthread_mutex_lock(mutex);
|
|
|
|
cond->waiting--;
|
|
|
|
return rval;
|
|
}
|
|
|
|
|
|
int pthread_cond_signal(pthread_cond_t *cond)
|
|
{
|
|
APIRET rc;
|
|
|
|
/* Bring the next thread off the condition queue: */
|
|
rc = DosPostEventSem(cond->semaphore);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int pthread_cond_broadcast(pthread_cond_t *cond)
|
|
{
|
|
int i;
|
|
APIRET rc;
|
|
|
|
/*
|
|
* Enter a loop to bring all threads off the
|
|
* condition queue:
|
|
*/
|
|
i = cond->waiting;
|
|
while (i--) rc = DosPostEventSem(cond->semaphore);
|
|
|
|
return 0 ;
|
|
}
|
|
|
|
|
|
int pthread_attr_init(pthread_attr_t *connect_att)
|
|
{
|
|
connect_att->dwStackSize = 0;
|
|
connect_att->dwCreatingFlag = 0;
|
|
connect_att->priority = 0;
|
|
return 0;
|
|
}
|
|
|
|
int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack)
|
|
{
|
|
connect_att->dwStackSize=stack;
|
|
return 0;
|
|
}
|
|
|
|
int pthread_attr_setprio(pthread_attr_t *connect_att,int priority)
|
|
{
|
|
connect_att->priority=priority;
|
|
return 0;
|
|
}
|
|
|
|
int pthread_attr_destroy(pthread_attr_t *connect_att)
|
|
{
|
|
bzero((gptr) connect_att,sizeof(*connect_att));
|
|
return 0;
|
|
}
|
|
|
|
/****************************************************************************
|
|
** Fix localtime_r() to be a bit safer
|
|
****************************************************************************/
|
|
|
|
struct tm *localtime_r(const time_t *timep,struct tm *tmp)
|
|
{
|
|
if (*timep == (time_t) -1) /* This will crash win32 */
|
|
{
|
|
bzero(tmp,sizeof(*tmp));
|
|
}
|
|
else
|
|
{
|
|
struct tm *res=localtime(timep);
|
|
if (!res) /* Wrong date */
|
|
{
|
|
bzero(tmp,sizeof(*tmp)); /* Keep things safe */
|
|
return 0;
|
|
}
|
|
*tmp= *res;
|
|
}
|
|
return tmp;
|
|
}
|
|
#endif /* __WIN__ */
|