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
160 lines
5 KiB
C
160 lines
5 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 */
|
|
|
|
/* Read and write key blocks */
|
|
|
|
#include "myisamdef.h"
|
|
|
|
/* Fetch a key-page in memory */
|
|
|
|
uchar *_mi_fetch_keypage(register MI_INFO *info, MI_KEYDEF *keyinfo,
|
|
my_off_t page, int level,
|
|
uchar *buff, int return_buffer)
|
|
{
|
|
uchar *tmp;
|
|
uint page_size;
|
|
DBUG_ENTER("_mi_fetch_keypage");
|
|
DBUG_PRINT("enter",("page: %ld", (long) page));
|
|
|
|
tmp=(uchar*) key_cache_read(info->s->key_cache,
|
|
info->s->kfile, page, level, (byte*) buff,
|
|
(uint) keyinfo->block_length,
|
|
(uint) keyinfo->block_length,
|
|
return_buffer);
|
|
if (tmp == info->buff)
|
|
info->buff_used=1;
|
|
else if (!tmp)
|
|
{
|
|
DBUG_PRINT("error",("Got errno: %d from key_cache_read",my_errno));
|
|
info->last_keypage=HA_OFFSET_ERROR;
|
|
mi_print_error(info->s, HA_ERR_CRASHED);
|
|
my_errno=HA_ERR_CRASHED;
|
|
DBUG_RETURN(0);
|
|
}
|
|
info->last_keypage=page;
|
|
page_size=mi_getint(tmp);
|
|
if (page_size < 4 || page_size > keyinfo->block_length)
|
|
{
|
|
DBUG_PRINT("error",("page %lu had wrong page length: %u",
|
|
(ulong) page, page_size));
|
|
DBUG_DUMP("page", (char*) tmp, keyinfo->block_length);
|
|
info->last_keypage = HA_OFFSET_ERROR;
|
|
mi_print_error(info->s, HA_ERR_CRASHED);
|
|
my_errno = HA_ERR_CRASHED;
|
|
tmp = 0;
|
|
}
|
|
DBUG_RETURN(tmp);
|
|
} /* _mi_fetch_keypage */
|
|
|
|
|
|
/* Write a key-page on disk */
|
|
|
|
int _mi_write_keypage(register MI_INFO *info, register MI_KEYDEF *keyinfo,
|
|
my_off_t page, int level, uchar *buff)
|
|
{
|
|
reg3 uint length;
|
|
DBUG_ENTER("_mi_write_keypage");
|
|
|
|
#ifndef FAST /* Safety check */
|
|
if (page < info->s->base.keystart ||
|
|
page+keyinfo->block_length > info->state->key_file_length ||
|
|
(page & (MI_MIN_KEY_BLOCK_LENGTH-1)))
|
|
{
|
|
DBUG_PRINT("error",("Trying to write inside key status region: key_start: %lu length: %lu page: %lu",
|
|
(long) info->s->base.keystart,
|
|
(long) info->state->key_file_length,
|
|
(long) page));
|
|
my_errno=EINVAL;
|
|
DBUG_RETURN((-1));
|
|
}
|
|
DBUG_PRINT("page",("write page at: %lu",(long) page));
|
|
DBUG_DUMP("buff",(byte*) buff,mi_getint(buff));
|
|
#endif
|
|
|
|
if ((length=keyinfo->block_length) > IO_SIZE*2 &&
|
|
info->state->key_file_length != page+length)
|
|
length= ((mi_getint(buff)+IO_SIZE-1) & (uint) ~(IO_SIZE-1));
|
|
#ifdef HAVE_purify
|
|
{
|
|
length=mi_getint(buff);
|
|
bzero((byte*) buff+length,keyinfo->block_length-length);
|
|
length=keyinfo->block_length;
|
|
}
|
|
#endif
|
|
DBUG_RETURN((key_cache_write(info->s->key_cache,
|
|
info->s->kfile,page, level, (byte*) buff,length,
|
|
(uint) keyinfo->block_length,
|
|
(int) ((info->lock_type != F_UNLCK) ||
|
|
info->s->delay_key_write))));
|
|
} /* mi_write_keypage */
|
|
|
|
|
|
/* Remove page from disk */
|
|
|
|
int _mi_dispose(register MI_INFO *info, MI_KEYDEF *keyinfo, my_off_t pos,
|
|
int level)
|
|
{
|
|
my_off_t old_link;
|
|
char buff[8];
|
|
DBUG_ENTER("_mi_dispose");
|
|
DBUG_PRINT("enter",("pos: %ld", (long) pos));
|
|
|
|
old_link=info->s->state.key_del[keyinfo->block_size];
|
|
info->s->state.key_del[keyinfo->block_size]=pos;
|
|
mi_sizestore(buff,old_link);
|
|
info->s->state.changed|= STATE_NOT_SORTED_PAGES;
|
|
DBUG_RETURN(key_cache_write(info->s->key_cache,
|
|
info->s->kfile, pos , level, buff,
|
|
sizeof(buff),
|
|
(uint) keyinfo->block_length,
|
|
(int) (info->lock_type != F_UNLCK)));
|
|
} /* _mi_dispose */
|
|
|
|
|
|
/* Make new page on disk */
|
|
|
|
my_off_t _mi_new(register MI_INFO *info, MI_KEYDEF *keyinfo, int level)
|
|
{
|
|
my_off_t pos;
|
|
char buff[8];
|
|
DBUG_ENTER("_mi_new");
|
|
|
|
if ((pos=info->s->state.key_del[keyinfo->block_size]) == HA_OFFSET_ERROR)
|
|
{
|
|
if (info->state->key_file_length >=
|
|
info->s->base.max_key_file_length - keyinfo->block_length)
|
|
{
|
|
my_errno=HA_ERR_INDEX_FILE_FULL;
|
|
DBUG_RETURN(HA_OFFSET_ERROR);
|
|
}
|
|
pos=info->state->key_file_length;
|
|
info->state->key_file_length+= keyinfo->block_length;
|
|
}
|
|
else
|
|
{
|
|
if (!key_cache_read(info->s->key_cache,
|
|
info->s->kfile, pos, level,
|
|
buff,
|
|
(uint) sizeof(buff),
|
|
(uint) keyinfo->block_length,0))
|
|
pos= HA_OFFSET_ERROR;
|
|
else
|
|
info->s->state.key_del[keyinfo->block_size]=mi_sizekorr(buff);
|
|
}
|
|
info->s->state.changed|= STATE_NOT_SORTED_PAGES;
|
|
DBUG_PRINT("exit",("Pos: %ld",(long) pos));
|
|
DBUG_RETURN(pos);
|
|
} /* _mi_new */
|