mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +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
197 lines
5.3 KiB
C
197 lines
5.3 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
#include "my_static.h"
|
|
#include "mysys_err.h"
|
|
#include <errno.h>
|
|
#ifdef HAVE_PATHS_H
|
|
#include <paths.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_TEMPNAM
|
|
#if !defined(MSDOS) && !defined(OS2) && !defined(__NETWARE__)
|
|
extern char **environ;
|
|
#endif
|
|
#endif
|
|
|
|
/*
|
|
Create a temporary file in a given directory
|
|
This function should be used instead of my_tempnam() !
|
|
*/
|
|
|
|
File create_temp_file(char *to, const char *dir, const char *prefix,
|
|
int mode __attribute__((unused)),
|
|
myf MyFlags __attribute__((unused)))
|
|
{
|
|
File file= -1;
|
|
DBUG_ENTER("create_temp_file");
|
|
#if defined(_MSC_VER)
|
|
{
|
|
char temp[FN_REFLEN],*end,*res,**old_env,*temp_env[1];
|
|
old_env=environ;
|
|
if (dir)
|
|
{
|
|
end=strend(dir)-1;
|
|
if (!dir[0])
|
|
{ /* Change empty string to current dir */
|
|
to[0]= FN_CURLIB;
|
|
to[1]= 0;
|
|
dir=to;
|
|
}
|
|
else if (*end == FN_DEVCHAR)
|
|
{ /* Get current dir for drive */
|
|
_fullpath(temp,dir,FN_REFLEN);
|
|
dir=to;
|
|
}
|
|
else if (*end == FN_LIBCHAR && dir < end && end[-1] != FN_DEVCHAR)
|
|
{
|
|
strmake(to,dir,(uint) (end-dir)); /* Copy and remove last '\' */
|
|
dir=to;
|
|
}
|
|
environ=temp_env; /* Force use of dir (dir not checked) */
|
|
temp_env[0]=0;
|
|
}
|
|
if ((res=tempnam((char*) dir,(char *) prefix)))
|
|
{
|
|
strmake(to,res,FN_REFLEN-1);
|
|
(*free)(res);
|
|
file=my_create(to,0, mode, MyFlags);
|
|
}
|
|
environ=old_env;
|
|
}
|
|
#elif defined(_ZTC__)
|
|
if (!dir)
|
|
dir=getenv("TMPDIR");
|
|
if ((res=tempnam((char*) dir,(char *) prefix)))
|
|
{
|
|
strmake(to,res,FN_REFLEN-1);
|
|
(*free)(res);
|
|
file=my_create(to, 0, mode, MyFlags);
|
|
}
|
|
#elif defined(HAVE_MKSTEMP)
|
|
{
|
|
char prefix_buff[30];
|
|
uint pfx_len;
|
|
File org_file;
|
|
|
|
pfx_len= (uint) (strmov(strnmov(prefix_buff,
|
|
prefix ? prefix : "tmp.",
|
|
sizeof(prefix_buff)-7),"XXXXXX") -
|
|
prefix_buff);
|
|
if (!dir && ! (dir =getenv("TMPDIR")))
|
|
dir=P_tmpdir;
|
|
if (strlen(dir)+ pfx_len > FN_REFLEN-2)
|
|
{
|
|
errno=my_errno= ENAMETOOLONG;
|
|
return 1;
|
|
}
|
|
strmov(convert_dirname(to,dir,NullS),prefix_buff);
|
|
org_file=mkstemp(to);
|
|
file=my_register_filename(org_file, to, FILE_BY_MKSTEMP,
|
|
EE_CANTCREATEFILE, MyFlags);
|
|
/* If we didn't manage to register the name, remove the temp file */
|
|
if (org_file >= 0 && file < 0)
|
|
{
|
|
int tmp=my_errno;
|
|
(void) my_delete(to, MYF(MY_WME | ME_NOINPUT));
|
|
my_errno=tmp;
|
|
}
|
|
}
|
|
#elif defined(HAVE_TEMPNAM)
|
|
{
|
|
char *res,**old_env,*temp_env[1];
|
|
if (dir && !dir[0])
|
|
{ /* Change empty string to current dir */
|
|
to[0]= FN_CURLIB;
|
|
to[1]= 0;
|
|
dir=to;
|
|
}
|
|
#ifdef OS2
|
|
/* changing environ variable doesn't work with VACPP */
|
|
char buffer[256];
|
|
sprintf( buffer, "TMP=%s", dir);
|
|
/* remove ending backslash */
|
|
if (buffer[strlen(buffer)-1] == '\\')
|
|
buffer[strlen(buffer)-1] = '\0';
|
|
putenv( buffer);
|
|
#elif !defined(__NETWARE__)
|
|
old_env= (char**) environ;
|
|
if (dir)
|
|
{ /* Don't use TMPDIR if dir is given */
|
|
environ=(const char**) temp_env;
|
|
temp_env[0]=0;
|
|
}
|
|
#endif
|
|
if ((res=tempnam((char*) dir, (char*) prefix)))
|
|
{
|
|
strmake(to,res,FN_REFLEN-1);
|
|
(*free)(res);
|
|
file=my_create(to,0,
|
|
(int) (O_RDWR | O_BINARY | O_TRUNC |
|
|
O_TEMPORARY | O_SHORT_LIVED),
|
|
MYF(MY_WME));
|
|
|
|
}
|
|
else
|
|
{
|
|
DBUG_PRINT("error",("Got error: %d from tempnam",errno));
|
|
}
|
|
#if !defined(OS2) && !defined(__NETWARE__)
|
|
environ=(const char**) old_env;
|
|
#endif
|
|
}
|
|
#else
|
|
{
|
|
register long uniq;
|
|
register int length;
|
|
my_string pos,end_pos;
|
|
/* Make an unique number */
|
|
pthread_mutex_lock(&THR_LOCK_open);
|
|
uniq= ((long) getpid() << 20) + (long) _my_tempnam_used++ ;
|
|
pthread_mutex_unlock(&THR_LOCK_open);
|
|
if (!dir && !(dir=getenv("TMPDIR"))) /* Use this if possibly */
|
|
dir=P_tmpdir; /* Use system default */
|
|
length=strlen(dir)+strlen(pfx)+1;
|
|
|
|
DBUG_PRINT("test",("mallocing %d byte",length+8+sizeof(TMP_EXT)+1));
|
|
if (length+8+sizeof(TMP_EXT)+1 > FN_REFLENGTH)
|
|
errno=my_errno= ENAMETOOLONG;
|
|
else
|
|
{
|
|
end_pos=strmov(to,dir);
|
|
if (end_pos != to && end_pos[-1] != FN_LIBCHAR)
|
|
*end_pos++=FN_LIBCHAR;
|
|
end_pos=strmov(end_pos,pfx);
|
|
|
|
for (length=0 ; length < 8 && uniq ; length++)
|
|
{
|
|
*end_pos++= _dig_vec[(int) (uniq & 31)];
|
|
uniq >>= 5;
|
|
}
|
|
(void) strmov(end_pos,TMP_EXT);
|
|
file=my_create(to,0,
|
|
(int) (O_RDWR | O_BINARY | O_TRUNC |
|
|
O_TEMPORARY | O_SHORT_LIVED),
|
|
MYF(MY_WME));
|
|
}
|
|
}
|
|
#endif
|
|
if (file >= 0)
|
|
thread_safe_increment(my_tmp_file_created,&THR_LOCK_open);
|
|
DBUG_RETURN(file);
|
|
}
|