mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
9e72e1ef53
Fixes for embedded server Made key_cache more configurable Fixed that one can change key blocksize in MyISAM A lot of optimizations to make MyISAM slightly faster Docs/manual.texi: Cleaned up SSL documentation client/mysql.cc: Fixes for embedded server client/mysqltest.c: Fixes for embedded server Removed memory and file leaks include/my_global.h: Added C_MODE_START / C_MODE_END macros include/my_sys.h: Made key_cache more configurable include/myisam.h: Fixed that one can change MyISAM key block size include/mysql.h: Fixes for embedded server libmysql/libmysql.c: Cleanup libmysqld/Makefile.am: Cleanup libmysqld/examples/test-run: Added --debug libmysqld/lib_sql.cc: Cleanup libmysqld/libmysqld.c: Cleanup myisam/ft_boolean_search.c: Optimized mi_key_cmp to be faster myisam/ft_nlq_search.c: Optimized mi_key_cmp to be faster myisam/ft_search.c: Optimized mi_key_cmp to be faster myisam/mi_changed.c: Optimized mi_key_cmp to be faster myisam/mi_check.c: Optimized mi_key_cmp to be faster myisam/mi_create.c: Fixed that one can change blocksize by changing myisam_block_size myisam/mi_delete.c: Optimized mi_key_cmp to be faster myisam/mi_delete_all.c: Optimized mi_key_cmp to be faster myisam/mi_dynrec.c: Speed optimizations myisam/mi_info.c: Speed optimizations myisam/mi_key.c: Speed optimizations myisam/mi_locking.c: Speed optimizations myisam/mi_open.c: Fixed that one can change blocksize by changing myisam_block_size myisam/mi_page.c: Fixed that one can change blocksize by changing myisam_block_size myisam/mi_range.c: Speed optimizations myisam/mi_rkey.c: Speed optimizations myisam/mi_rnext.c: Speed optimizations myisam/mi_rnext_same.c: Speed optimizations myisam/mi_rprev.c: Speed optimizations myisam/mi_rsame.c: Speed optimizations myisam/mi_search.c: Speed optimizations myisam/mi_static.c: Fixed that one can change blocksize by changing myisam_block_size myisam/mi_statrec.c: Speed optimizations myisam/mi_test2.c: Added more test options myisam/mi_test_all.res: Added more test options myisam/mi_test_all.sh: Added more test options myisam/mi_write.c: Speed optimizations myisam/myisamchk.c: Added options to change block size and repair checksums myisam/myisamdef.h: Speed optimizations mysys/Makefile.am: Added bit handling functions mysys/mf_keycache.c: Made key_cache more configurable mysys/my_init.c: made my_init_done global scripts/mysql_fix_privilege_tables.sh: Fixes for SSL scripts/mysql_install_db.sh: Fixes for SSL sql/derror.cc: Don't call exit, call unireg_abort() sql/item_cmpfunc.cc: Speed optimizations sql/item_cmpfunc.h: Speed optimizations sql/mysql_priv.h: Fixes for embedded server sql/mysqld.cc: Fixes for embedded server
91 lines
2.9 KiB
C
91 lines
2.9 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 */
|
|
|
|
#include "myisamdef.h"
|
|
|
|
/*
|
|
Read next row with the same key as previous read
|
|
One may have done a write, update or delete of the previous row.
|
|
NOTE! Even if one changes the previous row, the next read is done
|
|
based on the position of the last used key!
|
|
*/
|
|
|
|
int mi_rnext(MI_INFO *info, byte *buf, int inx)
|
|
{
|
|
int error,changed;
|
|
uint flag;
|
|
DBUG_ENTER("mi_rnext");
|
|
|
|
if ((inx = _mi_check_index(info,inx)) < 0)
|
|
DBUG_RETURN(my_errno);
|
|
flag=SEARCH_BIGGER; /* Read next */
|
|
if (info->lastpos == HA_OFFSET_ERROR && info->update & HA_STATE_PREV_FOUND)
|
|
flag=0; /* Read first */
|
|
|
|
if (fast_mi_readinfo(info))
|
|
DBUG_RETURN(my_errno);
|
|
if (info->s->concurrent_insert)
|
|
rw_rdlock(&info->s->key_root_lock[inx]);
|
|
changed=_mi_test_if_changed(info);
|
|
if (!flag)
|
|
{
|
|
error=_mi_search_first(info,info->s->keyinfo+inx,
|
|
info->s->state.key_root[inx]);
|
|
}
|
|
else if (!changed)
|
|
error=_mi_search_next(info,info->s->keyinfo+inx,info->lastkey,
|
|
info->lastkey_length,flag,
|
|
info->s->state.key_root[inx]);
|
|
else
|
|
error=_mi_search(info,info->s->keyinfo+inx,info->lastkey,
|
|
USE_WHOLE_KEY,flag, info->s->state.key_root[inx]);
|
|
|
|
if (!error)
|
|
{
|
|
while (info->lastpos >= info->state->data_file_length)
|
|
{
|
|
/* Skip rows that are inserted by other threads since we got a lock */
|
|
if ((error=_mi_search_next(info,info->s->keyinfo+inx,info->lastkey,
|
|
info->lastkey_length,
|
|
SEARCH_BIGGER,
|
|
info->s->state.key_root[inx])))
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (info->s->concurrent_insert)
|
|
rw_unlock(&info->s->key_root_lock[inx]);
|
|
/* Don't clear if database-changed */
|
|
info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
|
|
info->update|= HA_STATE_NEXT_FOUND;
|
|
|
|
if (error)
|
|
{
|
|
if (my_errno == HA_ERR_KEY_NOT_FOUND)
|
|
my_errno=HA_ERR_END_OF_FILE;
|
|
}
|
|
else if (!buf)
|
|
{
|
|
DBUG_RETURN(info->lastpos==HA_OFFSET_ERROR ? my_errno : 0);
|
|
}
|
|
else if (!(*info->read_record)(info,info->lastpos,buf))
|
|
{
|
|
info->update|= HA_STATE_AKTIV; /* Record is read */
|
|
DBUG_RETURN(0);
|
|
}
|
|
DBUG_PRINT("error",("Got error: %d, errno: %d",error, my_errno));
|
|
DBUG_RETURN(my_errno);
|
|
} /* mi_rnext */
|