mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
0825c48549
(fix is keeping the real TRN through a disable_logging/reenable cycle) - fix for pagecache assertion failure in ps/type_ranges with default engine=maria (fix is in sql_insert.cc) - when reenabling logging we must either flush all dirty pages, or at least verify (in debug build) that there are none. For example a bulk insert with single UNDO_BULK_INSERT must flush them, no matter if it uses repair or not (bugfix) - UNDO_BULK_INSERT_WITH_REPAIR is also used with repair, changes name mysql-test/r/maria.result: tests for bugs fixed mysql-test/t/maria.test: tests for bugs fixed sql/sql_insert.cc: Bugfix: even if select_create::prepare() failed to create the 'table' object we still have to re-enable logging. storage/maria/ha_maria.cc: Bugfix: when a transactional table does a bulk insert without repair, it still sometimes skips logging of REDOs thus needs a full flush and sync at the end. Not if repair is done, as repair does it internally already (see end of maria_repair*()). storage/maria/ha_maria.h: variable now can have 3 states not 2 storage/maria/ma_bitmap.c: name change storage/maria/ma_blockrec.c: name change storage/maria/ma_blockrec.h: name change storage/maria/ma_check.c: * When maria_repair() re-enables logging it does not need to ask for a flush&sync as it did it by itself already a few lines before. * the log record of bulk insert can be used even without repair * disable logging in maria_zerofill(): without that, it puts LSN pages in the cache, so when it flushes them it flushes the log; the change makes auto-ha_maria::zerofill-if-moved faster (no log flush). storage/maria/ma_key_recover.c: name change storage/maria/ma_loghandler.c: name change storage/maria/ma_loghandler.h: name change storage/maria/ma_pagecache.c: A function, to check in debug builds that no dirty pages exist for a file. storage/maria/ma_pagecache.h: new function (nothing in non-debug) storage/maria/ma_recovery.c: _ma_tmp_disable_logging() sets info->trn to dummy_transaction_object when needed now. The changes done here about info->trn are to allow a table to retain its original, real TRN through a disable/reenable cycle (see replication scenario in _ma_reenable_logging_for_table()). When we reenable, we offer the caller to flush and sync the table; if the caller doesn't accept our offer, we verify that it's ok (no REDOs => no dirty pages are allowed to exist). storage/maria/maria_chk.c: comment storage/maria/maria_def.h: new names mysql-test/suite/rpl/r/rpl_stm_maria.result: result (it used to crash) mysql-test/suite/rpl/t/rpl_stm_maria.test: Test of replication-specific Maria bug fixed
162 lines
6.1 KiB
C++
162 lines
6.1 KiB
C++
/* Copyright (C) 2006,2004 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 */
|
|
|
|
|
|
#ifdef USE_PRAGMA_INTERFACE
|
|
#pragma interface /* gcc class implementation */
|
|
#endif
|
|
|
|
/* class for the maria handler */
|
|
|
|
#include <maria.h>
|
|
|
|
#define HA_RECOVER_NONE 0 /* No automatic recover */
|
|
#define HA_RECOVER_DEFAULT 1 /* Automatic recover active */
|
|
#define HA_RECOVER_BACKUP 2 /* Make a backupfile on recover */
|
|
#define HA_RECOVER_FORCE 4 /* Recover even if we loose rows */
|
|
#define HA_RECOVER_QUICK 8 /* Don't check rows in data file */
|
|
|
|
extern ulong maria_sort_buffer_size;
|
|
extern TYPELIB maria_recover_typelib;
|
|
extern ulong maria_recover_options;
|
|
|
|
class ha_maria :public handler
|
|
{
|
|
MARIA_HA *file;
|
|
ulonglong int_table_flags;
|
|
MARIA_RECORD_POS remember_pos;
|
|
char *data_file_name, *index_file_name;
|
|
enum data_file_type data_file_type;
|
|
bool can_enable_indexes;
|
|
/**
|
|
If a transactional table is doing bulk insert with a single
|
|
UNDO_BULK_INSERT with/without repair.
|
|
*/
|
|
uint8 bulk_insert_single_undo;
|
|
int repair(THD * thd, HA_CHECK ¶m, bool optimize);
|
|
int zerofill(THD * thd, HA_CHECK_OPT *check_opt);
|
|
|
|
public:
|
|
ha_maria(handlerton *hton, TABLE_SHARE * table_arg);
|
|
~ha_maria() {}
|
|
handler *clone(MEM_ROOT *mem_root);
|
|
const char *table_type() const
|
|
{ return "MARIA"; }
|
|
const char *index_type(uint key_number);
|
|
const char **bas_ext() const;
|
|
ulonglong table_flags() const
|
|
{ return int_table_flags; }
|
|
ulong index_flags(uint inx, uint part, bool all_parts) const
|
|
{
|
|
return ((table_share->key_info[inx].algorithm == HA_KEY_ALG_FULLTEXT) ?
|
|
0 : HA_READ_NEXT | HA_READ_PREV | HA_READ_RANGE |
|
|
HA_READ_ORDER | HA_KEYREAD_ONLY);
|
|
}
|
|
uint max_supported_keys() const
|
|
{ return MARIA_MAX_KEY; }
|
|
uint max_supported_key_length() const;
|
|
uint max_supported_key_part_length() const
|
|
{ return max_supported_key_length(); }
|
|
enum row_type get_row_type() const;
|
|
uint checksum() const;
|
|
virtual double scan_time();
|
|
|
|
int open(const char *name, int mode, uint test_if_locked);
|
|
int close(void);
|
|
int write_row(uchar * buf);
|
|
int update_row(const uchar * old_data, uchar * new_data);
|
|
int delete_row(const uchar * buf);
|
|
int index_read_map(uchar * buf, const uchar * key, key_part_map keypart_map,
|
|
enum ha_rkey_function find_flag);
|
|
int index_read_idx_map(uchar * buf, uint idx, const uchar * key,
|
|
key_part_map keypart_map,
|
|
enum ha_rkey_function find_flag);
|
|
int index_read_last_map(uchar * buf, const uchar * key,
|
|
key_part_map keypart_map);
|
|
int index_next(uchar * buf);
|
|
int index_prev(uchar * buf);
|
|
int index_first(uchar * buf);
|
|
int index_last(uchar * buf);
|
|
int index_next_same(uchar * buf, const uchar * key, uint keylen);
|
|
int ft_init()
|
|
{
|
|
if (!ft_handler)
|
|
return 1;
|
|
ft_handler->please->reinit_search(ft_handler);
|
|
return 0;
|
|
}
|
|
FT_INFO *ft_init_ext(uint flags, uint inx, String * key)
|
|
{
|
|
return maria_ft_init_search(flags, file, inx,
|
|
(uchar *) key->ptr(), key->length(),
|
|
key->charset(), table->record[0]);
|
|
}
|
|
int ft_read(uchar * buf);
|
|
int rnd_init(bool scan);
|
|
int rnd_end(void);
|
|
int rnd_next(uchar * buf);
|
|
int rnd_pos(uchar * buf, uchar * pos);
|
|
int remember_rnd_pos();
|
|
int restart_rnd_next(uchar * buf);
|
|
void position(const uchar * record);
|
|
int info(uint);
|
|
int extra(enum ha_extra_function operation);
|
|
int extra_opt(enum ha_extra_function operation, ulong cache_size);
|
|
int reset(void);
|
|
int external_lock(THD * thd, int lock_type);
|
|
int start_stmt(THD *thd, thr_lock_type lock_type);
|
|
int delete_all_rows(void);
|
|
int disable_indexes(uint mode);
|
|
int enable_indexes(uint mode);
|
|
int indexes_are_disabled(void);
|
|
void start_bulk_insert(ha_rows rows);
|
|
int end_bulk_insert();
|
|
ha_rows records_in_range(uint inx, key_range * min_key, key_range * max_key);
|
|
void update_create_info(HA_CREATE_INFO * create_info);
|
|
int create(const char *name, TABLE * form, HA_CREATE_INFO * create_info);
|
|
THR_LOCK_DATA **store_lock(THD * thd, THR_LOCK_DATA ** to,
|
|
enum thr_lock_type lock_type);
|
|
virtual void get_auto_increment(ulonglong offset, ulonglong increment,
|
|
ulonglong nb_desired_values,
|
|
ulonglong *first_value,
|
|
ulonglong *nb_reserved_values);
|
|
int rename_table(const char *from, const char *to);
|
|
int delete_table(const char *name);
|
|
int check(THD * thd, HA_CHECK_OPT * check_opt);
|
|
int analyze(THD * thd, HA_CHECK_OPT * check_opt);
|
|
int repair(THD * thd, HA_CHECK_OPT * check_opt);
|
|
bool check_and_repair(THD * thd);
|
|
bool is_crashed() const;
|
|
bool auto_repair() const { return 1; }
|
|
int optimize(THD * thd, HA_CHECK_OPT * check_opt);
|
|
int restore(THD * thd, HA_CHECK_OPT * check_opt);
|
|
int backup(THD * thd, HA_CHECK_OPT * check_opt);
|
|
int assign_to_keycache(THD * thd, HA_CHECK_OPT * check_opt);
|
|
int preload_keys(THD * thd, HA_CHECK_OPT * check_opt);
|
|
bool check_if_incompatible_data(HA_CREATE_INFO * info, uint table_changes);
|
|
#ifdef HAVE_REPLICATION
|
|
int dump(THD * thd, int fd);
|
|
int net_read_dump(NET * net);
|
|
#endif
|
|
#ifdef HAVE_QUERY_CACHE
|
|
my_bool register_query_cache_table(THD *thd, char *table_key,
|
|
uint key_length,
|
|
qc_engine_callback
|
|
*engine_callback,
|
|
ulonglong *engine_data);
|
|
#endif
|
|
|
|
static int implicit_commit(THD *thd);
|
|
};
|