mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +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
223 lines
5.8 KiB
C
223 lines
5.8 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 "my_static.h"
|
|
#include <errno.h>
|
|
#include "mysys_err.h"
|
|
|
|
static void make_ftype(my_string to,int flag);
|
|
|
|
/*
|
|
Open a file as stream
|
|
|
|
SYNOPSIS
|
|
my_fopen()
|
|
FileName Path-name of file
|
|
Flags Read | write | append | trunc (like for open())
|
|
MyFlags Flags for handling errors
|
|
|
|
RETURN
|
|
0 Error
|
|
# File handler
|
|
*/
|
|
|
|
FILE *my_fopen(const char *filename, int flags, myf MyFlags)
|
|
{
|
|
FILE *fd;
|
|
char type[5];
|
|
DBUG_ENTER("my_fopen");
|
|
DBUG_PRINT("my",("Name: '%s' flags: %d MyFlags: %d",
|
|
filename, flags, MyFlags));
|
|
/*
|
|
if we are not creating, then we need to use my_access to make sure
|
|
the file exists since Windows doesn't handle files like "com1.sym"
|
|
very well
|
|
*/
|
|
#ifdef __WIN__
|
|
if (check_if_legal_filename(filename))
|
|
{
|
|
errno= EACCES;
|
|
fd= 0;
|
|
}
|
|
else
|
|
#endif
|
|
{
|
|
make_ftype(type,flags);
|
|
fd = fopen(filename, type);
|
|
}
|
|
|
|
if (fd != 0)
|
|
{
|
|
/*
|
|
The test works if MY_NFILE < 128. The problem is that fileno() is char
|
|
on some OS (SUNOS). Actually the filename save isn't that important
|
|
so we can ignore if this doesn't work.
|
|
*/
|
|
if ((uint) fileno(fd) >= my_file_limit)
|
|
{
|
|
thread_safe_increment(my_stream_opened,&THR_LOCK_open);
|
|
DBUG_RETURN(fd); /* safeguard */
|
|
}
|
|
pthread_mutex_lock(&THR_LOCK_open);
|
|
if ((my_file_info[fileno(fd)].name = (char*)
|
|
my_strdup(filename,MyFlags)))
|
|
{
|
|
my_stream_opened++;
|
|
my_file_info[fileno(fd)].type = STREAM_BY_FOPEN;
|
|
pthread_mutex_unlock(&THR_LOCK_open);
|
|
DBUG_PRINT("exit",("stream: 0x%lx", (long) fd));
|
|
DBUG_RETURN(fd);
|
|
}
|
|
pthread_mutex_unlock(&THR_LOCK_open);
|
|
(void) my_fclose(fd,MyFlags);
|
|
my_errno=ENOMEM;
|
|
}
|
|
else
|
|
my_errno=errno;
|
|
DBUG_PRINT("error",("Got error %d on open",my_errno));
|
|
if (MyFlags & (MY_FFNF | MY_FAE | MY_WME))
|
|
my_error((flags & O_RDONLY) || (flags == O_RDONLY ) ? EE_FILENOTFOUND :
|
|
EE_CANTCREATEFILE,
|
|
MYF(ME_BELL+ME_WAITTANG), filename, my_errno);
|
|
DBUG_RETURN((FILE*) 0);
|
|
} /* my_fopen */
|
|
|
|
|
|
/* Close a stream */
|
|
|
|
int my_fclose(FILE *fd, myf MyFlags)
|
|
{
|
|
int err,file;
|
|
DBUG_ENTER("my_fclose");
|
|
DBUG_PRINT("my",("stream: 0x%lx MyFlags: %d", (long) fd, MyFlags));
|
|
|
|
pthread_mutex_lock(&THR_LOCK_open);
|
|
file=fileno(fd);
|
|
if ((err = fclose(fd)) < 0)
|
|
{
|
|
my_errno=errno;
|
|
if (MyFlags & (MY_FAE | MY_WME))
|
|
my_error(EE_BADCLOSE, MYF(ME_BELL+ME_WAITTANG),
|
|
my_filename(file),errno);
|
|
}
|
|
else
|
|
my_stream_opened--;
|
|
if ((uint) file < my_file_limit && my_file_info[file].type != UNOPEN)
|
|
{
|
|
my_file_info[file].type = UNOPEN;
|
|
my_free(my_file_info[file].name, MYF(MY_ALLOW_ZERO_PTR));
|
|
}
|
|
pthread_mutex_unlock(&THR_LOCK_open);
|
|
DBUG_RETURN(err);
|
|
} /* my_fclose */
|
|
|
|
|
|
/* Make a stream out of a file handle */
|
|
/* Name may be 0 */
|
|
|
|
FILE *my_fdopen(File Filedes, const char *name, int Flags, myf MyFlags)
|
|
{
|
|
FILE *fd;
|
|
char type[5];
|
|
DBUG_ENTER("my_fdopen");
|
|
DBUG_PRINT("my",("Fd: %d Flags: %d MyFlags: %d",
|
|
Filedes, Flags, MyFlags));
|
|
|
|
make_ftype(type,Flags);
|
|
if ((fd = fdopen(Filedes, type)) == 0)
|
|
{
|
|
my_errno=errno;
|
|
if (MyFlags & (MY_FAE | MY_WME))
|
|
my_error(EE_CANT_OPEN_STREAM, MYF(ME_BELL+ME_WAITTANG),errno);
|
|
}
|
|
else
|
|
{
|
|
pthread_mutex_lock(&THR_LOCK_open);
|
|
my_stream_opened++;
|
|
if ((uint) Filedes < (uint) my_file_limit)
|
|
{
|
|
if (my_file_info[Filedes].type != UNOPEN)
|
|
{
|
|
my_file_opened--; /* File is opened with my_open ! */
|
|
}
|
|
else
|
|
{
|
|
my_file_info[Filedes].name= my_strdup(name,MyFlags);
|
|
}
|
|
my_file_info[Filedes].type = STREAM_BY_FDOPEN;
|
|
}
|
|
pthread_mutex_unlock(&THR_LOCK_open);
|
|
}
|
|
|
|
DBUG_PRINT("exit",("stream: 0x%lx", (long) fd));
|
|
DBUG_RETURN(fd);
|
|
} /* my_fdopen */
|
|
|
|
|
|
/*
|
|
Make a fopen() typestring from a open() type bitmap
|
|
|
|
SYNOPSIS
|
|
make_ftype()
|
|
to String for fopen() is stored here
|
|
flag Flag used by open()
|
|
|
|
IMPLEMENTATION
|
|
This routine attempts to find the best possible match
|
|
between a numeric option and a string option that could be
|
|
fed to fopen. There is not a 1 to 1 mapping between the two.
|
|
|
|
NOTE
|
|
On Unix, O_RDONLY is usually 0
|
|
|
|
MAPPING
|
|
r == O_RDONLY
|
|
w == O_WRONLY|O_TRUNC|O_CREAT
|
|
a == O_WRONLY|O_APPEND|O_CREAT
|
|
r+ == O_RDWR
|
|
w+ == O_RDWR|O_TRUNC|O_CREAT
|
|
a+ == O_RDWR|O_APPEND|O_CREAT
|
|
*/
|
|
|
|
static void make_ftype(register my_string to, register int flag)
|
|
{
|
|
/* check some possible invalid combinations */
|
|
DBUG_ASSERT((flag & (O_TRUNC | O_APPEND)) != (O_TRUNC | O_APPEND));
|
|
DBUG_ASSERT((flag & (O_WRONLY | O_RDWR)) != (O_WRONLY | O_RDWR));
|
|
|
|
if ((flag & (O_RDONLY|O_WRONLY)) == O_WRONLY)
|
|
*to++= (flag & O_APPEND) ? 'a' : 'w';
|
|
else if (flag & O_RDWR)
|
|
{
|
|
/* Add '+' after theese */
|
|
if (flag & (O_TRUNC | O_CREAT))
|
|
*to++= 'w';
|
|
else if (flag & O_APPEND)
|
|
*to++= 'a';
|
|
else
|
|
*to++= 'r';
|
|
*to++= '+';
|
|
}
|
|
else
|
|
*to++= 'r';
|
|
|
|
#if FILE_BINARY /* If we have binary-files */
|
|
if (flag & FILE_BINARY)
|
|
*to++='b';
|
|
#endif
|
|
*to='\0';
|
|
} /* make_ftype */
|