mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
86fcfb1508
Fixed bug when removing a newly inserted record (in case of duplicate key). The bug caused a crash for rows with several blobs and the first blob was small enough to fit into the head page. Don't change state_history if nothing changed (speed optimization that also simplifies logic). Reset state_history if we added/deleted or updated rows without versioning. Fixed wrong test in trnman_exists_active_transactions() if state is visible or not. Other bugs fixed: Fixed wrong argument to (lock->get_status) when we had to wait for TL_WRITE_CONCURRENT_INSERT. Item_equal::update_used_tables() didn't calculate const_item_cache properly. Added assert's to detect if join_read_const_table() was called under wrong assumptions.. Fixed that _ma_setup_live_state() is called from thr_lock() instead of handler::external_lock(). This was needed to get versioning information to be setup correctly. Fixed error in debug binaries during a call to _ma_check_table_is_closed() when another thread was opening/closing a table. Fixed wrong test when finding right history_state to use. mysql-test/suite/maria/r/maria.result: Added test for Bug#40311 Assert in MARIA_RECORD_POS during pushbuild 2 test mysql-test/suite/maria/t/maria.test: Added test for Bug#40311 Assert in MARIA_RECORD_POS during pushbuild 2 test mysys/thr_lock.c: Fixed wrong argument to (lock->get_status) when we had to wait for TL_WRITE_CONCURRENT_INSERT sql/item_cmpfunc.cc: Item_equal::update_used_tables() didn't calculate const_item_cache properly, which later caused a wrong result for item->const_item() sql/sql_base.cc: In debug mode, Initilize record buffer with unexpected data to catch usage of uninitialized memory sql/sql_select.cc: Fixed indentation Added assert's to detect if join_read_const_table() was called under wrong assumptions. One assert() is disabled for now as Item_equal() doesn't behave as expected. storage/maria/ha_maria.cc: Move calling to _ma_setup_live_state() to ma_state.c::_ma_block_get_status() This was needed as _ma_setup_live_state() needed to know if the table will be used concurrently or not storage/maria/ma_blockrec.c: Fixed bug when removing a newly inserted record (in case of duplicate key). The bug caused a crash for rows with several blobs and the first blob was small enough to fit into the head page. storage/maria/ma_dbug.c: Added mutex to protect the open table list during _ma_check_table_is_closed(). Without the protection we could get a error in debug binaries during a call to _ma_check_table_is_closed() storage/maria/ma_delete_table.c: Removed not used code storage/maria/ma_rename.c: Removed not used code storage/maria/ma_state.c: Fixed wrong test when finding right history_state to use Mark in tables->state_current.no_transid if we are using transid's or not. Don't change state_history if nothing changed (speed optimization that also simplifies logic) Reset state_history if we added/deleted or updated rows without versioning. More DBUG_ASSERT's and more DBUG Updated maria_versioning() to initialize environment before calling _ma_blok_get_status(). This was needed because of the new logic in _ma_block_get_status() storage/maria/ma_state.h: Added flags to detect if table changed and/or if we changed table without versioning storage/maria/ma_write.c: Simple cleanups (No logic changes) storage/maria/trnman.c: Fixed wrong test in trnman_exists_active_transactions() if state is visible or not.
85 lines
3.4 KiB
C
85 lines
3.4 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;
|
|
} 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_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_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(struct st_maria_share *share, TRN *trn);
|
|
void _ma_reset_history(struct st_maria_share *share);
|