mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +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
135 lines
4.4 KiB
C
135 lines
4.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 */
|
|
|
|
#include "isamdef.h"
|
|
|
|
/* if flag == HA_PANIC_CLOSE then all misam files are closed */
|
|
/* if flag == HA_PANIC_WRITE then all misam files are unlocked and
|
|
all changed data in single user misam is written to file */
|
|
/* if flag == HA_PANIC_READ then all misam files that was locked when
|
|
nisam_panic(HA_PANIC_WRITE) was done is locked. A ni_readinfo() is
|
|
done for all single user files to get changes in database */
|
|
|
|
|
|
int nisam_panic(enum ha_panic_function flag)
|
|
{
|
|
int error=0;
|
|
LIST *list_element,*next_open;
|
|
N_INFO *info;
|
|
DBUG_ENTER("nisam_panic");
|
|
|
|
pthread_mutex_lock(&THR_LOCK_isam);
|
|
for (list_element=nisam_open_list ; list_element ; list_element=next_open)
|
|
{
|
|
next_open=list_element->next; /* Save if close */
|
|
info=(N_INFO*) list_element->data;
|
|
switch (flag) {
|
|
case HA_PANIC_CLOSE:
|
|
pthread_mutex_unlock(&THR_LOCK_isam); /* Not exactly right... */
|
|
if (nisam_close(info))
|
|
error=my_errno;
|
|
pthread_mutex_lock(&THR_LOCK_isam);
|
|
break;
|
|
case HA_PANIC_WRITE: /* Do this to free databases */
|
|
#ifdef CANT_OPEN_FILES_TWICE
|
|
if (info->s->base.options & HA_OPTION_READ_ONLY_DATA)
|
|
break;
|
|
#endif
|
|
if (flush_key_blocks(dflt_key_cache,info->s->kfile,FLUSH_RELEASE))
|
|
error=my_errno;
|
|
if (info->opt_flag & WRITE_CACHE_USED)
|
|
if (flush_io_cache(&info->rec_cache))
|
|
error=my_errno;
|
|
if (info->opt_flag & READ_CACHE_USED)
|
|
{
|
|
if (flush_io_cache(&info->rec_cache))
|
|
error=my_errno;
|
|
reinit_io_cache(&info->rec_cache,READ_CACHE,0,
|
|
(pbool) (info->lock_type != F_UNLCK),1);
|
|
}
|
|
#ifndef NO_LOCKING
|
|
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;
|
|
}
|
|
#else
|
|
{
|
|
int save_status=info->s->w_locks; /* Only w_locks! */
|
|
info->s->w_locks=0;
|
|
if (_nisam_writeinfo(info, test(info->update & HA_STATE_CHANGED)))
|
|
error=my_errno;
|
|
info->s->w_locks=save_status;
|
|
info->update&= ~HA_STATE_CHANGED; /* Not changed */
|
|
}
|
|
#endif /* NO_LOCKING */
|
|
#ifdef CANT_OPEN_FILES_TWICE
|
|
if (info->s->kfile >= 0 && my_close(info->s->kfile,MYF(0)))
|
|
error = my_errno;
|
|
if (info->dfile >= 0 && my_close(info->dfile,MYF(0)))
|
|
error = my_errno;
|
|
info->s->kfile=info->dfile= -1; /* Files aren't open anymore */
|
|
break;
|
|
#endif
|
|
case HA_PANIC_READ: /* Restore to before WRITE */
|
|
#ifdef CANT_OPEN_FILES_TWICE
|
|
{ /* Open closed files */
|
|
char name_buff[FN_REFLEN];
|
|
if (info->s->kfile < 0)
|
|
if ((info->s->kfile= my_open(fn_format(name_buff,info->filename,"",
|
|
N_NAME_IEXT,4),info->mode,
|
|
MYF(MY_WME))) < 0)
|
|
error = my_errno;
|
|
if (info->dfile < 0)
|
|
{
|
|
if ((info->dfile= my_open(fn_format(name_buff,info->filename,"",
|
|
N_NAME_DEXT,4),info->mode,
|
|
MYF(MY_WME))) < 0)
|
|
error = my_errno;
|
|
info->rec_cache.file=info->dfile;
|
|
}
|
|
}
|
|
#endif
|
|
#ifndef NO_LOCKING
|
|
if (info->was_locked)
|
|
{
|
|
if (nisam_lock_database(info, info->was_locked))
|
|
error=my_errno;
|
|
info->was_locked=0;
|
|
}
|
|
#else
|
|
{
|
|
int lock_type,w_locks;
|
|
lock_type=info->lock_type ; w_locks=info->s->w_locks;
|
|
info->lock_type=0; info->s->w_locks=0;
|
|
if (_nisam_readinfo(info,0,1)) /* Read changed data */
|
|
error=my_errno;
|
|
info->lock_type=lock_type; info->s->w_locks=w_locks;
|
|
}
|
|
/* Don't use buffer when doing next */
|
|
info->update|=HA_STATE_WRITTEN;
|
|
#endif /* NO_LOCKING */
|
|
break;
|
|
}
|
|
}
|
|
if (flag == HA_PANIC_CLOSE)
|
|
VOID(nisam_log(0)); /* Close log if neaded */
|
|
pthread_mutex_unlock(&THR_LOCK_isam);
|
|
if (!error) DBUG_RETURN(0);
|
|
my_errno=error;
|
|
DBUG_RETURN(-1);
|
|
} /* nisam_panic */
|