mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
2f3779d31c
MDEV-10130 Assertion `share->in_trans == 0' failed in storage/maria/ma_close.c MDEV-10378 Assertion `trn' failed in virtual int ha_maria::start_stmt The problem was that maria_handler->trn was not properly reset at commit/rollback and ha_maria::exernal_lock() could get confused because. There was some old code in ha_maria::implicit_commit() that tried to take care of this, but it was not bullet proof. Fixed by adding list of all tables that is part of the maria transaction to TRN. A nice side effect was of the fix is that loops in ha_maria::implict_commit() got to be much simpler. Other things: - Fixed a bug in mysql_admin_table() where argument open_for_modify was wrongly reset for the next table in the chain - rollback admin command also in case of fatal error. - Split _ma_set_trn_for_table() to three version to simplify code and debugging. - Several new asserts to detect the original problem (that file was not properly removed from trn before calling ma_close())
65 lines
1.9 KiB
C
65 lines
1.9 KiB
C
/* Copyright (C) 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
|
|
|
|
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 */
|
|
|
|
#ifndef _ma_trnman_h
|
|
#define _ma_trnman_h
|
|
|
|
/**
|
|
Sets table's trn and prints debug information
|
|
Links table into used_instances if new_trn is not 0
|
|
|
|
@param tbl MARIA_HA of table
|
|
@param newtrn what to put into tbl->trn
|
|
*/
|
|
|
|
static inline void _ma_set_trn_for_table(MARIA_HA *tbl, TRN *newtrn)
|
|
{
|
|
DBUG_PRINT("info",("table: %p trn: %p -> %p",
|
|
tbl, tbl->trn, newtrn));
|
|
|
|
/* check that we are not calling this twice in a row */
|
|
DBUG_ASSERT(newtrn->used_instances != (void*) tbl);
|
|
|
|
tbl->trn= newtrn;
|
|
/* Link into used list */
|
|
tbl->trn_next= (MARIA_HA*) newtrn->used_instances;
|
|
newtrn->used_instances= tbl;
|
|
}
|
|
|
|
|
|
/*
|
|
Same as _ma_set_trn_for_table(), but don't link table into used_instance list
|
|
Used when we want to temporary set trn for a table in extra()
|
|
*/
|
|
|
|
static inline void _ma_set_tmp_trn_for_table(MARIA_HA *tbl, TRN *newtrn)
|
|
{
|
|
DBUG_PRINT("info",("table: %p trn: %p -> %p",
|
|
tbl, tbl->trn, newtrn));
|
|
tbl->trn= newtrn;
|
|
}
|
|
|
|
|
|
/*
|
|
Reset TRN in table
|
|
*/
|
|
|
|
static inline void _ma_reset_trn_for_table(MARIA_HA *tbl)
|
|
{
|
|
DBUG_PRINT("info",("table: %p trn: %p -> NULL", tbl, tbl->trn));
|
|
tbl->trn= 0;
|
|
}
|
|
|
|
#endif /* _ma_trnman_h */
|