mirror of
https://github.com/MariaDB/server.git
synced 2025-10-30 04:26:45 +03:00
85213f6235
value" error even though the value was correct): a C function in my_getopt.c was taking bool* in parameter and was called from C++ sql_plugin.cc, but on some Mac OS X sizeof(bool) is 1 in C and 4 in C++, giving funny mismatches. Fixed, all other occurences of bool in C are removed, future ones are blocked by a "C-bool-catcher" in my_global.h (use my_bool). client/mysqldump.c: my_bool for C client/mysqltest.c: my_bool for C extra/replace.c: my_bool for C include/my_getopt.h: my_bool for C include/my_global.h: Prevent people from using bool in C, it causes real bugs. include/my_sys.h: my_bool for C include/my_time.h: my_bool for C include/thr_lock.h: my_bool for C libmysql/libmysql.c: my_bool for C mysys/charset.c: my_bool for C mysys/my_getopt.c: my_bool for C mysys/queues.c: my_bool for C mysys/thr_lock.c: my_bool for C regex/reginit.c: my_bool for C sql/set_var.cc: C functions use my_bool so we must use my_bool too. sql/sql_plugin.cc: C functions use my_bool so we must use my_bool too. This fixes a real observed bug of Maria, because on some Mac OS X, sizeof(bool) is 1 in C and 4 in C++, so the bool* does wrong. Removing useless line. storage/heap/hp_update.c: my_bool for C storage/myisam/mi_check.c: my_bool for C storage/myisam/mi_dynrec.c: my_bool for C storage/myisam/mi_search.c: my_bool for C storage/myisam/mi_update.c: my_bool for C storage/myisam/mi_write.c: my_bool for C storage/myisam/myisamdef.h: my_bool for C storage/myisam/myisamlog.c: my_bool for C storage/myisam/myisampack.c: my_bool for C tests/mysql_client_test.c: my_bool for C unittest/mysys/bitmap-t.c: my_bool for C vio/viosslfactories.c: my_bool for C
89 lines
2.8 KiB
C
89 lines
2.8 KiB
C
/* Copyright (C) 2000-2002, 2004-2005 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; version 2 of the License.
|
|
|
|
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 */
|
|
|
|
/* Update current record in heap-database */
|
|
|
|
#include "heapdef.h"
|
|
|
|
int heap_update(HP_INFO *info, const uchar *old, const uchar *heap_new)
|
|
{
|
|
HP_KEYDEF *keydef, *end, *p_lastinx;
|
|
uchar *pos;
|
|
my_bool auto_key_changed= 0;
|
|
HP_SHARE *share= info->s;
|
|
DBUG_ENTER("heap_update");
|
|
|
|
test_active(info);
|
|
pos=info->current_ptr;
|
|
|
|
if (info->opt_flag & READ_CHECK_USED && hp_rectest(info,old))
|
|
DBUG_RETURN(my_errno); /* Record changed */
|
|
if (--(share->records) < share->blength >> 1) share->blength>>= 1;
|
|
share->changed=1;
|
|
|
|
p_lastinx= share->keydef + info->lastinx;
|
|
for (keydef= share->keydef, end= keydef + share->keys; keydef < end; keydef++)
|
|
{
|
|
if (hp_rec_key_cmp(keydef, old, heap_new, 0))
|
|
{
|
|
if ((*keydef->delete_key)(info, keydef, old, pos, keydef == p_lastinx) ||
|
|
(*keydef->write_key)(info, keydef, heap_new, pos))
|
|
goto err;
|
|
if (share->auto_key == (uint) (keydef - share->keydef + 1))
|
|
auto_key_changed= 1;
|
|
}
|
|
}
|
|
|
|
memcpy(pos,heap_new,(size_t) share->reclength);
|
|
if (++(share->records) == share->blength) share->blength+= share->blength;
|
|
|
|
#if !defined(DBUG_OFF) && defined(EXTRA_HEAP_DEBUG)
|
|
DBUG_EXECUTE("check_heap",heap_check_heap(info, 0););
|
|
#endif
|
|
if (auto_key_changed)
|
|
heap_update_auto_increment(info, heap_new);
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
if (my_errno == HA_ERR_FOUND_DUPP_KEY)
|
|
{
|
|
info->errkey = (int) (keydef - share->keydef);
|
|
if (keydef->algorithm == HA_KEY_ALG_BTREE)
|
|
{
|
|
/* we don't need to delete non-inserted key from rb-tree */
|
|
if ((*keydef->write_key)(info, keydef, old, pos))
|
|
{
|
|
if (++(share->records) == share->blength)
|
|
share->blength+= share->blength;
|
|
DBUG_RETURN(my_errno);
|
|
}
|
|
keydef--;
|
|
}
|
|
while (keydef >= share->keydef)
|
|
{
|
|
if (hp_rec_key_cmp(keydef, old, heap_new, 0))
|
|
{
|
|
if ((*keydef->delete_key)(info, keydef, heap_new, pos, 0) ||
|
|
(*keydef->write_key)(info, keydef, old, pos))
|
|
break;
|
|
}
|
|
keydef--;
|
|
}
|
|
}
|
|
if (++(share->records) == share->blength)
|
|
share->blength+= share->blength;
|
|
DBUG_RETURN(my_errno);
|
|
} /* heap_update */
|