mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
76bf7d2224
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler) Added a lot of 'version_xxx' strings to 'show variables' Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris) Fixed problem with printing sub selects to debug log Docs/mysqld_error.txt: Updated error messages Makefile.am: Added missing SSL library (Should be in source distribution) configure.in: Added missing SSL library include/sql_common.h: Move duplicated prototypes innobase/os/os0file.c: Added comment for line that could be removed innobase/srv/srv0srv.c: Added comment for line that could be removed innobase/srv/srv0start.c: Added comment for line that could be removed innobase/trx/trx0sys.c: Added cast to remove compiler warning isam/isamchk.c: Fixed compiler warning libmysql/conf_to_src.c: Include files in proper order myisam/mi_check.c: Removed else part that caused compiler warning myisam/mi_delete.c: Added cast myisam/mi_page.c: Added cast myisam/mi_preload.c: Added cast myisam/mi_write.c: Added cast myisam/myisampack.c: changed 'byte' to 'current_byte' to avoid compiler warnings mysql-test/mysql-test-run.sh: Removed start-from as test '<' is not portable and this can easily be done from command line mysys/hash.c: Added cast mysys/mf_wcomp.c: Removed not reached line mysys/my_append.c: Fixed include file order to get this more portable mysys/my_copy.c: Fixed include file order to get this more portable mysys/my_redel.c: Fixed include file order to get this more portable sql-common/client.c: More DBUG_PRINT sql-common/pack.c: Added casts becasue Fortre compiler apparently compares (ulonglong) < (longlong) as signed sql/ha_heap.cc: Changed variable names to not cause hidden variables sql/ha_innodb.cc: Changed variable names to not cause hidden variables sql/item.cc: Changed variable names to not cause hidden variables sql/item.h: Changed variable names to not cause hidden variables sql/item_cmpfunc.h: Changed variable names to not cause hidden variables sql/item_func.cc: Changed variable names to not cause hidden variables sql/item_subselect.cc: Changed variable names to not cause hidden variables sql/item_subselect.h: Changed variable names to not cause hidden variables sql/item_sum.cc: Changed variable names to not cause hidden variables sql/item_timefunc.cc: Changed variable names to not cause hidden variables sql/log.cc: Changed variable names to not cause hidden variables sql/protocol.cc: Changed variable names to not cause hidden variables sql/protocol.h: Changed variable names to not cause hidden variables Remove function not declared in protocol.cc sql/protocol_cursor.cc: Changed variable names to not cause hidden variables sql/set_var.cc: Added a lot of 'version_xxx' strings Changed 'bdb_version' to 'version_bdb' sql/sql_class.cc: Changed variable names to not cause hidden variables Add TMP_TABLE_PARAM::init() to allow one to initialize structure several times sql/sql_class.h: Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris) sql/sql_derived.cc: Avoid copying TMP_TABLE_PARAM (Use class version instead) sql/sql_error.cc: More DBUG sql/sql_help.cc: Fixed compiler warning sql/sql_lex.cc: Changed variable names to not cause hidden variables sql/sql_list.h: Changed variable names to not cause hidden variables sql/sql_parse.cc: Changed variable names to not cause hidden variables sql/sql_select.cc: Changed variable names to not cause hidden variables Ensure that you don't send NULL to printf() for %s Fixed problem with printing sub selects to debug log sql/sql_select.h: Changed variable names to not cause hidden variables sql/sql_union.cc: Changed variable names to not cause hidden variables Don't use local copy of TMP_TABLE_PARAM (Caused core dump on Solaris) sql/sql_update.cc: Indentation cleanup sql/sql_yacc.yy: Remove warning strings/conf_to_src.c: Fixed include file order
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_UTIME_H)
|
|
#include <utime.h>
|
|
#elif defined(HAVE_SYS_UTIME_H)
|
|
#include <sys/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 */
|