mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
ec281a3c34
- Changed default recovery mode from OFF to NORMAL to get automatic repair of not properly closed tables. - Fixed a rase condition when two threads calls external_lock and thr_lock() in different order. When this happend the transaction that called external lock first and thr_lock() last did not see see the rows from the other transaction, even if if it had to wait in thr_lock() for other to complete. - Fixed that one can run maria_chk on an automatcally recovered tables without warnings about too small transaction id - Don't give warning that crashed table could not be repaired if repair was disabled (and thus not run) - Fixed a error result from flush_key_cache() which caused a DBUG_ASSERT() when one was using concurrent reads on non transactional tables that was updated. client/mysqldump.c: Add "" around error message to make it more readable client/mysqltest.cc: Free environment variables mysql-test/r/mysqldump.result: Updated results mysql-test/r/openssl_1.result: Updated results mysql-test/suite/maria/r/maria-recover.result: Updated results mysql-test/suite/maria/r/maria3.result: Updated results mysql-test/suite/maria/t/maria3.test: Added more test of temporary tables storage/maria/ha_maria.cc: Changed default recovery mode from OFF to NORMAL to get automatic repair of not properly closed tables. Start transaction in ma_block_get_status() instead of in ha_maria::external_lock(). - This fixes a rase condition when two threads calls external lock and thr_lock() in different order. When this happend the transaction that called external lock first and thr_lock() last did not see see the rows from the other transaction, even if if it had to wait in thr_lock() for other to complete. Store latest transaction id in controll file if recovery was done. - This allows one to run maria_chk on an automatcally recovered tables without warnings about too small transaction id storage/maria/ha_maria.h: Don't give warning that crashed table could not be repaired if repair was disabled (and thus not run) storage/maria/ma_blockrec.h: Added new function "_ma_block_get_status_no_versioning()" storage/maria/ma_init.c: Added hook to create trn in ma_block_get_status() if we are using MariaDB storage/maria/ma_open.c: Ensure we call _ma_block_get_status_no_versioning() for transactional tables without versioning (like tables with fulltext) storage/maria/ma_pagecache.c: Allow one to flush blocks that are pinned for read. This fixed a error result from flush_key_cache() which caused a DBUG_ASSERT() when one was using concurrent reads on non transactional tables that was updated. storage/maria/ma_recovery.c: Set maria_recovery_changed_data to 1 if recover changed something. Set max_trid_in_control_file to max found trn if we found a bigger trn. The allows will ensure that the control file is up to date after recovery which allows one to run maria_chk on the tables without warnings about too big trn storage/maria/ma_state.c: Call maria_create_trn_hook() in _ma_setup_live_state() instead of ha_maria::external_lock() This ensures that 'state' and trn are in sync and thus fixes the race condition mentioned for ha_maria.cc storage/maria/ma_static.c: Added maria_create_trn_hook() and maria_recovery_changed_data storage/maria/maria_def.h: Added MARIA_HANDLER->external_ptr, which is used to hold MariaDB thd. Added some new external variables Removed reference to non existing function: maria_concurrent_inserts()
110 lines
3.1 KiB
C
110 lines
3.1 KiB
C
/* Copyright (C) 2006 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 */
|
|
|
|
/* Initialize an maria-database */
|
|
|
|
#include "maria_def.h"
|
|
#include <ft_global.h>
|
|
#include "ma_blockrec.h"
|
|
#include "trnman_public.h"
|
|
#include "ma_checkpoint.h"
|
|
#include <hash.h>
|
|
|
|
void history_state_free(MARIA_STATE_HISTORY_CLOSED *closed_history)
|
|
{
|
|
MARIA_STATE_HISTORY *history, *next;
|
|
|
|
/*
|
|
Free all active history
|
|
In case of maria_open() this list should be empty as the history is moved
|
|
to handler->share.
|
|
*/
|
|
for (history= closed_history->state_history; history ; history= next)
|
|
{
|
|
next= history->next;
|
|
my_free(history, MYF(0));
|
|
}
|
|
my_free(closed_history, MYF(0));
|
|
}
|
|
|
|
|
|
static int dummy_maria_create_trn_hook(MARIA_HA *info __attribute__((unused)))
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
Initialize maria
|
|
|
|
SYNOPSIS
|
|
maria_init()
|
|
|
|
TODO
|
|
Open log files and do recovery if need
|
|
|
|
RETURN
|
|
0 ok
|
|
# error number
|
|
*/
|
|
|
|
int maria_init(void)
|
|
{
|
|
DBUG_ASSERT(maria_block_size &&
|
|
maria_block_size % MARIA_MIN_KEY_BLOCK_LENGTH == 0);
|
|
if (!maria_inited)
|
|
{
|
|
maria_inited= TRUE;
|
|
pthread_mutex_init(&THR_LOCK_maria,MY_MUTEX_INIT_SLOW);
|
|
_ma_init_block_record_data();
|
|
trnman_end_trans_hook= _ma_trnman_end_trans_hook;
|
|
maria_create_trn_hook= dummy_maria_create_trn_hook;
|
|
my_handler_error_register();
|
|
}
|
|
hash_init(&maria_stored_state, &my_charset_bin, 32,
|
|
0, sizeof(LSN), 0, (hash_free_key) history_state_free, 0);
|
|
DBUG_PRINT("info",("dummy_transaction_object: %p",
|
|
&dummy_transaction_object));
|
|
return 0;
|
|
}
|
|
|
|
|
|
void maria_end(void)
|
|
{
|
|
if (maria_inited)
|
|
{
|
|
TrID trid;
|
|
maria_inited= maria_multi_threaded= FALSE;
|
|
ft_free_stopwords();
|
|
ma_checkpoint_end();
|
|
if ((trid= trnman_get_max_trid()) > max_trid_in_control_file)
|
|
{
|
|
/*
|
|
Store max transaction id into control file, in case logs are removed
|
|
by user, or maria_chk wants to check tables (it cannot access max trid
|
|
from the log, as it cannot process REDOs).
|
|
*/
|
|
(void)ma_control_file_write_and_force(last_checkpoint_lsn, last_logno,
|
|
trid, recovery_failures);
|
|
}
|
|
trnman_destroy();
|
|
if (translog_status == TRANSLOG_OK)
|
|
translog_destroy();
|
|
end_pagecache(maria_log_pagecache, TRUE);
|
|
end_pagecache(maria_pagecache, TRUE);
|
|
ma_control_file_end();
|
|
pthread_mutex_destroy(&THR_LOCK_maria);
|
|
hash_free(&maria_stored_state);
|
|
}
|
|
}
|