mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
35da5e43fb
Fixed compiler warnings (IRIX C compiler and VC++) VC++Files/client/mysqlclient.dsp: Add missing file to project VC++Files/libmysql/libmysql.dsp: Add missing file to project VC++Files/myisam/myisam.dsp: Add missing file to project VC++Files/mysys/mysys.dsp: Add missing file to project heap/hp_test1.c: Fixed wrong call to heap_rkey() heap/hp_test2.c: Fixed wrong call to heap_rkey() include/hash.h: Move not used (internal) struct to hash.c include/my_pthread.h: Made some structs 'const char*' to avoid warnings include/my_sys.h: Moved key cache structs and functions to keycache.h include/myisam.h: Merge key cache structures to one include/mysql.h: Remove STDCALL from internal functions include/sql_common.h: Remove STDCALL from internal functions include/violite.h: Fixed compiler warning isam/_locking.c: Merge key cache structures to one isam/_page.c: Merge key cache structures to one isam/close.c: Merge key cache structures to one isam/extra.c: Merge key cache structures to one isam/isamchk.c: Merge key cache structures to one isam/isamdef.h: Merge key cache structures to one isam/isamlog.c: Merge key cache structures to one isam/panic.c: Merge key cache structures to one isam/test2.c: Merge key cache structures to one isam/test3.c: Merge key cache structures to one libmysql/client_settings.h: Remove STDCALL from internal functions libmysql/libmysql.c: Remove STDCALL from internal functions myisam/ft_boolean_search.c: Fixed compiler warning myisam/ft_dump.c: Fixed compiler warnings (%qx is not portable) myisam/ft_update.c: Fixed compiler warnings myisam/mi_check.c: Merge key cache structures to one myisam/mi_close.c: Merge key cache structures to one myisam/mi_delete_all.c: Merge key cache structures to one myisam/mi_extra.c: Merge key cache structures to one myisam/mi_keycache.c: Merge key cache structures to one myisam/mi_locking.c: Merge key cache structures to one myisam/mi_page.c: Merge key cache structures to one myisam/mi_panic.c: Merge key cache structures to one myisam/mi_preload.c: Merge key cache structures to one myisam/mi_test1.c: Merge key cache structures to one myisam/mi_test2.c: Merge key cache structures to one myisam/mi_test3.c: Merge key cache structures to one myisam/myisamchk.c: Merge key cache structures to one myisam/myisamdef.h: Merge key cache structures to one myisam/myisamlog.c: Merge key cache structures to one Removed not used option myisam/sort.c: Fixed compiler warnings myisam/sp_test.c: Fixed compiler warnings mysql-test/r/case.result: Updated results after fix of correct NULL detection in WHEN mysql-test/r/date_formats.result: Updated results after fixing date handling mysql-test/r/symlink.result: Updated results after adding DEFAULT CHARSET mysql-test/t/case.test: New test mysql-test/t/symlink.test: Updated error numbers mysys/hash.c: Made HASH_LINK struct local mysys/mf_keycache.c: Merge key cache structures to one Fixed key_cache_read() and key_cache_write() to be resize-safe. mysys/mf_keycaches.c: Merge key cache structures to one mysys/thr_mutex.c: Added test if mutex is initalized sql-common/client.c: Remove STDCALL from internal functions sql/derror.cc: Added comment sql/field.cc: Removed not used variables sql/ha_innodb.cc: Fixed compiler warnings (removed not used variables) sql/ha_myisam.cc: Merge key cache structures to one sql/ha_myisammrg.cc: Removed not used variables sql/handler.cc: Merge key cache structures to one sql/handler.h: Merge key cache structures to one sql/item.cc: Fixed compiler warning sql/item_cmpfunc.cc: Remove not used variables sql/item_func.cc: Remove not used variables sql/item_strfunc.cc: Removed not used variables sql/item_sum.cc: Removed not used variables Moved setting of item_thd to fix_fields() sql/item_timefunc.cc: Removed not used variables sql/mysql_priv.h: Merge key cache structures to one sql/mysqld.cc: Merge key cache structures to one init_thread_environment() is not called before mysql_init_variables(). This fixes a case where a mutex was not initialized before it was used sql/opt_sum.cc: Remove not used variables sql/protocol.cc: Don't send errors after ok has been sent sql/protocol_cursor.cc: Remove not used variable Simple optimization sql/repl_failsafe.cc: Remove not used variables sql/set_var.cc: Merge key cache structures to one sql/set_var.h: Merge key cache structures to one sql/sql_acl.cc: Remove not used variables sql/sql_base.cc: Remove not used function sql/sql_db.cc: Remove not used variables sql/sql_handler.cc: Remove not used variables sql/sql_insert.cc: More DBUG statements Simple code cleanup sql/sql_lex.cc: Remove not used variables sql/sql_parse.cc: Remove not used variables sql/sql_prepare.cc: Remove not used variables sql/sql_repl.cc: Remove not used variables sql/sql_select.cc: Remove not used variables sql/sql_show.cc: Remove not used variables sql/sql_table.cc: Merge key cache structures to one Removed not used variables sql/sql_test.cc: Merge key cache structures to one sql/strfunc.cc: Fixed that find_type() returns correct value for partly matched words. (This fixed the error found by date_formats.test) sql/time.cc: Remove not used variables strings/my_strtoll10.c: Fixed compiler warnings
143 lines
4.3 KiB
C
143 lines
4.3 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 */
|
|
|
|
/* L{ser och skriver nyckelblock */
|
|
|
|
#include "isamdef.h"
|
|
#ifdef __WIN__
|
|
#include <errno.h>
|
|
#endif
|
|
|
|
/* Fetch a key-page in memory */
|
|
|
|
uchar *_nisam_fetch_keypage(register N_INFO *info, N_KEYDEF *keyinfo,
|
|
my_off_t page, uchar *buff, int return_buffer)
|
|
{
|
|
uchar *tmp;
|
|
tmp=(uchar*) key_cache_read(dflt_key_cache,
|
|
info->s->kfile,page,DFLT_INIT_HITS,(byte*) buff,
|
|
(uint) keyinfo->base.block_length,
|
|
(uint) keyinfo->base.block_length,
|
|
return_buffer);
|
|
if (tmp == info->buff)
|
|
{
|
|
info->update|=HA_STATE_BUFF_SAVED;
|
|
info->int_pos=(ulong) page;
|
|
info->buff_used=1;
|
|
}
|
|
else
|
|
{
|
|
info->update&= ~HA_STATE_BUFF_SAVED;
|
|
if (tmp)
|
|
info->int_pos=(ulong) page;
|
|
else
|
|
{
|
|
info->int_pos=NI_POS_ERROR;
|
|
DBUG_PRINT("error",("Got errno: %d from key_cache_read",my_errno));
|
|
my_errno=HA_ERR_CRASHED;
|
|
}
|
|
}
|
|
return tmp;
|
|
} /* _nisam_fetch_keypage */
|
|
|
|
|
|
/* Write a key-page on disk */
|
|
|
|
int _nisam_write_keypage(register N_INFO *info, register N_KEYDEF *keyinfo,
|
|
my_off_t page, uchar *buff)
|
|
{
|
|
reg3 uint length;
|
|
#ifndef QQ /* Safety check */
|
|
if (page < info->s->base.keystart ||
|
|
page+keyinfo->base.block_length > info->s->state.key_file_length ||
|
|
page & (nisam_block_size-1))
|
|
{
|
|
DBUG_PRINT("error",("Trying to write outside key region: %lu",
|
|
(long) page));
|
|
my_errno=EINVAL;
|
|
return(-1);
|
|
}
|
|
DBUG_PRINT("page",("write page at: %lu",(long) page,buff));
|
|
DBUG_DUMP("buff",(byte*) buff,getint(buff));
|
|
#endif
|
|
|
|
if ((length=keyinfo->base.block_length) > IO_SIZE*2 &&
|
|
info->s->state.key_file_length != page+length)
|
|
length= ((getint(buff)+IO_SIZE-1) & (uint) ~(IO_SIZE-1));
|
|
#ifdef HAVE_purify
|
|
{
|
|
length=getint(buff);
|
|
bzero((byte*) buff+length,keyinfo->base.block_length-length);
|
|
length=keyinfo->base.block_length;
|
|
}
|
|
#endif
|
|
return (key_cache_write(dflt_key_cache,
|
|
info->s->kfile,page,DFLT_INIT_HITS,
|
|
(byte*) buff,length,
|
|
(uint) keyinfo->base.block_length,
|
|
(int) (info->lock_type != F_UNLCK)));
|
|
} /* nisam_write_keypage */
|
|
|
|
|
|
/* Remove page from disk */
|
|
|
|
int _nisam_dispose(register N_INFO *info, N_KEYDEF *keyinfo, my_off_t pos)
|
|
{
|
|
uint keynr= (uint) (keyinfo - info->s->keyinfo);
|
|
ulong old_link; /* ulong is ok here */
|
|
DBUG_ENTER("_nisam_dispose");
|
|
|
|
old_link=info->s->state.key_del[keynr];
|
|
info->s->state.key_del[keynr]=(ulong) pos;
|
|
DBUG_RETURN(key_cache_write(dflt_key_cache,
|
|
info->s->kfile,pos,DFLT_INIT_HITS,
|
|
(byte*) &old_link,
|
|
sizeof(long),
|
|
(uint) keyinfo->base.block_length,
|
|
(int) (info->lock_type != F_UNLCK)));
|
|
} /* _nisam_dispose */
|
|
|
|
|
|
/* Make new page on disk */
|
|
|
|
ulong _nisam_new(register N_INFO *info, N_KEYDEF *keyinfo)
|
|
{
|
|
uint keynr= (uint) (keyinfo - info->s->keyinfo);
|
|
ulong pos;
|
|
DBUG_ENTER("_nisam_new");
|
|
|
|
if ((pos=info->s->state.key_del[keynr]) == NI_POS_ERROR)
|
|
{
|
|
if (info->s->state.key_file_length >= info->s->base.max_key_file_length)
|
|
{
|
|
my_errno=HA_ERR_INDEX_FILE_FULL;
|
|
DBUG_RETURN(NI_POS_ERROR);
|
|
}
|
|
pos=info->s->state.key_file_length;
|
|
info->s->state.key_file_length+= keyinfo->base.block_length;
|
|
}
|
|
else
|
|
{
|
|
if (!key_cache_read(dflt_key_cache,
|
|
info->s->kfile,pos,DFLT_INIT_HITS,
|
|
(byte*) &info->s->state.key_del[keynr],
|
|
(uint) sizeof(long),
|
|
(uint) keyinfo->base.block_length,0))
|
|
pos= NI_POS_ERROR;
|
|
}
|
|
DBUG_PRINT("exit",("Pos: %d",pos));
|
|
DBUG_RETURN(pos);
|
|
} /* _nisam_new */
|