mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
31b9e6e03f
Fix bug in isamlog Add argument types to function declarations. Docs/manual.texi: Updated credits client/mysql.cc: Fixes for OS2 client/mysqladmin.c: Fixes for OS2 client/mysqldump.c: Fixes for OS2 client/mysqlimport.c: Fixes for OS2 client/mysqltest.c: Fixes for OS2 dbug/dbug.c: Fixes for OS2. Use new C calling convention. dbug/factorial.c: Fixes for OS2. Use new C calling convention. include/errmsg.h: Fix for OS2 include/global.h: Fixes for OS2. include/my_pthread.h: Fixes for OS2. include/my_sys.h: Fixes for OS2. include/mysql_com.h: Move defines to global.h include/thr_alarm.h: Fixes for OS2. isam/isamchk.c: Fixes for OS2. Add arguments to function declarations. isam/isamlog.c: Fixes for OS2. Fix bug in logfile handling. isam/test1.c: Add arguments to function decl isam/test2.c: Add arguments to function declarations. isam/test_all.res: Update result libmysql/get_password.c: Fixes for OS2. libmysql/libmysql.c: Fixes for OS2. libmysql/net.c: Fixes for OS2. libmysql/violite.c: Add arguments to function declarations. merge/_locking.c: Add argument types to function declarations. merge/close.c: Add argument types to function declarations. merge/create.c: Add argument types to function declarations. merge/extra.c: Add argument types to function declarations. merge/open.c: Add argument types to function declarations. merge/panic.c: Add argument types to function declarations. merge/rsame.c: Add argument types to function declarations. merge/update.c: Add argument types to function declarations. myisam/ft_eval.c: Portability fix myisam/ft_search.c: Portability fix myisam/ft_test1.c: Portability fix myisam/ftdefs.h: Portability fix myisam/mi_check.c: Portability fix myisam/mi_test1.c: Portability fix myisam/mi_test2.c: Portability fix myisam/mi_test_all.sh: Update to test for MACH variable myisam/myisamlog.c: Cleanup myisam/myisampack.c: Don't use variable 'new' myisam/sort.c: Portability fix myisammrg/myrg_delete.c: Add argument types to function declarations. myisammrg/myrg_locking.c: Add argument types to function declarations. myisammrg/myrg_open.c: Add argument types to function declarations. myisammrg/myrg_panic.c: Add argument types to function declarations. mysql-test/t/backup.test: Fix for OS2 mysql-test/t/show_check.test: Fix for OS2 mysys/charset.c: Dont use variable 'new' mysys/default.c: Fixes for OS2. mysys/getopt.c: Fixes for OS2. mysys/getopt1.c: Fixes for OS2. mysys/list.c: Don't use variable 'new' mysys/mf_dirname.c: Fixes for OS2. mysys/mf_format.c: Fixes for OS2. mysys/mf_path.c: Fixes for OS2. mysys/mf_qsort.c: Portability fix mysys/mf_tempfile.c: Fixes for OS2. mysys/my_clock.c: Fixes for OS2. mysys/my_copy.c: Fixes for OS2. mysys/my_create.c: Fixes for OS2. mysys/my_getwd.c: Fixes for OS2. mysys/my_init.c: Fixes for OS2. mysys/my_lib.c: Fixes for OS2. mysys/my_lock.c: Fixes for OS2. mysys/my_malloc.c: Portability fix mysys/my_mkdir.c: Fixes for OS2. mysys/my_open.c: Fixes for OS2. mysys/my_pthread.c: Fixes for OS2. mysys/my_realloc.c: Fixes for OS2. mysys/my_redel.c: Fixes for OS2. mysys/my_static.c: Fixes for OS2. mysys/my_tempnam.c: Fixes for OS2. mysys/my_thr_init.c: Fixes for OS2. mysys/my_write.c: Fixes for OS2. mysys/test_charset.c: Fixes for OS2. mysys/thr_alarm.c: Fixes for OS2. mysys/tree.c: Fixes for OS2. sql/field.cc: Fixes for OS2. sql/field.h: Fixes for OS2. sql/gen_lex_hash.cc: Fixes for OS2. sql/hostname.cc: Fixes for OS2. sql/item_func.cc: Fixes for OS2. sql/item_strfunc.cc: Fixes for OS2. sql/log_event.cc: Fixes for OS2. sql/md5.c: Fixes for OS2. sql/mini_client.cc: Fixes for OS2. sql/mysql_priv.h: Fixes for OS2. sql/mysqld.cc: Fixes for OS2. sql/net_serv.cc: Fixes for OS2. sql/slave.cc: Fixes for OS2. sql/sql_base.cc: Fixes for OS2. sql/sql_db.cc: Portability fix sql/sql_insert.cc: Fixes for OS2. sql/sql_load.cc: Fixes for OS2. sql/sql_parse.cc: Fixes for OS2. sql/sql_table.cc: Fixes for OS2. sql/sql_udf.cc: Fixes for OS2. sql/violite.c: Fixes for OS2. strings/ctype-big5.c: Fixes for OS2. strings/ctype-gbk.c: Fixes for OS2. strings/ctype-sjis.c: Fixes for OS2. strings/ctype-tis620.c: Fixes for OS2. strings/ctype.c: Fixes for OS2. strings/strnlen.c: Fixes for OS2.
123 lines
3.5 KiB
C
123 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 /* 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(HPUX)
|
|
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)
|
|
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 */
|