mirror of
https://github.com/MariaDB/server.git
synced 2025-01-24 15:54:37 +01:00
d77e3cde5f
myisam-recover options changed from OFF to 'DEFAULT' to get less change of data loss when using MyISAM. (The disadvantage is that changed MyISAM tables will be checked at access time; Use --myisam-recover=OFF for old behavior) Don't call extra(HA_EXTRA_FORCE_REOPEN) in ALTER TABLE if table is locked as this will mark table as crashed! Added assert to detect if we accidently would use MyISAM versioning in MySQL include/my_base.h: Mark NOT_USED as USED, as we now use this as a flag to not call extra() mysql-test/mysql-test-run.pl: Don't write all options when there is something wrong with the arguments mysql-test/r/sp-destruct.result: Add missing flush of mysql.proc (as the test copied live tables) mysql-test/r/variables.result: myisam-recover options changed to 'default' mysql-test/r/view.result: Don't show create time in result mysql-test/suite/maria/t/maria-recovery2-master.opt: Don't run test with myisam-recover (as this produces extra warnings during simulated death) mysql-test/t/sp-destruct.test: Add missing flush of mysql.proc (as the test copied live tables) mysql-test/t/view.test: Don't show create time in result sql/lock.cc: Added marker if table was deleted to argument list sql/mysql_priv.h: Added marker if table was deleted to argument list sql/mysqld.cc: myisam-recover options changed from OFF to 'DEFAULT' to get less change of data loss when using MyISAM Allow one to specify OFF as argument to myisam-recover (was default before but one couldn't specify it) sql/sql_base.cc: Mark if table is going to be deleted sql/sql_delete.cc: Mark if table is going to be deleted sql/sql_table.cc: Mark if table is going to be deleted Don't call extra(HA_EXTRA_FORCE_REOPEN) in ALTER TABLE if table is locked as this will mark table as crashed! sql/table.cc: Signal to handler if table is getting deleted as part of getting droped from table cache. sql/table.h: Added marker if table is going to be deleted. storage/maria/ha_maria.cc: Don't search for transaction handler if file is not transactional or outside of transaction (Fixed possible core dump) storage/maria/ma_blockrec.c: Don't write changed information if table is going to be deleted. storage/maria/ma_close.c: Don't write changed information if table is going to be deleted. storage/maria/ma_extra.c: Mark tables that are deleted as crased, to ensure good behavior on restart if we suddenly crash. storage/maria/ma_locking.c: Cleanup storage/maria/ma_recovery.c: We need trnman to be inited during redo phase (to be able to open tables checked with maria_chk) storage/maria/maria_def.h: Added marker if table is going to be deleted. storage/myisam/mi_close.c: Don't write changed information if table is going to be deleted. storage/myisam/mi_extra.c: Mark tables that are deleted as crased, to ensure good behavior on restart if we suddenly crash. storage/myisam/mi_open.c: Added assert to detect if we accidently would use MyISAM versioning in MySQL storage/myisam/myisamdef.h: Added marker if table is going to be deleted.
127 lines
3.9 KiB
C
127 lines
3.9 KiB
C
/* Copyright (C) 2000-2004 MySQL 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; version 2 of the License.
|
|
|
|
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 */
|
|
|
|
/* close a isam-database */
|
|
/*
|
|
TODO:
|
|
We need to have a separate mutex on the closed file to allow other threads
|
|
to open other files during the time we flush the cache and close this file
|
|
*/
|
|
|
|
#include "myisamdef.h"
|
|
|
|
int mi_close(register MI_INFO *info)
|
|
{
|
|
int error=0,flag;
|
|
MYISAM_SHARE *share=info->s;
|
|
DBUG_ENTER("mi_close");
|
|
DBUG_PRINT("enter",("base: 0x%lx reopen: %u locks: %u",
|
|
(long) info, (uint) share->reopen,
|
|
(uint) share->tot_locks));
|
|
|
|
pthread_mutex_lock(&THR_LOCK_myisam);
|
|
if (info->lock_type == F_EXTRA_LCK)
|
|
info->lock_type=F_UNLCK; /* HA_EXTRA_NO_USER_CHANGE */
|
|
|
|
if (info->lock_type != F_UNLCK)
|
|
{
|
|
if (mi_lock_database(info,F_UNLCK))
|
|
error=my_errno;
|
|
}
|
|
pthread_mutex_lock(&share->intern_lock);
|
|
|
|
if (share->options & HA_OPTION_READ_ONLY_DATA)
|
|
{
|
|
share->r_locks--;
|
|
share->tot_locks--;
|
|
}
|
|
if (info->opt_flag & (READ_CACHE_USED | WRITE_CACHE_USED))
|
|
{
|
|
if (end_io_cache(&info->rec_cache))
|
|
error=my_errno;
|
|
info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
|
|
}
|
|
flag= !--share->reopen;
|
|
myisam_open_list=list_delete(myisam_open_list,&info->open_list);
|
|
pthread_mutex_unlock(&share->intern_lock);
|
|
|
|
my_free(mi_get_rec_buff_ptr(info, info->rec_buff), MYF(MY_ALLOW_ZERO_PTR));
|
|
if (flag)
|
|
{
|
|
DBUG_EXECUTE_IF("crash_before_flush_keys",
|
|
if (share->kfile >= 0) abort(););
|
|
if (share->kfile >= 0 &&
|
|
flush_key_blocks(share->key_cache, share->kfile,
|
|
((share->temporary || share->deleting) ?
|
|
FLUSH_IGNORE_CHANGED :
|
|
FLUSH_RELEASE)))
|
|
error=my_errno;
|
|
if (share->kfile >= 0)
|
|
{
|
|
/*
|
|
If we are crashed, we can safely flush the current state as it will
|
|
not change the crashed state.
|
|
We can NOT write the state in other cases as other threads
|
|
may be using the file at this point
|
|
IF using --external-locking.
|
|
*/
|
|
if (share->mode != O_RDONLY && mi_is_crashed(info))
|
|
mi_state_info_write(share->kfile, &share->state, 1);
|
|
/* Decrement open count must be last I/O on this file. */
|
|
_mi_decrement_open_count(info);
|
|
if (my_close(share->kfile,MYF(0)))
|
|
error = my_errno;
|
|
}
|
|
#ifdef HAVE_MMAP
|
|
if (share->file_map)
|
|
_mi_unmap_file(info);
|
|
#endif
|
|
if (share->decode_trees)
|
|
{
|
|
my_free((uchar*) share->decode_trees,MYF(0));
|
|
my_free((uchar*) share->decode_tables,MYF(0));
|
|
}
|
|
#ifdef THREAD
|
|
thr_lock_delete(&share->lock);
|
|
VOID(pthread_mutex_destroy(&share->intern_lock));
|
|
{
|
|
int i,keys;
|
|
keys = share->state.header.keys;
|
|
VOID(rwlock_destroy(&share->mmap_lock));
|
|
for(i=0; i<keys; i++) {
|
|
VOID(rwlock_destroy(&share->key_root_lock[i]));
|
|
}
|
|
}
|
|
#endif
|
|
my_free((uchar*) info->s,MYF(0));
|
|
}
|
|
pthread_mutex_unlock(&THR_LOCK_myisam);
|
|
if (info->ftparser_param)
|
|
{
|
|
my_free((uchar*)info->ftparser_param, MYF(0));
|
|
info->ftparser_param= 0;
|
|
}
|
|
if (info->dfile >= 0 && my_close(info->dfile,MYF(0)))
|
|
error = my_errno;
|
|
|
|
myisam_log_command(MI_LOG_CLOSE,info,NULL,0,error);
|
|
my_free((uchar*) info,MYF(0));
|
|
|
|
if (error)
|
|
{
|
|
DBUG_RETURN(my_errno=error);
|
|
}
|
|
DBUG_RETURN(0);
|
|
} /* mi_close */
|