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())
88 lines
3.5 KiB
C
88 lines
3.5 KiB
C
/* Copyright (C) 2008 Sun AB & Michael Widenius
|
|
|
|
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 */
|
|
|
|
/* Struct to store tables in use by one transaction */
|
|
|
|
typedef struct st_maria_status_info
|
|
{
|
|
ha_rows records; /* Rows in table */
|
|
ha_rows del; /* Removed rows */
|
|
my_off_t empty; /* lost space in datafile */
|
|
my_off_t key_empty; /* lost space in indexfile */
|
|
my_off_t key_file_length;
|
|
my_off_t data_file_length;
|
|
ha_checksum checksum;
|
|
uint32 changed:1, /* Set if table was changed */
|
|
no_transid:1; /* Set if no transid was set on rows */
|
|
} MARIA_STATUS_INFO;
|
|
|
|
|
|
typedef struct st_used_tables {
|
|
struct st_used_tables *next;
|
|
struct st_maria_share *share;
|
|
MARIA_STATUS_INFO state_current;
|
|
MARIA_STATUS_INFO state_start;
|
|
uint use_count;
|
|
} MARIA_USED_TABLES;
|
|
|
|
|
|
/* Struct to store commit state at different times */
|
|
|
|
typedef struct st_state_history {
|
|
struct st_state_history *next;
|
|
TrID trid;
|
|
MARIA_STATUS_INFO state;
|
|
} MARIA_STATE_HISTORY;
|
|
|
|
|
|
/* struct to remember history for closed tables */
|
|
|
|
typedef struct st_state_history_closed {
|
|
LSN create_rename_lsn;
|
|
MARIA_STATE_HISTORY *state_history;
|
|
} MARIA_STATE_HISTORY_CLOSED;
|
|
|
|
|
|
my_bool _ma_setup_live_state(MARIA_HA *info);
|
|
MARIA_STATE_HISTORY *_ma_remove_not_visible_states(MARIA_STATE_HISTORY
|
|
*org_history,
|
|
my_bool all,
|
|
my_bool trman_is_locked);
|
|
void _ma_reset_state(MARIA_HA *info);
|
|
void _ma_get_status(void* param, my_bool concurrent_insert);
|
|
void _ma_update_status(void* param);
|
|
void _ma_update_status_with_lock(MARIA_HA *info);
|
|
void _ma_restore_status(void *param);
|
|
void _ma_copy_status(void* to, void *from);
|
|
void _ma_reset_update_flag(void *param, my_bool concurrent_insert);
|
|
my_bool _ma_start_trans(void* param);
|
|
my_bool _ma_check_status(void *param);
|
|
void _ma_block_get_status(void* param, my_bool concurrent_insert);
|
|
void _ma_block_update_status(void *param);
|
|
void _ma_block_restore_status(void *param);
|
|
my_bool _ma_block_check_status(void *param);
|
|
void maria_versioning(MARIA_HA *info, my_bool versioning);
|
|
void _ma_set_share_data_file_length(struct st_maria_share *share,
|
|
ulonglong new_length);
|
|
void _ma_copy_nontrans_state_information(MARIA_HA *info);
|
|
my_bool _ma_trnman_end_trans_hook(TRN *trn, my_bool commit,
|
|
my_bool active_transactions);
|
|
my_bool _ma_row_visible_always(MARIA_HA *info);
|
|
my_bool _ma_row_visible_non_transactional_table(MARIA_HA *info);
|
|
my_bool _ma_row_visible_transactional_table(MARIA_HA *info);
|
|
void _ma_remove_not_visible_states_with_lock(struct st_maria_share *share,
|
|
my_bool all);
|
|
void _ma_remove_table_from_trnman(MARIA_HA *info);
|
|
void _ma_reset_history(struct st_maria_share *share);
|