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()
109 lines
4 KiB
C
109 lines
4 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 */
|
|
|
|
|
|
/*
|
|
Static variables for MARIA library. All definied here for easy making of
|
|
a shared library
|
|
*/
|
|
|
|
#ifndef _global_h
|
|
#include "maria_def.h"
|
|
#include "trnman.h"
|
|
#endif
|
|
|
|
LIST *maria_open_list=0;
|
|
uchar maria_file_magic[]=
|
|
{ (uchar) 254, (uchar) 254, (uchar) 9, '\003', };
|
|
uchar maria_pack_file_magic[]=
|
|
{ (uchar) 254, (uchar) 254, (uchar) 10, '\001', };
|
|
/* Unique number for this maria instance */
|
|
uchar maria_uuid[MY_UUID_SIZE];
|
|
uint maria_quick_table_bits=9;
|
|
ulong maria_block_size= MARIA_KEY_BLOCK_LENGTH;
|
|
my_bool maria_flush= 0, maria_single_user= 0;
|
|
my_bool maria_delay_key_write= 0, maria_page_checksums= 1;
|
|
my_bool maria_inited= FALSE;
|
|
my_bool maria_in_ha_maria= FALSE; /* If used from ha_maria or not */
|
|
my_bool maria_recovery_changed_data= 0;
|
|
pthread_mutex_t THR_LOCK_maria;
|
|
#if defined(THREAD) && !defined(DONT_USE_RW_LOCKS)
|
|
ulong maria_concurrent_insert= 2;
|
|
#else
|
|
ulong maria_concurrent_insert= 0;
|
|
#endif
|
|
my_off_t maria_max_temp_length= MAX_FILE_SIZE;
|
|
ulong maria_bulk_insert_tree_size=8192*1024;
|
|
ulong maria_data_pointer_size= 4;
|
|
|
|
PAGECACHE maria_pagecache_var;
|
|
PAGECACHE *maria_pagecache= &maria_pagecache_var;
|
|
|
|
PAGECACHE maria_log_pagecache_var;
|
|
PAGECACHE *maria_log_pagecache= &maria_log_pagecache_var;
|
|
MY_TMPDIR *maria_tmpdir; /* Tempdir for redo */
|
|
char *maria_data_root;
|
|
HASH maria_stored_state;
|
|
int (*maria_create_trn_hook)(MARIA_HA *);
|
|
|
|
/**
|
|
@brief when transactionality does not matter we can use this transaction
|
|
|
|
Used in external programs like ma_test*, and also internally inside
|
|
libmaria when there is no transaction around and the operation isn't
|
|
transactional (CREATE/DROP/RENAME/OPTIMIZE/REPAIR).
|
|
*/
|
|
TRN dummy_transaction_object;
|
|
|
|
/* a WT_RESOURCE_TYPE for transactions waiting on a unique key conflict */
|
|
WT_RESOURCE_TYPE ma_rc_dup_unique={ wt_resource_id_memcmp, 0};
|
|
|
|
/* Enough for comparing if number is zero */
|
|
uchar maria_zero_string[]= {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
|
|
|
|
/*
|
|
read_vec[] is used for converting between P_READ_KEY.. and SEARCH_
|
|
Position is , == , >= , <= , > , <
|
|
*/
|
|
|
|
uint32 maria_read_vec[]=
|
|
{
|
|
SEARCH_FIND, /* HA_READ_KEY_EXACT */
|
|
SEARCH_FIND | SEARCH_BIGGER, /* HA_READ_KEY_OR_NEXT */
|
|
SEARCH_FIND | SEARCH_SMALLER, /* HA_READ_KEY_OR_PREV */
|
|
SEARCH_NO_FIND | SEARCH_BIGGER, /* HA_READ_AFTER_KEY */
|
|
SEARCH_NO_FIND | SEARCH_SMALLER, /* HA_READ_BEFORE_KEY */
|
|
SEARCH_FIND | SEARCH_PART_KEY, /* HA_READ_PREFIX */
|
|
SEARCH_LAST, /* HA_READ_PREFIX_LAST */
|
|
SEARCH_LAST | SEARCH_SMALLER, /* HA_READ_PREFIX_LAST_OR_PREV */
|
|
MBR_CONTAIN, /* HA_READ_MBR_CONTAIN */
|
|
MBR_INTERSECT, /* HA_READ_MBR_INTERSECT */
|
|
MBR_WITHIN, /* HA_READ_MBR_WITHIN */
|
|
MBR_DISJOINT, /* HA_READ_MBR_DISJOINT */
|
|
MBR_EQUAL /* HA_READ_MBR_EQUAL */
|
|
};
|
|
|
|
uint32 maria_readnext_vec[]=
|
|
{
|
|
SEARCH_BIGGER, SEARCH_BIGGER, SEARCH_SMALLER, SEARCH_BIGGER, SEARCH_SMALLER,
|
|
SEARCH_BIGGER, SEARCH_SMALLER, SEARCH_SMALLER
|
|
};
|
|
|
|
static int always_valid(const char *filename __attribute__((unused)))
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
int (*maria_test_invalid_symlink)(const char *filename)= always_valid;
|