mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
4537a0c9e9
Stopping mysql server could result in an entry in mysql error file: "InnoDB: Error: MySQL is freeing a thd". This happened because InnoDB assumes that the server will never call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed. Prior to this patch we haven't had strict definition whether external_lock(F_UNLCK) must be called in case external_lock(READ/WRITE) fails. This patch states that we never call external_lock(F_UNLCK) in case external_lock(READ/WRITE) fails. mysql-test/suite/binlog/t/disabled.def: Re-enabled binlog_innodb and binlog_killed tests. sql/ha_ndbcluster.cc: Restore handler state in case external_lock() failed. sql/ha_partition.cc: Do not call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed. sql/lock.cc: Do not call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed. storage/myisammrg/myrg_locking.c: Restore handler state in case external_lock() failed.
51 lines
1.5 KiB
C
51 lines
1.5 KiB
C
/* Copyright (C) 2000-2002 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 */
|
|
|
|
/*
|
|
Lock databases against read or write.
|
|
*/
|
|
|
|
#include "myrg_def.h"
|
|
|
|
int myrg_lock_database(MYRG_INFO *info, int lock_type)
|
|
{
|
|
int error,new_error;
|
|
MYRG_TABLE *file;
|
|
|
|
error=0;
|
|
for (file=info->open_tables ; file != info->end_table ; file++)
|
|
{
|
|
#ifdef __WIN__
|
|
/*
|
|
Make sure this table is marked as owned by a merge table.
|
|
The semaphore is never released as long as table remains
|
|
in memory. This should be refactored into a more generic
|
|
approach (observer pattern)
|
|
*/
|
|
(file->table)->owned_by_merge = TRUE;
|
|
#endif
|
|
if ((new_error=mi_lock_database(file->table,lock_type)))
|
|
{
|
|
error=new_error;
|
|
if (lock_type != F_UNLCK)
|
|
{
|
|
while (--file >= info->open_tables)
|
|
mi_lock_database(file->table, F_UNLCK);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return(error);
|
|
}
|