mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
14decc4fbc
(Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #) BitKeeper/etc/ignore: added mysql-test/r/*.warnings BUILD/SETUP.sh: Don't build with BDB as default client/client_priv.h: Added OPT_DEBUG_INFO client/mysqlbinlog.cc: Fixed compiler warning client/mysqldump.c: Removed compiler warnings Added option --debug-info to detect memory leaks Fixed memory leak Don't backup cluster replication tables (if used with 5.1) cmd-line-utils/readline/bind.c: Fixed compiler warning cmd-line-utils/readline/chardefs.h: Fixed compiler warning cmd-line-utils/readline/complete.c: Fixed compiler warning cmd-line-utils/readline/display.c: Fixed compiler warning cmd-line-utils/readline/histexpand.c: Fixed compiler warning cmd-line-utils/readline/input.c: Fixed compiler warning cmd-line-utils/readline/isearch.c: Fixed compiler warning cmd-line-utils/readline/kill.c: Fixed compiler warning cmd-line-utils/readline/macro.c: Fixed compiler warning cmd-line-utils/readline/misc.c: Fixed compiler warning cmd-line-utils/readline/nls.c: Fixed compiler warning cmd-line-utils/readline/readline.c: Fixed compiler warning cmd-line-utils/readline/rltty.c: Fixed compiler warning cmd-line-utils/readline/search.c: Fixed compiler warning cmd-line-utils/readline/terminal.c: Fixed compiler warning cmd-line-utils/readline/text.c: Fixed compiler warning cmd-line-utils/readline/tilde.c: Fixed compiler warning cmd-line-utils/readline/undo.c: Fixed compiler warning cmd-line-utils/readline/util.c: Fixed compiler warning cmd-line-utils/readline/vi_mode.c: Fixed compiler warning dbug/dbug_analyze.c: Fixed compiler warning extra/yassl/src/ssl.cpp: Fixed compiler warning extra/yassl/testsuite/testsuite.cpp: Fixed compiler warning heap/_check.c: Fixed compiler warning heap/hp_delete.c: Fixed compiler warning heap/hp_hash.c: Fixed compiler warning heap/hp_open.c: Fixed compiler warning heap/hp_rkey.c: Fixed compiler warning heap/hp_rrnd.c: Fixed compiler warning heap/hp_write.c: Fixed compiler warning libmysql/libmysql.c: Fixed compiler warning libmysqld/libmysqld.c: Fixed compiler warning myisam/mi_close.c: Fixed compiler warning myisam/mi_delete.c: Fixed compiler warning myisam/mi_dynrec.c: Fixed compiler warning myisam/mi_keycache.c: Fixed compiler warning myisam/mi_page.c: Fixed compiler warning myisam/mi_statrec.c: Fixed compiler warning myisam/mi_test2.c: Fixed compiler warning myisam/mi_write.c: Fixed compiler warning myisam/myisampack.c: Fixed compiler warning myisammrg/myrg_extra.c: Fixed compiler warning mysql-test/mysql-test-run.pl: Remove .reject, .progress, .log and .warnings flag at start cluster -> mysql database (for 5.1) mysql-test/include/federated.inc: Remove mysqltest warnings mysql-test/include/sp-vars.inc: Remove mysqltest warnings mysql-test/mysql-test-run.sh: Fix so that 'make test' works again Remove .reject, .progress .log and .warnings files at startup mysql-test/r/ctype_cp1250_ch.result: Drop used tables at startup mysql-test/t/create.test: Remove mysqltest warnings mysql-test/t/csv.test: Remove mysqltest warnings mysql-test/t/ctype_collate.test: Remove mysqltest warnings mysql-test/t/ctype_cp1250_ch.test: Drop used tables at startup mysql-test/t/ctype_ucs.test: Remove mysqltest warnings mysql-test/t/func_sapdb.test: Remove mysqltest warnings mysql-test/t/func_str.test: Remove mysqltest warnings mysql-test/t/grant.test: Remove mysqltest warnings mysql-test/t/greedy_optimizer.test: Remove mysqltest warnings mysql-test/t/group_min_max.test: Remove mysqltest warnings mysql-test/t/innodb.test: Remove mysqltest warnings mysql-test/t/join.test: Remove mysqltest warnings mysql-test/t/limit.test: Remove mysqltest warnings mysql-test/t/null.test: Remove mysqltest warnings mysql-test/t/select.test: Remove mysqltest warnings mysql-test/t/sp-prelocking.test: Remove mysqltest warnings mysql-test/t/strict.test: Remove mysqltest warnings mysql-test/t/subselect.test: Remove mysqltest warnings mysql-test/t/type_newdecimal.test: Remove mysqltest warnings mysql-test/t/view_grant.test: Remove mysqltest warnings mysys/default.c: Fixed compiler warning mysys/hash.c: Fixed compiler warning mysys/list.c: Fixed compiler warning mysys/mf_iocache.c: Fixed compiler warning mysys/mf_keycache.c: Fixed compiler warning mysys/mf_keycaches.c: Fixed compiler warning mysys/my_alloc.c: Fixed compiler warning mysys/my_dup.c: Fixed compiler warning mysys/my_fopen.c: Fixed compiler warning mysys/my_fstream.c: Fixed compiler warning mysys/my_getwd.c: Fixed compiler warning mysys/my_handler.c: Fixed compiler warning Added missing enums in switch mysys/my_lib.c: Fixed compiler warning mysys/my_lread.c: Fixed compiler warning mysys/my_lwrite.c: Fixed compiler warning mysys/my_malloc.c: Fixed compiler warning mysys/my_pread.c: Fixed compiler warning mysys/my_read.c: Fixed compiler warning mysys/my_realloc.c: Fixed compiler warning mysys/my_seek.c: Fixed compiler warning mysys/my_write.c: Fixed compiler warning mysys/safemalloc.c: Fixed compiler warning mysys/thr_lock.c: Fixed compiler warning mysys/tree.c: Fixed compiler warning mysys/typelib.c: Fixed compiler warning ndb/include/logger/LogHandler.hpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/include/ndb_global.h.in: Added LINT_SET_PTR macro to be able to remove some compiler warnings ndb/include/util/InputStream.hpp: Fixed compiler warning ndb/include/util/OutputStream.hpp: Fixed compiler warning ndb/include/util/SimpleProperties.hpp: Fixed compiler warning ndb/src/common/debugger/EventLogger.cpp: remove if on 'signal' as this is a function pointer and is always true ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Add missing enums ndb/src/common/logger/LogHandler.cpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/src/common/portlib/NdbMutex.c: Fixed compiler warning ndb/src/common/portlib/NdbThread.c: Fixed compiler warning ndb/src/common/transporter/Transporter.cpp: Swapped arguments to remove compiler warnings ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warning ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warning ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp: Fixed compiler warning ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Added missing enums ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.hpp: Fixed compiler warning ndb/src/kernel/error/ndbd_exit_codes.c: Fixed compiler warning ndb/src/kernel/vm/TransporterCallback.cpp: Fixed compiler warning ndb/src/mgmapi/mgmapi.cpp: Fixed compiler warning ndb/src/mgmclient/CommandInterpreter.cpp: Fixed compiler warning ndb/src/mgmsrv/MgmtSrvr.cpp: Fixed compiler warning ndb/src/mgmsrv/Services.cpp: Fixed compiler warning ndb/src/ndbapi/ClusterMgr.cpp: Fixed compiler warning ndb/src/ndbapi/DictCache.cpp: Fixed compiler warning ndb/src/ndbapi/Ndb.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationDefine.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationInt.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationSearch.cpp: Fixed compiler warning ndb/src/ndbapi/NdbTransaction.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbif.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbinit.cpp: Fixed compiler warning ndb/src/ndbapi/ndb_cluster_connection.cpp: Fixed compiler warning ndb/tools/drop_index.cpp: Fixed compiler warning ndb/tools/drop_tab.cpp: Fixed compiler warning ndb/tools/ndb_config.cpp: Fixed compiler warning regex/regexec.c: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warning sql/Makefile.am: Fix for bison 1.875, which adds an attribute statement that gcc 4.1.0 can't parse sql/filesort.cc: Fixed compiler warning sql/ha_archive.cc: Fixed compiler warning sql/ha_federated.cc: Fixed compiler warning sql/ha_federated.h: Fixed compiler warning sql/ha_innodb.cc: Fixed compiler warning sql/ha_myisam.cc: Fixed compiler warning sql/ha_myisammrg.cc: Fixed compiler warning sql/ha_ndbcluster.cc: Fixed compiler warning sql/handler.cc: Fixed compiler warning sql/item_cmpfunc.cc: Fixed compiler warning sql/item_subselect.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warning sql/mysqld.cc: Fixed compiler warning sql/net_serv.cc: Fixed compiler warning sql/opt_range.cc: Fixed compiler warning Formated DBUG statements to be as rest of code sql/slave.cc: Fixed compiler warning sql/sql_acl.cc: Fixed compiler warning sql/sql_cache.cc: Fixed compiler warning Fixed bug in query cache when used with DBUG traceing sql/sql_class.cc: Fixed compiler warning sql/sql_class.h: Fixed compiler warning sql/sql_delete.cc: Fixed compiler warning sql/sql_parse.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_prepare.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_repl.cc: Fixed compiler warning sql/sql_select.cc: Fixed compiler warning sql/sql_update.cc: Fixed compiler warning sql/sql_view.cc: Fixed compiler warning sql/strfunc.cc: Fixed compiler warning sql-common/client.c: Fixed compiler warning sql-common/my_time.c: Fixed compiler warning sql/table.cc: Fixed compiler warning sql/tztime.cc: Fixed compiler warning sql/unireg.cc: Fixed compiler warning strings/decimal.c: Fixed compiler warning tests/mysql_client_test.c: Fixed compiler warning vio/viosocket.c: Fixed compiler warning vio/viossl.c: Fixed compiler warning vio/viosslfactories.c: Fixed compiler warning
219 lines
5.3 KiB
C
219 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 */
|
|
|
|
/* my_setwd() and my_getwd() works with intern_filenames !! */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
#include "mysys_err.h"
|
|
#ifdef HAVE_GETWD
|
|
#include <sys/param.h>
|
|
#endif
|
|
#if defined(MSDOS) || defined(__WIN__)
|
|
#include <m_ctype.h>
|
|
#include <dos.h>
|
|
#include <direct.h>
|
|
#endif
|
|
#if defined(OS2)
|
|
#include <direct.h>
|
|
#endif
|
|
|
|
#ifdef __EMX__
|
|
/* chdir2 support also drive change */
|
|
#define chdir _chdir2
|
|
#endif
|
|
|
|
/* Gets current working directory in buff. Directory is allways ended
|
|
with FN_LIBCHAR */
|
|
/* One must pass a buffer to my_getwd. One can allways use
|
|
curr_dir[] */
|
|
|
|
int my_getwd(my_string buf, uint size, myf MyFlags)
|
|
{
|
|
my_string pos;
|
|
DBUG_ENTER("my_getwd");
|
|
DBUG_PRINT("my",("buf: 0x%lx size: %d MyFlags %d", (long) buf,size,MyFlags));
|
|
|
|
#if ! defined(MSDOS)
|
|
if (curr_dir[0]) /* Current pos is saved here */
|
|
VOID(strmake(buf,&curr_dir[0],size-1));
|
|
else
|
|
#endif
|
|
{
|
|
#if defined(HAVE_GETCWD)
|
|
if (!getcwd(buf,size-2) && MyFlags & MY_WME)
|
|
{
|
|
my_errno=errno;
|
|
my_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno);
|
|
return(-1);
|
|
}
|
|
#elif defined(HAVE_GETWD)
|
|
{
|
|
char pathname[MAXPATHLEN];
|
|
getwd(pathname);
|
|
strmake(buf,pathname,size-1);
|
|
}
|
|
#elif defined(VMS)
|
|
if (!getcwd(buf,size-2,1) && MyFlags & MY_WME)
|
|
{
|
|
my_errno=errno;
|
|
my_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno);
|
|
return(-1);
|
|
}
|
|
intern_filename(buf,buf);
|
|
#else
|
|
#error "No way to get current directory"
|
|
#endif
|
|
if (*((pos=strend(buf))-1) != FN_LIBCHAR) /* End with FN_LIBCHAR */
|
|
{
|
|
pos[0]= FN_LIBCHAR;
|
|
pos[1]=0;
|
|
}
|
|
(void) strmake(&curr_dir[0],buf,(size_s) (FN_REFLEN-1));
|
|
}
|
|
DBUG_RETURN(0);
|
|
} /* my_getwd */
|
|
|
|
|
|
/* Set new working directory */
|
|
|
|
int my_setwd(const char *dir, myf MyFlags)
|
|
{
|
|
int res;
|
|
size_s length;
|
|
my_string start,pos;
|
|
#if defined(VMS) || defined(MSDOS) || defined(OS2)
|
|
char buff[FN_REFLEN];
|
|
#endif
|
|
DBUG_ENTER("my_setwd");
|
|
DBUG_PRINT("my",("dir: '%s' MyFlags %d", dir, MyFlags));
|
|
|
|
start=(my_string) dir;
|
|
#if defined(MSDOS) || defined(OS2) /* OS2/MSDOS chdir can't change drive */
|
|
#if !defined(_DDL) && !defined(WIN32)
|
|
if ((pos=(char*) strchr(dir,FN_DEVCHAR)) != 0)
|
|
{
|
|
uint drive,drives;
|
|
|
|
pos++; /* Skip FN_DEVCHAR */
|
|
drive=(uint) (my_toupper(&my_charset_latin1,dir[0])-'A'+1);
|
|
drives= (uint) -1;
|
|
if ((pos-(byte*) dir) == 2 && drive > 0 && drive < 32)
|
|
{
|
|
#ifdef OS2
|
|
_chdrive(drive);
|
|
drives = _getdrive();
|
|
#else
|
|
_dos_setdrive(drive,&drives);
|
|
_dos_getdrive(&drives);
|
|
#endif
|
|
}
|
|
if (drive != drives)
|
|
{
|
|
*pos='\0'; /* Dir is now only drive */
|
|
my_errno=errno;
|
|
my_error(EE_SETWD,MYF(ME_BELL+ME_WAITTANG),dir,ENOENT);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
dir=pos; /* drive changed, change now path */
|
|
}
|
|
#endif
|
|
if (*((pos=strend(dir)-1)) == FN_LIBCHAR && pos != dir)
|
|
{
|
|
strmov(buff,dir)[-1]=0; /* Remove last '/' */
|
|
dir=buff;
|
|
}
|
|
#endif /* MSDOS*/
|
|
if (! dir[0] || (dir[0] == FN_LIBCHAR && dir[1] == 0))
|
|
dir=FN_ROOTDIR;
|
|
#ifdef VMS
|
|
{
|
|
pos=strmov(buff,dir);
|
|
if (pos[-1] != FN_LIBCHAR)
|
|
{
|
|
pos[0]=FN_LIBCHAR; /* Mark as directory */
|
|
pos[1]=0;
|
|
}
|
|
system_filename(buff,buff); /* Change to VMS format */
|
|
dir=buff;
|
|
}
|
|
#endif /* VMS */
|
|
if ((res=chdir((char*) dir)) != 0)
|
|
{
|
|
my_errno=errno;
|
|
if (MyFlags & MY_WME)
|
|
my_error(EE_SETWD,MYF(ME_BELL+ME_WAITTANG),start,errno);
|
|
}
|
|
else
|
|
{
|
|
if (test_if_hard_path(start))
|
|
{ /* Hard pathname */
|
|
pos=strmake(&curr_dir[0],start,(size_s) FN_REFLEN-1);
|
|
if (pos[-1] != FN_LIBCHAR)
|
|
{
|
|
length=(uint) (pos-(char*) curr_dir);
|
|
curr_dir[length]=FN_LIBCHAR; /* must end with '/' */
|
|
curr_dir[length+1]='\0';
|
|
}
|
|
}
|
|
else
|
|
curr_dir[0]='\0'; /* Don't save name */
|
|
}
|
|
DBUG_RETURN(res);
|
|
} /* my_setwd */
|
|
|
|
|
|
|
|
/* Test if hard pathname */
|
|
/* Returns 1 if dirname is a hard path */
|
|
|
|
int test_if_hard_path(register const char *dir_name)
|
|
{
|
|
if (dir_name[0] == FN_HOMELIB && dir_name[1] == FN_LIBCHAR)
|
|
return (home_dir != NullS && test_if_hard_path(home_dir));
|
|
if (dir_name[0] == FN_LIBCHAR)
|
|
return (TRUE);
|
|
#ifdef FN_DEVCHAR
|
|
return (strchr(dir_name,FN_DEVCHAR) != 0);
|
|
#else
|
|
return FALSE;
|
|
#endif
|
|
} /* test_if_hard_path */
|
|
|
|
|
|
/*
|
|
Test if a name contains an (absolute or relative) path.
|
|
|
|
SYNOPSIS
|
|
has_path()
|
|
name The name to test.
|
|
|
|
RETURN
|
|
TRUE name contains a path.
|
|
FALSE name does not contain a path.
|
|
*/
|
|
|
|
my_bool has_path(const char *name)
|
|
{
|
|
return test(strchr(name, FN_LIBCHAR))
|
|
#if FN_LIBCHAR != '/'
|
|
|| test(strchr(name,'/'))
|
|
#endif
|
|
#ifdef FN_DEVCHAR
|
|
|| test(strchr(name, FN_DEVCHAR))
|
|
#endif
|
|
;
|
|
}
|