mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
99c431db92
Manually imported changes done to MyISAM (include/myisam.h, storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test, mysql-test/t/ps_2myisam.test) the last months into Maria (tedious, should do it more frequently in the future), including those not done at the previous 5.1->Maria merge (please in the future don't forget to apply MyISAM changes to Maria when you merge 5.1 into Maria). Note: I didn't try to import anything which could be MyISAM-related in other tests of mysql-test (I didn't want to dig in all csets), but as QA is working to make most tests re-usable for other engines (Falcon), it is likely that we'll benefit from this and just have to set engine=Maria somewhere to run those tests on Maria. func_group and partition tests fail but they already do in main 5.1 on my machine. No Valgrind error in t/*maria*.test. Monty: please see the commit comment of maria.result and check. BitKeeper/deleted/.del-ha_maria.m4: Delete: config/ac-macros/ha_maria.m4 configure.in: fix for the new way of enabling engines include/maria.h: importing changes done to MyISAM the last months into Maria include/my_handler.h: importing changes done to MyISAM the last months into Maria include/myisam.h: importing changes done to MyISAM the last months into Maria mysql-test/r/maria.result: identical to myisam.result, except the engine name in some places AND in the line testing key_block_size=1000000000000000000: Maria gives a key block size of 8192 while MyISAM gives 4096; is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH and the same constant in MyISAM? Monty? mysql-test/r/ps_maria.result: identical to ps_2myisam.result (except the engine name in some places) mysql-test/t/maria.test: instead of engine=maria everywhere, I use @@storage_engine (reduces the diff with myisam.test). importing changes done to MyISAM the last months into Maria mysys/my_handler.c: importing changes done to MyISAM the last months into Maria sql/ha_maria.cc: importing changes done to MyISAM the last months into Maria sql/ha_maria.h: importing changes done to MyISAM the last months into Maria sql/mysqld.cc: unneeded storage/maria/Makefile.am: importing changes done to MyISAM the last months into Maria storage/maria/ma_check.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_create.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_delete_table.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_dynrec.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_extra.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_ft_boolean_search.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_ft_eval.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_ft_nlq_search.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_ft_parser.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_ft_test1.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_ft_update.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_ftdefs.h: importing changes done to MyISAM the last months into Maria storage/maria/ma_key.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_open.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_page.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_rkey.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_rsamepos.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_rt_index.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_rt_mbr.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_search.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_sort.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_test1.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_test2.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_test3.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_update.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_write.c: importing changes done to MyISAM the last months into Maria storage/maria/maria_chk.c: importing changes done to MyISAM the last months into Maria storage/maria/maria_def.h: importing changes done to MyISAM the last months into Maria storage/maria/maria_ftdump.c: importing changes done to MyISAM the last months into Maria storage/maria/maria_pack.c: importing changes done to MyISAM the last months into Maria
161 lines
5 KiB
C
161 lines
5 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; 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 */
|
|
|
|
/* Read and write key blocks */
|
|
|
|
#include "maria_def.h"
|
|
|
|
/* Fetch a key-page in memory */
|
|
|
|
uchar *_ma_fetch_keypage(register MARIA_HA *info, MARIA_KEYDEF *keyinfo,
|
|
my_off_t page, int level,
|
|
uchar *buff, int return_buffer)
|
|
{
|
|
uchar *tmp;
|
|
uint page_size;
|
|
DBUG_ENTER("_ma_fetch_keypage");
|
|
DBUG_PRINT("enter",("page: %ld",page));
|
|
|
|
tmp=(uchar*) key_cache_read(info->s->key_cache,
|
|
info->s->kfile, page, level, (byte*) buff,
|
|
(uint) keyinfo->block_length,
|
|
(uint) keyinfo->block_length,
|
|
return_buffer);
|
|
if (tmp == info->buff)
|
|
info->buff_used=1;
|
|
else if (!tmp)
|
|
{
|
|
DBUG_PRINT("error",("Got errno: %d from key_cache_read",my_errno));
|
|
info->last_keypage=HA_OFFSET_ERROR;
|
|
maria_print_error(info->s, HA_ERR_CRASHED);
|
|
my_errno=HA_ERR_CRASHED;
|
|
DBUG_RETURN(0);
|
|
}
|
|
info->last_keypage=page;
|
|
page_size=maria_getint(tmp);
|
|
if (page_size < 4 || page_size > keyinfo->block_length)
|
|
{
|
|
DBUG_PRINT("error",("page %lu had wrong page length: %u",
|
|
(ulong) page, page_size));
|
|
DBUG_DUMP("page", (char*) tmp, keyinfo->block_length);
|
|
info->last_keypage = HA_OFFSET_ERROR;
|
|
maria_print_error(info->s, HA_ERR_CRASHED);
|
|
my_errno = HA_ERR_CRASHED;
|
|
tmp = 0;
|
|
}
|
|
DBUG_RETURN(tmp);
|
|
} /* _ma_fetch_keypage */
|
|
|
|
|
|
/* Write a key-page on disk */
|
|
|
|
int _ma_write_keypage(register MARIA_HA *info, register MARIA_KEYDEF *keyinfo,
|
|
my_off_t page, int level, uchar *buff)
|
|
{
|
|
reg3 uint length;
|
|
DBUG_ENTER("_ma_write_keypage");
|
|
|
|
#ifndef FAST /* Safety check */
|
|
if (page < info->s->base.keystart ||
|
|
page+keyinfo->block_length > info->state->key_file_length ||
|
|
(page & (MARIA_MIN_KEY_BLOCK_LENGTH-1)))
|
|
{
|
|
DBUG_PRINT("error",("Trying to write inside key status region: key_start: %lu length: %lu page: %lu",
|
|
(long) info->s->base.keystart,
|
|
(long) info->state->key_file_length,
|
|
(long) page));
|
|
my_errno=EINVAL;
|
|
DBUG_RETURN((-1));
|
|
}
|
|
DBUG_PRINT("page",("write page at: %lu",(long) page,buff));
|
|
DBUG_DUMP("buff",(byte*) buff,maria_getint(buff));
|
|
#endif
|
|
|
|
if ((length=keyinfo->block_length) > IO_SIZE*2 &&
|
|
info->state->key_file_length != page+length)
|
|
length= ((maria_getint(buff)+IO_SIZE-1) & (uint) ~(IO_SIZE-1));
|
|
#ifdef HAVE_purify
|
|
{
|
|
length=maria_getint(buff);
|
|
bzero((byte*) buff+length,keyinfo->block_length-length);
|
|
length=keyinfo->block_length;
|
|
}
|
|
#endif
|
|
DBUG_RETURN((key_cache_write(info->s->key_cache,
|
|
info->s->kfile,page, level, (byte*) buff,length,
|
|
(uint) keyinfo->block_length,
|
|
(int) ((info->lock_type != F_UNLCK) ||
|
|
info->s->delay_key_write))));
|
|
} /* maria_write_keypage */
|
|
|
|
|
|
/* Remove page from disk */
|
|
|
|
int _ma_dispose(register MARIA_HA *info, MARIA_KEYDEF *keyinfo, my_off_t pos,
|
|
int level)
|
|
{
|
|
my_off_t old_link;
|
|
char buff[8];
|
|
DBUG_ENTER("_ma_dispose");
|
|
DBUG_PRINT("enter",("pos: %ld", (long) pos));
|
|
|
|
old_link= info->s->state.key_del[keyinfo->block_size_index];
|
|
info->s->state.key_del[keyinfo->block_size_index]= pos;
|
|
mi_sizestore(buff,old_link);
|
|
info->s->state.changed|= STATE_NOT_SORTED_PAGES;
|
|
DBUG_RETURN(key_cache_write(info->s->key_cache,
|
|
info->s->kfile, pos , level, buff,
|
|
sizeof(buff),
|
|
(uint) keyinfo->block_length,
|
|
(int) (info->lock_type != F_UNLCK)));
|
|
} /* _ma_dispose */
|
|
|
|
|
|
/* Make new page on disk */
|
|
|
|
my_off_t _ma_new(register MARIA_HA *info, MARIA_KEYDEF *keyinfo, int level)
|
|
{
|
|
my_off_t pos;
|
|
char buff[8];
|
|
DBUG_ENTER("_ma_new");
|
|
|
|
if ((pos= info->s->state.key_del[keyinfo->block_size_index]) ==
|
|
HA_OFFSET_ERROR)
|
|
{
|
|
if (info->state->key_file_length >=
|
|
info->s->base.max_key_file_length - keyinfo->block_length)
|
|
{
|
|
my_errno=HA_ERR_INDEX_FILE_FULL;
|
|
DBUG_RETURN(HA_OFFSET_ERROR);
|
|
}
|
|
pos=info->state->key_file_length;
|
|
info->state->key_file_length+= keyinfo->block_length;
|
|
}
|
|
else
|
|
{
|
|
if (!key_cache_read(info->s->key_cache,
|
|
info->s->kfile, pos, level,
|
|
buff,
|
|
(uint) sizeof(buff),
|
|
(uint) keyinfo->block_length,0))
|
|
pos= HA_OFFSET_ERROR;
|
|
else
|
|
info->s->state.key_del[keyinfo->block_size_index]= mi_sizekorr(buff);
|
|
}
|
|
info->s->state.changed|= STATE_NOT_SORTED_PAGES;
|
|
DBUG_PRINT("exit",("Pos: %ld",(long) pos));
|
|
DBUG_RETURN(pos);
|
|
} /* _ma_new */
|