mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 02:51:44 +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
206 lines
5.8 KiB
C
206 lines
5.8 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 */
|
|
|
|
/* remove current record in heap-database */
|
|
|
|
#include "heapdef.h"
|
|
|
|
int heap_delete(HP_INFO *info, const byte *record)
|
|
{
|
|
byte *pos;
|
|
HP_SHARE *share=info->s;
|
|
HP_KEYDEF *keydef, *end, *p_lastinx;
|
|
DBUG_ENTER("heap_delete");
|
|
DBUG_PRINT("enter",("info: 0x%lx record: 0x%lx", (long) info, (long) record));
|
|
|
|
test_active(info);
|
|
|
|
if (info->opt_flag & READ_CHECK_USED && hp_rectest(info,record))
|
|
DBUG_RETURN(my_errno); /* Record changed */
|
|
share->changed=1;
|
|
|
|
if ( --(share->records) < share->blength >> 1) share->blength>>=1;
|
|
pos=info->current_ptr;
|
|
|
|
p_lastinx = share->keydef + info->lastinx;
|
|
for (keydef = share->keydef, end = keydef + share->keys; keydef < end;
|
|
keydef++)
|
|
{
|
|
if ((*keydef->delete_key)(info, keydef, record, pos, keydef == p_lastinx))
|
|
goto err;
|
|
}
|
|
|
|
info->update=HA_STATE_DELETED;
|
|
*((byte**) pos)=share->del_link;
|
|
share->del_link=pos;
|
|
pos[share->reclength]=0; /* Record deleted */
|
|
share->deleted++;
|
|
info->current_hash_ptr=0;
|
|
#if !defined(DBUG_OFF) && defined(EXTRA_HEAP_DEBUG)
|
|
DBUG_EXECUTE("check_heap",heap_check_heap(info, 0););
|
|
#endif
|
|
|
|
DBUG_RETURN(0);
|
|
err:
|
|
if (++(share->records) == share->blength)
|
|
share->blength+= share->blength;
|
|
DBUG_RETURN(my_errno);
|
|
}
|
|
|
|
|
|
/*
|
|
Remove one key from rb-tree
|
|
*/
|
|
|
|
int hp_rb_delete_key(HP_INFO *info, register HP_KEYDEF *keyinfo,
|
|
const byte *record, byte *recpos, int flag)
|
|
{
|
|
heap_rb_param custom_arg;
|
|
uint old_allocated;
|
|
int res;
|
|
|
|
if (flag)
|
|
{
|
|
info->last_pos= NULL; /* For heap_rnext/heap_rprev */
|
|
info->lastkey_len= 0;
|
|
}
|
|
|
|
custom_arg.keyseg= keyinfo->seg;
|
|
custom_arg.key_length= hp_rb_make_key(keyinfo, info->recbuf, record, recpos);
|
|
custom_arg.search_flag= SEARCH_SAME;
|
|
old_allocated= keyinfo->rb_tree.allocated;
|
|
res= tree_delete(&keyinfo->rb_tree, info->recbuf, custom_arg.key_length,
|
|
&custom_arg);
|
|
info->s->index_length-= (old_allocated - keyinfo->rb_tree.allocated);
|
|
return res;
|
|
}
|
|
|
|
|
|
/*
|
|
Remove one key from hash-table
|
|
|
|
SYNPOSIS
|
|
hp_delete_key()
|
|
info Hash handler
|
|
keyinfo key definition of key that we want to delete
|
|
record row data to be deleted
|
|
recpos Pointer to heap record in memory
|
|
flag Is set if we want's to correct info->current_ptr
|
|
|
|
RETURN
|
|
0 Ok
|
|
other Error code
|
|
*/
|
|
|
|
int hp_delete_key(HP_INFO *info, register HP_KEYDEF *keyinfo,
|
|
const byte *record, byte *recpos, int flag)
|
|
{
|
|
ulong blength,pos2,pos_hashnr,lastpos_hashnr;
|
|
HASH_INFO *lastpos,*gpos,*pos,*pos3,*empty,*last_ptr;
|
|
HP_SHARE *share=info->s;
|
|
DBUG_ENTER("hp_delete_key");
|
|
|
|
blength=share->blength;
|
|
if (share->records+1 == blength)
|
|
blength+= blength;
|
|
lastpos=hp_find_hash(&keyinfo->block,share->records);
|
|
last_ptr=0;
|
|
|
|
/* Search after record with key */
|
|
pos= hp_find_hash(&keyinfo->block,
|
|
hp_mask(hp_rec_hashnr(keyinfo, record), blength,
|
|
share->records + 1));
|
|
gpos = pos3 = 0;
|
|
|
|
while (pos->ptr_to_rec != recpos)
|
|
{
|
|
if (flag && !hp_rec_key_cmp(keyinfo, record, pos->ptr_to_rec, 0))
|
|
last_ptr=pos; /* Previous same key */
|
|
gpos=pos;
|
|
if (!(pos=pos->next_key))
|
|
{
|
|
DBUG_RETURN(my_errno=HA_ERR_CRASHED); /* This shouldn't happend */
|
|
}
|
|
}
|
|
|
|
/* Remove link to record */
|
|
|
|
if (flag)
|
|
{
|
|
/* Save for heap_rnext/heap_rprev */
|
|
info->current_hash_ptr=last_ptr;
|
|
info->current_ptr = last_ptr ? last_ptr->ptr_to_rec : 0;
|
|
DBUG_PRINT("info",("Corrected current_ptr to point at: 0x%lx",
|
|
(long) info->current_ptr));
|
|
}
|
|
empty=pos;
|
|
if (gpos)
|
|
gpos->next_key=pos->next_key; /* unlink current ptr */
|
|
else if (pos->next_key)
|
|
{
|
|
empty=pos->next_key;
|
|
pos->ptr_to_rec=empty->ptr_to_rec;
|
|
pos->next_key=empty->next_key;
|
|
}
|
|
else
|
|
keyinfo->hash_buckets--;
|
|
|
|
if (empty == lastpos) /* deleted last hash key */
|
|
DBUG_RETURN (0);
|
|
|
|
/* Move the last key (lastpos) */
|
|
lastpos_hashnr = hp_rec_hashnr(keyinfo, lastpos->ptr_to_rec);
|
|
/* pos is where lastpos should be */
|
|
pos=hp_find_hash(&keyinfo->block, hp_mask(lastpos_hashnr, share->blength,
|
|
share->records));
|
|
if (pos == empty) /* Move to empty position. */
|
|
{
|
|
empty[0]=lastpos[0];
|
|
DBUG_RETURN(0);
|
|
}
|
|
pos_hashnr = hp_rec_hashnr(keyinfo, pos->ptr_to_rec);
|
|
/* pos3 is where the pos should be */
|
|
pos3= hp_find_hash(&keyinfo->block,
|
|
hp_mask(pos_hashnr, share->blength, share->records));
|
|
if (pos != pos3)
|
|
{ /* pos is on wrong posit */
|
|
empty[0]=pos[0]; /* Save it here */
|
|
pos[0]=lastpos[0]; /* This shold be here */
|
|
hp_movelink(pos, pos3, empty); /* Fix link to pos */
|
|
DBUG_RETURN(0);
|
|
}
|
|
pos2= hp_mask(lastpos_hashnr, blength, share->records + 1);
|
|
if (pos2 == hp_mask(pos_hashnr, blength, share->records + 1))
|
|
{ /* Identical key-positions */
|
|
if (pos2 != share->records)
|
|
{
|
|
empty[0]=lastpos[0];
|
|
hp_movelink(lastpos, pos, empty);
|
|
DBUG_RETURN(0);
|
|
}
|
|
pos3= pos; /* Link pos->next after lastpos */
|
|
}
|
|
else
|
|
{
|
|
pos3= 0; /* Different positions merge */
|
|
keyinfo->hash_buckets--;
|
|
}
|
|
|
|
empty[0]=lastpos[0];
|
|
hp_movelink(pos3, empty, pos->next_key);
|
|
pos->next_key=empty;
|
|
DBUG_RETURN(0);
|
|
}
|