mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +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
204 lines
5.7 KiB
C
204 lines
5.7 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 */
|
|
|
|
/* Check that heap-structure is ok */
|
|
|
|
#include "heapdef.h"
|
|
|
|
static int check_one_key(HP_KEYDEF *keydef, uint keynr, ulong records,
|
|
ulong blength, my_bool print_status);
|
|
static int check_one_rb_key(HP_INFO *info, uint keynr, ulong records,
|
|
my_bool print_status);
|
|
|
|
|
|
/*
|
|
Check if keys and rows are ok in a heap table
|
|
|
|
SYNOPSIS
|
|
heap_check_heap()
|
|
info Table handler
|
|
print_status Prints some extra status
|
|
|
|
NOTES
|
|
Doesn't change the state of the table handler
|
|
|
|
RETURN VALUES
|
|
0 ok
|
|
1 error
|
|
*/
|
|
|
|
int heap_check_heap(HP_INFO *info, my_bool print_status)
|
|
{
|
|
int error;
|
|
uint key;
|
|
ulong records=0, deleted=0, pos, next_block;
|
|
HP_SHARE *share=info->s;
|
|
HP_INFO save_info= *info; /* Needed because scan_init */
|
|
DBUG_ENTER("heap_check_heap");
|
|
|
|
for (error=key= 0 ; key < share->keys ; key++)
|
|
{
|
|
if (share->keydef[key].algorithm == HA_KEY_ALG_BTREE)
|
|
error|= check_one_rb_key(info, key, share->records, print_status);
|
|
else
|
|
error|= check_one_key(share->keydef + key, key, share->records,
|
|
share->blength, print_status);
|
|
}
|
|
/*
|
|
This is basicly the same code as in hp_scan, but we repeat it here to
|
|
get shorter DBUG log file.
|
|
*/
|
|
for (pos=next_block= 0 ; ; pos++)
|
|
{
|
|
if (pos < next_block)
|
|
{
|
|
info->current_ptr+= share->block.recbuffer;
|
|
}
|
|
else
|
|
{
|
|
next_block+= share->block.records_in_block;
|
|
if (next_block >= share->records+share->deleted)
|
|
{
|
|
next_block= share->records+share->deleted;
|
|
if (pos >= next_block)
|
|
break; /* End of file */
|
|
}
|
|
}
|
|
hp_find_record(info,pos);
|
|
|
|
if (!info->current_ptr[share->reclength])
|
|
deleted++;
|
|
else
|
|
records++;
|
|
}
|
|
|
|
if (records != share->records || deleted != share->deleted)
|
|
{
|
|
DBUG_PRINT("error",("Found rows: %lu (%lu) deleted %lu (%lu)",
|
|
records, (ulong) share->records,
|
|
deleted, (ulong) share->deleted));
|
|
error= 1;
|
|
}
|
|
*info= save_info;
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
static int check_one_key(HP_KEYDEF *keydef, uint keynr, ulong records,
|
|
ulong blength, my_bool print_status)
|
|
{
|
|
int error;
|
|
ulong i,found,max_links,seek,links;
|
|
ulong rec_link; /* Only used with debugging */
|
|
ulong hash_buckets_found;
|
|
HASH_INFO *hash_info;
|
|
|
|
error=0;
|
|
hash_buckets_found= 0;
|
|
for (i=found=max_links=seek=0 ; i < records ; i++)
|
|
{
|
|
hash_info=hp_find_hash(&keydef->block,i);
|
|
if (hp_mask(hp_rec_hashnr(keydef, hash_info->ptr_to_rec),
|
|
blength,records) == i)
|
|
{
|
|
found++;
|
|
seek++;
|
|
links=1;
|
|
while ((hash_info=hash_info->next_key) && found < records + 1)
|
|
{
|
|
seek+= ++links;
|
|
if ((rec_link = hp_mask(hp_rec_hashnr(keydef, hash_info->ptr_to_rec),
|
|
blength, records))
|
|
!= i)
|
|
{
|
|
DBUG_PRINT("error",
|
|
("Record in wrong link: Link %lu Record: 0x%lx Record-link %lu",
|
|
i, (long) hash_info->ptr_to_rec, rec_link));
|
|
error=1;
|
|
}
|
|
else
|
|
found++;
|
|
}
|
|
if (links > max_links) max_links=links;
|
|
hash_buckets_found++;
|
|
}
|
|
}
|
|
if (found != records)
|
|
{
|
|
DBUG_PRINT("error",("Found %ld of %ld records", found, records));
|
|
error=1;
|
|
}
|
|
if (keydef->hash_buckets != hash_buckets_found)
|
|
{
|
|
DBUG_PRINT("error",("Found %ld buckets, stats shows %ld buckets",
|
|
hash_buckets_found, (long) keydef->hash_buckets));
|
|
error=1;
|
|
}
|
|
DBUG_PRINT("info",
|
|
("records: %ld seeks: %lu max links: %lu hitrate: %.2f "
|
|
"buckets: %lu",
|
|
records,seek,max_links,
|
|
(float) seek / (float) (records ? records : 1),
|
|
hash_buckets_found));
|
|
if (print_status)
|
|
printf("Key: %d records: %ld seeks: %lu max links: %lu "
|
|
"hitrate: %.2f buckets: %lu\n",
|
|
keynr, records, seek, max_links,
|
|
(float) seek / (float) (records ? records : 1),
|
|
hash_buckets_found);
|
|
return error;
|
|
}
|
|
|
|
static int check_one_rb_key(HP_INFO *info, uint keynr, ulong records,
|
|
my_bool print_status)
|
|
{
|
|
HP_KEYDEF *keydef= info->s->keydef + keynr;
|
|
int error= 0;
|
|
ulong found= 0;
|
|
byte *key, *recpos;
|
|
uint key_length;
|
|
uint not_used[2];
|
|
|
|
if ((key= tree_search_edge(&keydef->rb_tree, info->parents,
|
|
&info->last_pos, offsetof(TREE_ELEMENT, left))))
|
|
{
|
|
do
|
|
{
|
|
memcpy(&recpos, key + (*keydef->get_key_length)(keydef,key), sizeof(byte*));
|
|
key_length= hp_rb_make_key(keydef, info->recbuf, recpos, 0);
|
|
if (ha_key_cmp(keydef->seg, (uchar*) info->recbuf, (uchar*) key,
|
|
key_length, SEARCH_FIND | SEARCH_SAME, not_used))
|
|
{
|
|
error= 1;
|
|
DBUG_PRINT("error",("Record in wrong link: key: %u Record: 0x%lx\n",
|
|
keynr, (long) recpos));
|
|
}
|
|
else
|
|
found++;
|
|
key= tree_search_next(&keydef->rb_tree, &info->last_pos,
|
|
offsetof(TREE_ELEMENT, left),
|
|
offsetof(TREE_ELEMENT, right));
|
|
} while (key);
|
|
}
|
|
if (found != records)
|
|
{
|
|
DBUG_PRINT("error",("Found %lu of %lu records", found, records));
|
|
error= 1;
|
|
}
|
|
if (print_status)
|
|
printf("Key: %d records: %ld\n", keynr, records);
|
|
return error;
|
|
}
|