mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +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
271 lines
8.4 KiB
C
271 lines
8.4 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 */
|
|
|
|
/* Extra functions we want to do with a database */
|
|
/* - Set flags for quicker databasehandler */
|
|
/* - Set databasehandler to normal */
|
|
/* - Reset recordpointers as after open database */
|
|
|
|
#include "isamdef.h"
|
|
#ifdef HAVE_MMAP
|
|
#include <sys/mman.h>
|
|
#endif
|
|
#ifdef __WIN__
|
|
#include <errno.h>
|
|
#endif
|
|
|
|
/* set extra flags for database */
|
|
|
|
int nisam_extra(N_INFO *info, enum ha_extra_function function)
|
|
{
|
|
int error=0;
|
|
DBUG_ENTER("nisam_extra");
|
|
|
|
switch (function) {
|
|
case HA_EXTRA_RESET:
|
|
if (info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED))
|
|
{
|
|
info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
|
|
error=end_io_cache(&info->rec_cache);
|
|
}
|
|
info->opt_flag&= ~(KEY_READ_USED | REMEMBER_OLD_POS);
|
|
|
|
case HA_EXTRA_RESET_STATE:
|
|
info->lastinx= 0; /* Use first index as def */
|
|
info->int_pos=info->lastpos= NI_POS_ERROR;
|
|
info->page_changed=1;
|
|
/* Next/prev gives first/last */
|
|
if (info->opt_flag & READ_CACHE_USED)
|
|
{
|
|
VOID(flush_io_cache(&info->rec_cache));
|
|
reinit_io_cache(&info->rec_cache,READ_CACHE,0,
|
|
(pbool) (info->lock_type != F_UNLCK),
|
|
(pbool) test(info->update & HA_STATE_ROW_CHANGED));
|
|
}
|
|
info->update=((info->update & HA_STATE_CHANGED) |
|
|
HA_STATE_NEXT_FOUND | HA_STATE_PREV_FOUND);
|
|
break;
|
|
case HA_EXTRA_CACHE:
|
|
#ifndef NO_LOCKING
|
|
if (info->lock_type == F_UNLCK && (info->options & HA_OPTION_PACK_RECORD))
|
|
{
|
|
error=1; /* Not possibly if not locked */
|
|
my_errno=EACCES;
|
|
break;
|
|
}
|
|
#endif
|
|
#if defined(HAVE_MMAP) && defined(HAVE_MADVICE)
|
|
if ((info->options & HA_OPTION_COMPRESS_RECORD))
|
|
{
|
|
pthread_mutex_lock(&info->s->intern_lock);
|
|
if (_nisam_memmap_file(info))
|
|
{
|
|
/* We don't nead MADV_SEQUENTIAL if small file */
|
|
madvise(info->s->file_map,info->s->state.data_file_length,
|
|
info->s->state.data_file_length <= RECORD_CACHE_SIZE*16 ?
|
|
MADV_RANDOM : MADV_SEQUENTIAL);
|
|
pthread_mutex_unlock(&info->s->intern_lock);
|
|
break;
|
|
}
|
|
pthread_mutex_unlock(&info->s->intern_lock);
|
|
}
|
|
#endif
|
|
if (info->opt_flag & WRITE_CACHE_USED)
|
|
{
|
|
info->opt_flag&= ~WRITE_CACHE_USED;
|
|
if ((error=end_io_cache(&info->rec_cache)))
|
|
break;
|
|
}
|
|
if (!(info->opt_flag &
|
|
(READ_CACHE_USED | WRITE_CACHE_USED | MEMMAP_USED)))
|
|
{
|
|
if (!(init_io_cache(&info->rec_cache,info->dfile,
|
|
(uint) min(info->s->state.data_file_length+1,
|
|
my_default_record_cache_size),
|
|
READ_CACHE,0L,(pbool) (info->lock_type != F_UNLCK),
|
|
MYF(MY_WAIT_IF_FULL))))
|
|
{
|
|
info->opt_flag|=READ_CACHE_USED;
|
|
info->update&= ~HA_STATE_ROW_CHANGED;
|
|
}
|
|
/* info->rec_cache.end_of_file=info->s->state.data_file_length; */
|
|
}
|
|
break;
|
|
case HA_EXTRA_REINIT_CACHE:
|
|
if (info->opt_flag & READ_CACHE_USED)
|
|
{
|
|
reinit_io_cache(&info->rec_cache,READ_CACHE,info->nextpos,
|
|
(pbool) (info->lock_type != F_UNLCK),
|
|
(pbool) test(info->update & HA_STATE_ROW_CHANGED));
|
|
info->update&= ~HA_STATE_ROW_CHANGED;
|
|
/* info->rec_cache.end_of_file=info->s->state.data_file_length; */
|
|
}
|
|
break;
|
|
case HA_EXTRA_WRITE_CACHE:
|
|
#ifndef NO_LOCKING
|
|
if (info->lock_type == F_UNLCK)
|
|
{
|
|
error=1; /* Not possibly if not locked */
|
|
break;
|
|
}
|
|
#endif
|
|
if (!(info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED)))
|
|
{
|
|
if (!(init_io_cache(&info->rec_cache,info->dfile,0,
|
|
WRITE_CACHE,info->s->state.data_file_length,
|
|
(pbool) (info->lock_type != F_UNLCK),
|
|
MYF(MY_WAIT_IF_FULL))))
|
|
{
|
|
info->opt_flag|=WRITE_CACHE_USED;
|
|
info->update&= ~HA_STATE_ROW_CHANGED;
|
|
}
|
|
}
|
|
break;
|
|
case HA_EXTRA_PREPARE_FOR_UPDATE:
|
|
if (info->s->data_file_type != DYNAMIC_RECORD)
|
|
break;
|
|
/* Remove read/write cache if dynamic rows */
|
|
case HA_EXTRA_NO_CACHE:
|
|
if (info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED))
|
|
{
|
|
info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
|
|
error=end_io_cache(&info->rec_cache);
|
|
}
|
|
#if defined(HAVE_MMAP) && defined(HAVE_MADVICE)
|
|
if (info->opt_flag & MEMMAP_USED)
|
|
madvise(info->s->file_map,info->s->state.data_file_length,MADV_RANDOM);
|
|
#endif
|
|
break;
|
|
case HA_EXTRA_FLUSH_CACHE:
|
|
if (info->opt_flag & WRITE_CACHE_USED)
|
|
error=flush_io_cache(&info->rec_cache);
|
|
break;
|
|
case HA_EXTRA_NO_READCHECK:
|
|
info->opt_flag&= ~READ_CHECK_USED; /* No readcheck */
|
|
break;
|
|
case HA_EXTRA_READCHECK:
|
|
info->opt_flag|= READ_CHECK_USED;
|
|
break;
|
|
case HA_EXTRA_KEYREAD: /* Read only keys to record */
|
|
case HA_EXTRA_REMEMBER_POS:
|
|
info->opt_flag |= REMEMBER_OLD_POS;
|
|
bmove((byte*) info->lastkey+info->s->base.max_key_length*2,
|
|
(byte*) info->lastkey,info->s->base.max_key_length);
|
|
info->save_update= info->update;
|
|
info->save_lastinx= info->lastinx;
|
|
info->save_lastpos= info->lastpos;
|
|
if (function == HA_EXTRA_REMEMBER_POS)
|
|
break;
|
|
/* fall through */
|
|
case HA_EXTRA_KEYREAD_CHANGE_POS:
|
|
info->opt_flag |= KEY_READ_USED;
|
|
info->read_record=_nisam_read_key_record;
|
|
break;
|
|
case HA_EXTRA_NO_KEYREAD:
|
|
case HA_EXTRA_RESTORE_POS:
|
|
if (info->opt_flag & REMEMBER_OLD_POS)
|
|
{
|
|
bmove((byte*) info->lastkey,
|
|
(byte*) info->lastkey+info->s->base.max_key_length*2,
|
|
info->s->base.max_key_length);
|
|
info->update= info->save_update | HA_STATE_WRITTEN;
|
|
info->lastinx= info->save_lastinx;
|
|
info->lastpos= info->save_lastpos;
|
|
}
|
|
info->read_record= info->s->read_record;
|
|
info->opt_flag&= ~(KEY_READ_USED | REMEMBER_OLD_POS);
|
|
break;
|
|
case HA_EXTRA_NO_USER_CHANGE: /* Database is somehow locked agains changes */
|
|
info->lock_type= F_EXTRA_LCK; /* Simulate as locked */
|
|
break;
|
|
case HA_EXTRA_WAIT_LOCK:
|
|
info->lock_wait=0;
|
|
break;
|
|
case HA_EXTRA_NO_WAIT_LOCK:
|
|
info->lock_wait=MY_DONT_WAIT;
|
|
break;
|
|
case HA_EXTRA_NO_KEYS:
|
|
#ifndef NO_LOCKING
|
|
if (info->lock_type == F_UNLCK)
|
|
{
|
|
error=1; /* Not possibly if not lock */
|
|
break;
|
|
}
|
|
#endif
|
|
info->s->state.keys=0;
|
|
info->s->state.key_file_length=info->s->base.keystart;
|
|
info->s->changed=1; /* Update on close */
|
|
break;
|
|
case HA_EXTRA_FORCE_REOPEN:
|
|
case HA_EXTRA_PREPARE_FOR_DELETE:
|
|
pthread_mutex_lock(&THR_LOCK_isam);
|
|
info->s->last_version= 0L; /* Impossible version */
|
|
#ifdef __WIN__
|
|
/* Close the isam and data files as Win32 can't drop an open table */
|
|
if (flush_key_blocks(dflt_key_cache, info->s->kfile, FLUSH_RELEASE))
|
|
error=my_errno;
|
|
if (info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED))
|
|
{
|
|
info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
|
|
error=end_io_cache(&info->rec_cache);
|
|
}
|
|
if (info->lock_type != F_UNLCK && ! info->was_locked)
|
|
{
|
|
info->was_locked=info->lock_type;
|
|
if (nisam_lock_database(info,F_UNLCK))
|
|
error=my_errno;
|
|
}
|
|
if (info->s->kfile >= 0 && my_close(info->s->kfile,MYF(0)))
|
|
error=my_errno;
|
|
{
|
|
LIST *list_element ;
|
|
for (list_element=nisam_open_list ;
|
|
list_element ;
|
|
list_element=list_element->next)
|
|
{
|
|
N_INFO *tmpinfo=(N_INFO*) list_element->data;
|
|
if (tmpinfo->s == info->s)
|
|
{
|
|
if (tmpinfo->dfile >= 0 && my_close(tmpinfo->dfile,MYF(0)))
|
|
error = my_errno;
|
|
tmpinfo->dfile=-1;
|
|
}
|
|
}
|
|
}
|
|
info->s->kfile=-1; /* Files aren't open anymore */
|
|
#endif
|
|
pthread_mutex_unlock(&THR_LOCK_isam);
|
|
break;
|
|
case HA_EXTRA_FLUSH:
|
|
if (info->s->not_flushed)
|
|
{
|
|
info->s->not_flushed=0;
|
|
if (my_sync(info->s->kfile, MYF(0)))
|
|
error= my_errno;
|
|
if (my_sync(info->dfile, MYF(0)))
|
|
error= my_errno;
|
|
}
|
|
break;
|
|
case HA_EXTRA_NORMAL: /* Theese isn't in use */
|
|
case HA_EXTRA_QUICK:
|
|
case HA_EXTRA_KEY_CACHE:
|
|
case HA_EXTRA_NO_KEY_CACHE:
|
|
default:
|
|
break;
|
|
}
|
|
nisam_log_command(LOG_EXTRA,info,(byte*) &function,sizeof(function),error);
|
|
DBUG_RETURN(error);
|
|
} /* nisam_extra */
|