mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +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
122 lines
3.4 KiB
C
122 lines
3.4 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 */
|
|
|
|
#define USES_TYPES /* sys/types is included */
|
|
#include "mysys_priv.h"
|
|
#include <my_dir.h>
|
|
#include <m_string.h>
|
|
#include "mysys_err.h"
|
|
#if defined(HAVE_SYS_UTIME_H)
|
|
#include <sys/utime.h>
|
|
#elif defined(HAVE_UTIME_H)
|
|
#include <utime.h>
|
|
#elif !defined(HPUX10)
|
|
struct utimbuf {
|
|
time_t actime;
|
|
time_t modtime;
|
|
};
|
|
#endif
|
|
|
|
/*
|
|
Rename with copy stat form old file
|
|
Copy stats from old file to new file, deletes orginal and
|
|
changes new file name to old file name
|
|
|
|
if MY_REDEL_MAKE_COPY is given, then the orginal file
|
|
is renamed to org_name-'current_time'.BAK
|
|
*/
|
|
|
|
#define REDEL_EXT ".BAK"
|
|
|
|
int my_redel(const char *org_name, const char *tmp_name, myf MyFlags)
|
|
{
|
|
int error=1;
|
|
DBUG_ENTER("my_redel");
|
|
DBUG_PRINT("my",("org_name: '%s' tmp_name: '%s' MyFlags: %d",
|
|
org_name,tmp_name,MyFlags));
|
|
|
|
if (my_copystat(org_name,tmp_name,MyFlags) < 0)
|
|
goto end;
|
|
if (MyFlags & MY_REDEL_MAKE_BACKUP)
|
|
{
|
|
char name_buff[FN_REFLEN+20];
|
|
char ext[20];
|
|
ext[0]='-';
|
|
get_date(ext+1,2+4,(time_t) 0);
|
|
strmov(strend(ext),REDEL_EXT);
|
|
if (my_rename(org_name, fn_format(name_buff, org_name, "", ext, 2),
|
|
MyFlags))
|
|
goto end;
|
|
}
|
|
else if (my_delete(org_name,MyFlags))
|
|
goto end;
|
|
if (my_rename(tmp_name,org_name,MyFlags))
|
|
goto end;
|
|
|
|
error=0;
|
|
end:
|
|
DBUG_RETURN(error);
|
|
} /* my_redel */
|
|
|
|
|
|
/* Copy stat from one file to another */
|
|
/* Return -1 if can't get stat, 1 if wrong type of file */
|
|
|
|
int my_copystat(const char *from, const char *to, int MyFlags)
|
|
{
|
|
struct stat statbuf;
|
|
|
|
if (stat((char*) from, &statbuf))
|
|
{
|
|
my_errno=errno;
|
|
if (MyFlags & (MY_FAE+MY_WME))
|
|
my_error(EE_STAT, MYF(ME_BELL+ME_WAITTANG),from,errno);
|
|
return -1; /* Can't get stat on input file */
|
|
}
|
|
if ((statbuf.st_mode & S_IFMT) != S_IFREG)
|
|
return 1;
|
|
VOID(chmod(to, statbuf.st_mode & 07777)); /* Copy modes */
|
|
|
|
#if !defined(MSDOS) && !defined(__WIN__) && !defined(__EMX__) && !defined(OS2) && !defined(__NETWARE__)
|
|
if (statbuf.st_nlink > 1 && MyFlags & MY_LINK_WARNING)
|
|
{
|
|
if (MyFlags & MY_LINK_WARNING)
|
|
my_error(EE_LINK_WARNING,MYF(ME_BELL+ME_WAITTANG),from,statbuf.st_nlink);
|
|
}
|
|
VOID(chown(to, statbuf.st_uid, statbuf.st_gid)); /* Copy ownership */
|
|
#endif /* MSDOS */
|
|
|
|
#ifndef VMS
|
|
#ifndef __ZTC__
|
|
if (MyFlags & MY_COPYTIME)
|
|
{
|
|
struct utimbuf timep;
|
|
timep.actime = statbuf.st_atime;
|
|
timep.modtime = statbuf.st_mtime;
|
|
VOID(utime((char*) to, &timep));/* Update last accessed and modified times */
|
|
}
|
|
#else
|
|
if (MyFlags & MY_COPYTIME)
|
|
{
|
|
time_t time[2];
|
|
time[0]= statbuf.st_atime;
|
|
time[1]= statbuf.st_mtime;
|
|
VOID(utime((char*) to, time));/* Update last accessed and modified times */
|
|
}
|
|
#endif
|
|
#endif
|
|
return 0;
|
|
} /* my_copystat */
|