mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 06:22:28 +01:00
5c0dc1ace8
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1 BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667: Auto merged BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387: Auto merged BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd: Auto merged BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc: Auto merged BitKeeper/deleted/.del-Makefile~b293ae88e4394490: Auto merged BitKeeper/deleted/.del-Makefile~e0b7d67078f0fae0: Auto merged BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62: Auto merged BitKeeper/etc/config: Auto merged config/ac-macros/ha_ndbcluster.m4: Auto merged include/my_global.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged BitKeeper/deleted/.del-testGrep.cpp~2106eb0a6bf2a1b5: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysys/Makefile.am: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/field.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_berkeley.h: Auto merged sql/ha_heap.h: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item_subselect.cc: Auto merged sql/lex.h: Auto merged sql/lock.cc: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/sp.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_help.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged storage/heap/hp_delete.c: Auto merged storage/innobase/btr/btr0pcur.c: Auto merged storage/innobase/btr/btr0sea.c: Auto merged storage/innobase/include/read0read.h: Auto merged storage/innobase/include/srv0srv.h: Auto merged storage/innobase/include/trx0trx.h: Auto merged storage/innobase/include/univ.i: Auto merged storage/innobase/lock/lock0lock.c: Auto merged storage/innobase/read/read0read.c: Auto merged storage/innobase/row/row0ins.c: Auto merged storage/innobase/row/row0sel.c: Auto merged storage/innobase/row/row0umod.c: Auto merged storage/innobase/row/row0upd.c: Auto merged storage/innobase/srv/srv0srv.c: Auto merged storage/innobase/srv/srv0start.c: Auto merged storage/innobase/trx/trx0trx.c: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisammrg/myrg_static.c: Auto merged storage/ndb/include/kernel/AttributeDescriptor.hpp: Auto merged storage/ndb/include/kernel/BlockNumbers.h: Auto merged storage/ndb/include/kernel/GlobalSignalNumbers.h: Auto merged storage/ndb/include/kernel/kernel_types.h: Auto merged storage/ndb/include/kernel/signaldata/AlterTable.hpp: Auto merged storage/ndb/include/ndbapi/NdbDictionary.hpp: Auto merged storage/ndb/include/portlib/NdbTCP.h: Auto merged storage/ndb/src/common/debugger/BlockNames.cpp: Auto merged storage/ndb/src/common/logger/LogHandler.cpp: Auto merged storage/ndb/src/common/portlib/NdbTCP.cpp: Auto merged storage/ndb/src/common/portlib/win32/NdbTCP.c: Auto merged storage/ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged storage/ndb/src/kernel/Makefile.am: Auto merged storage/ndb/src/kernel/SimBlockList.cpp: Auto merged storage/ndb/src/kernel/blocks/Makefile.am: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/ndbapi/DictCache.cpp: Auto merged storage/ndb/src/ndbapi/DictCache.hpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.cpp: Auto merged storage/ndb/tools/Makefile.am: Auto merged storage/ndb/tools/ndb_condig.cpp: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-ucs2.c: Auto merged support-files/mysql.spec.sh: Auto merged VC++Files/sql/mysqld.dsp: Manual 5.0 - 5.1 merge configure.in: Manual 5.0 - 5.1 merge sql/mysql_priv.h: Manual 5.0 - 5.1 merge sql/share/errmsg.txt: Manual 5.0 - 5.1 merge sql/sql_base.cc: Manual 5.0 - 5.1 merge sql/sql_prepare.cc: Manual 5.0 - 5.1 merge storage/ndb/src/common/util/version.c: Manual 5.0 - 5.1 merge storage/ndb/src/kernel/blocks/dblqh/Makefile.am: Manual 5.0 - 5.1 merge
202 lines
5.7 KiB
C
202 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 */
|
|
|
|
/* 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: %lx record: 0x%lx",info,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 */
|
|
|
|
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);
|
|
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",
|
|
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);
|
|
}
|