mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
ab0fa111fe
Fixed bug when calculating max_key_length that caused some ALTER TABLE to fail if MAX_ROWS was used. Use maria_block_size instead of MARIA_MIN_KEY_BLOCK_LENGTH Fixed bug when scanning table with BLOCK format for repair; If table was > bitmap coverage one page block was read twice which caused a lot of duplicate key errors Could not repeat Bug#34106 "auto_increment is reset to 1 when table is recovered from crash" after this patch. NOTE: This is an incompatible change, so one must do maria_chk -r on ones old Maria tables! Sorry, but this was needed to fix the bug with max_key_length and to be able to handle bigger key files with smaller key references cmd-line-utils/readline/readline.c: Fixed compiler warnings mysql-test/r/maria.result: Added more test of auto-increment handling mysql-test/t/maria.test: Added more test of auto-increment handling mysys/my_pread.c: Fixed wrong test Removed not needed tests (error is always 1 if readbytes != Count) mysys/my_read.c: Fixed wrong test storage/maria/ha_maria.cc: Disable LOAD INDEX until I got Sanja's extension to pagecache interface storage/maria/ma_blockrec.c: Ensure that info->last_auto_increment is reset properly storage/maria/ma_check.c: Fixed wrong printing of row number in case of duplicate key for --safe-repair Safety fix in recreate table so that Column numbers are given to maria_create() in original order Added missing HA_OPEN_FOR_REPAIR to maria_open() Fixed bug when scanning table with BLOCK format for repair; If table was > bitmap coverage one page block was read twice which caused a lot of duplicate key errors storage/maria/ma_create.c: Use correct value for how much free space there is on a key page Remember some missing table option when doing re-create. Removed optimization where last packed fields is unpacked; Caused problems for re-create. storage/maria/ma_delete.c: Ensure that info->last_auto_increment is reset properly Fix for update to restore autoincrement value on duplicate key storage/maria/ma_key_recover.c: Moved handling of restoring value of auto-increment in case of duplicate key from clr to undo This ensures the restoring works both for insert and update and also that this is symetrical to how the auto_increment value is stored storage/maria/ma_key_recover.h: Added new prototype storage/maria/ma_loghandler.c: Added hook to write_hook_for_undo_key_delete() storage/maria/ma_open.c: Fixed wrong calculation of max_key_file_length storage/maria/ma_page.c: Use maria_block_size instead of MARIA_MIN_KEY_BLOCK_LENGTH Increase internal buffer (safety fix) storage/maria/ma_search.c: Use maria_block_size instead of MARIA_MIN_KEY_BLOCK_LENGTH Note that this is an incompatible change, so one must do maria_chk -r on ones old Maria tables (sorry) storage/maria/ma_update.c: Ensure that info->last_auto_increment is reset properly storage/maria/ma_write.c: Ensure that info->last_auto_increment is reset properly Fix for update to restore autoincrement value on duplicate key storage/maria/maria_chk.c: Allow small page_buffer_size Fixed printing for --describe to better fit into 80 characters storage/maria/maria_def.h: Added comments
250 lines
7.7 KiB
C
250 lines
7.7 KiB
C
/* Copyright (C) 2006 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; 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 an old row in a MARIA table */
|
|
|
|
#include "ma_fulltext.h"
|
|
#include "ma_rt_index.h"
|
|
|
|
int maria_update(register MARIA_HA *info, const uchar *oldrec, uchar *newrec)
|
|
{
|
|
int flag,key_changed,save_errno;
|
|
reg3 my_off_t pos;
|
|
uint i;
|
|
uchar old_key[HA_MAX_KEY_BUFF],*new_key;
|
|
my_bool auto_key_changed= 0;
|
|
ulonglong changed;
|
|
MARIA_SHARE *share= info->s;
|
|
DBUG_ENTER("maria_update");
|
|
LINT_INIT(new_key);
|
|
LINT_INIT(changed);
|
|
|
|
DBUG_EXECUTE_IF("maria_pretend_crashed_table_on_usage",
|
|
maria_print_error(info->s, HA_ERR_CRASHED);
|
|
DBUG_RETURN(my_errno= HA_ERR_CRASHED););
|
|
if (!(info->update & HA_STATE_AKTIV))
|
|
{
|
|
DBUG_RETURN(my_errno=HA_ERR_KEY_NOT_FOUND);
|
|
}
|
|
if (share->options & HA_OPTION_READ_ONLY_DATA)
|
|
{
|
|
DBUG_RETURN(my_errno=EACCES);
|
|
}
|
|
if (info->state->key_file_length >= share->base.margin_key_file_length)
|
|
{
|
|
DBUG_RETURN(my_errno=HA_ERR_INDEX_FILE_FULL);
|
|
}
|
|
pos= info->cur_row.lastpos;
|
|
if (_ma_readinfo(info,F_WRLCK,1))
|
|
DBUG_RETURN(my_errno);
|
|
|
|
if ((*share->compare_record)(info,oldrec))
|
|
{
|
|
save_errno= my_errno;
|
|
DBUG_PRINT("warning", ("Got error from compare record"));
|
|
goto err_end; /* Record has changed */
|
|
}
|
|
|
|
/* Calculate and check all unique constraints */
|
|
key_changed=0;
|
|
for (i=0 ; i < share->state.header.uniques ; i++)
|
|
{
|
|
MARIA_UNIQUEDEF *def=share->uniqueinfo+i;
|
|
if (_ma_unique_comp(def, newrec, oldrec,1) &&
|
|
_ma_check_unique(info, def, newrec, _ma_unique_hash(def, newrec),
|
|
pos))
|
|
{
|
|
save_errno=my_errno;
|
|
goto err_end;
|
|
}
|
|
}
|
|
if (_ma_mark_file_changed(info))
|
|
{
|
|
save_errno=my_errno;
|
|
goto err_end;
|
|
}
|
|
|
|
/* Ensure we don't try to restore auto_increment if it doesn't change */
|
|
info->last_auto_increment= ~(ulonglong) 0;
|
|
|
|
/* Check which keys changed from the original row */
|
|
|
|
new_key= info->lastkey2;
|
|
changed=0;
|
|
for (i=0 ; i < share->base.keys ; i++)
|
|
{
|
|
if (maria_is_key_active(share->state.key_map, i))
|
|
{
|
|
if (share->keyinfo[i].flag & HA_FULLTEXT )
|
|
{
|
|
if (_ma_ft_cmp(info,i,oldrec, newrec))
|
|
{
|
|
if ((int) i == info->lastinx)
|
|
{
|
|
/*
|
|
We are changeing the index we are reading on. Mark that
|
|
the index data has changed and we need to do a full search
|
|
when doing read-next
|
|
*/
|
|
key_changed|=HA_STATE_WRITTEN;
|
|
}
|
|
changed|=((ulonglong) 1 << i);
|
|
if (_ma_ft_update(info,i,old_key,oldrec,newrec,pos))
|
|
goto err;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
uint new_length= _ma_make_key(info,i,new_key,newrec,pos);
|
|
uint old_length= _ma_make_key(info,i,old_key,oldrec,pos);
|
|
|
|
/* The above changed info->lastkey2. Inform maria_rnext_same(). */
|
|
info->update&= ~HA_STATE_RNEXT_SAME;
|
|
|
|
if (new_length != old_length ||
|
|
memcmp(old_key, new_key, new_length))
|
|
{
|
|
if ((int) i == info->lastinx)
|
|
key_changed|=HA_STATE_WRITTEN; /* Mark that keyfile changed */
|
|
changed|=((ulonglong) 1 << i);
|
|
share->keyinfo[i].version++;
|
|
if (share->keyinfo[i].ck_delete(info,i,old_key,old_length)) goto err;
|
|
if (share->keyinfo[i].ck_insert(info,i,new_key,new_length)) goto err;
|
|
if (share->base.auto_key == i+1)
|
|
auto_key_changed=1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (share->calc_checksum)
|
|
{
|
|
/*
|
|
We can't use the row based checksum as this doesn't have enough
|
|
precision (one byte, while the table's is more bytes).
|
|
At least _ma_check_unique() modifies the 'newrec' record, so checksum
|
|
has to be computed _after_ it. Nobody apparently modifies 'oldrec'.
|
|
We need to pass the old row's checksum down to (*update_record)(), we do
|
|
this via info->new_row.checksum (not intuitive but existing code
|
|
mandated that cur_row is the new row).
|
|
If (*update_record)() fails, table will be marked corrupted so no need
|
|
to revert the live checksum change.
|
|
*/
|
|
info->cur_row.checksum= (*share->calc_checksum)(info, newrec);
|
|
info->new_row.checksum= (*share->calc_checksum)(info, oldrec);
|
|
if (!share->now_transactional)
|
|
info->state->checksum+= info->cur_row.checksum - info->new_row.checksum;
|
|
}
|
|
{
|
|
/*
|
|
Don't update index file if data file is not extended and no status
|
|
information changed
|
|
*/
|
|
MARIA_STATUS_INFO state;
|
|
ha_rows org_split;
|
|
my_off_t org_delete_link;
|
|
|
|
memcpy((char*) &state, (char*) info->state, sizeof(state));
|
|
org_split= share->state.split;
|
|
org_delete_link= share->state.dellink;
|
|
if ((*share->update_record)(info, pos, oldrec, newrec))
|
|
goto err;
|
|
}
|
|
if (auto_key_changed & !share->now_transactional)
|
|
{
|
|
const HA_KEYSEG *keyseg= share->keyinfo[share->base.auto_key-1].seg;
|
|
const uchar *key= newrec + keyseg->start;
|
|
set_if_bigger(share->state.auto_increment,
|
|
ma_retrieve_auto_increment(key, keyseg->type));
|
|
}
|
|
|
|
/*
|
|
We can't yet have HA_STATE_AKTIV here, as block_record dosn't support
|
|
it
|
|
*/
|
|
info->update= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED | key_changed);
|
|
share->state.changed|= STATE_NOT_MOVABLE | STATE_NOT_ZEROFILLED;
|
|
|
|
/*
|
|
Every Maria function that updates Maria table must end with
|
|
call to _ma_writeinfo(). If operation (second param of
|
|
_ma_writeinfo()) is not 0 it sets share->changed to 1, that is
|
|
flags that data has changed. If operation is 0, this function
|
|
equals to no-op in this case.
|
|
|
|
ma_update() must always pass !0 value as operation, since even if
|
|
there is no index change there could be data change.
|
|
*/
|
|
VOID(_ma_writeinfo(info, WRITEINFO_UPDATE_KEYFILE));
|
|
allow_break(); /* Allow SIGHUP & SIGINT */
|
|
if (info->invalidator != 0)
|
|
{
|
|
DBUG_PRINT("info", ("invalidator... '%s' (update)", share->open_file_name));
|
|
(*info->invalidator)(share->open_file_name);
|
|
info->invalidator=0;
|
|
}
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
DBUG_PRINT("error",("key: %d errno: %d",i,my_errno));
|
|
save_errno= my_errno;
|
|
DBUG_ASSERT(save_errno);
|
|
if (!save_errno)
|
|
save_errno= HA_ERR_INTERNAL_ERROR; /* Should never happen */
|
|
|
|
if (my_errno == HA_ERR_FOUND_DUPP_KEY || my_errno == HA_ERR_OUT_OF_MEM ||
|
|
my_errno == HA_ERR_RECORD_FILE_FULL)
|
|
{
|
|
info->errkey= (int) i;
|
|
flag=0;
|
|
do
|
|
{
|
|
if (((ulonglong) 1 << i) & changed)
|
|
{
|
|
if (share->keyinfo[i].flag & HA_FULLTEXT)
|
|
{
|
|
if ((flag++ && _ma_ft_del(info,i,new_key,newrec,pos)) ||
|
|
_ma_ft_add(info,i,old_key,oldrec,pos))
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
uint new_length= _ma_make_key(info,i,new_key,newrec,pos);
|
|
uint old_length= _ma_make_key(info,i,old_key,oldrec,pos);
|
|
if ((flag++ && _ma_ck_delete(info,i,new_key,new_length)) ||
|
|
_ma_ck_write(info,i,old_key,old_length))
|
|
break;
|
|
}
|
|
}
|
|
} while (i-- != 0);
|
|
}
|
|
else
|
|
{
|
|
maria_print_error(share, HA_ERR_CRASHED);
|
|
maria_mark_crashed(info);
|
|
}
|
|
info->update= (HA_STATE_CHANGED | HA_STATE_AKTIV | HA_STATE_ROW_CHANGED |
|
|
key_changed);
|
|
|
|
err_end:
|
|
VOID(_ma_writeinfo(info,WRITEINFO_UPDATE_KEYFILE));
|
|
allow_break(); /* Allow SIGHUP & SIGINT */
|
|
if (save_errno == HA_ERR_KEY_NOT_FOUND)
|
|
{
|
|
maria_print_error(share, HA_ERR_CRASHED);
|
|
save_errno=HA_ERR_CRASHED;
|
|
}
|
|
DBUG_RETURN(my_errno=save_errno);
|
|
} /* maria_update */
|