mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
17f0738885
All statements doing an implicit commit now also do one in Maria. This is useful because LOCK TABLES; REPAIR; crash; is not rollback-able, the implicit commit of REPAIR avoid that Recovery tries to rollback and fails. Fix for BUG#33827 "COMMIT AND CHAIN causes serious Valgrind error" (maybe not the definite one, depends on the assigned dev). mysql-test/t/maria-recovery.test: test of REPAIR's implicit commit. I cannot commit the result file because maria-recovery fails in vanilla tree (seen in pushbuild) but its new section looks like: repair table t1; Table Op Msg_type Msg_text mysqltest.t1 repair status OK insert into t1 values(2); select * from t1; a 1 2 3 SET SESSION debug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash"; * crashing mysqld intentionally set global maria_checkpoint_interval=1; ERROR HY000: Lost connection to MySQL server during query * recovery happens check table t1 extended; Table Op Msg_type Msg_text mysqltest.t1 check status OK * testing that checksum after recovery is as expected Checksum-check failure use mysqltest; select * from t1; a 1 3 Which is as it should be. sql/rpl_injector.cc: fix for BUG#33827 sql/sql_parse.cc: - All DDLs and mysql_admin_table() (REPAIR etc) use end_actrive_trans() to do an implicit commit so we add there an implicit commit of the Maria transaction. - Fix for BUG#33827 storage/maria/ha_maria.cc: - A method to do implicit commit in Maria - After an implicit commit, if it was under LOCK TABLES, the locked tables have a stale file->trn: update it. storage/maria/ha_maria.h: new static method storage/maria/ma_check.c: bugfix: this disabling of transactionality had the effect that if LOCK TABLES; REPAIR; INSERT then the INSERT ran non-transactional (so couldn't be undone in case of crash, if, by bad chance, its effect on pages went to disk). storage/maria/ma_checkpoint.c: indentation storage/maria/ma_recovery.c: dbug statements storage/maria/trnman.c: When doing an implicit commit we need to know the number of locked tables of the committed transaction and copy it to the new transaction storage/maria/trnman_public.h: prototype change
62 lines
2.2 KiB
C
62 lines
2.2 KiB
C
/* Copyright (C) 2006 MySQL 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 */
|
|
|
|
|
|
/*
|
|
External definitions for trnman.h
|
|
We need to split this into two files as gcc 4.1.2 gives error if it tries
|
|
to include my_atomic.h in C++ code.
|
|
*/
|
|
|
|
#ifndef _trnman_public_h
|
|
#define _trnman_public_h
|
|
|
|
#include "ma_loghandler_lsn.h"
|
|
|
|
C_MODE_START
|
|
typedef uint64 TrID; /* our TrID is 6 bytes */
|
|
typedef struct st_transaction TRN;
|
|
|
|
#define SHORT_TRID_MAX 65535
|
|
|
|
extern uint trnman_active_transactions, trnman_allocated_transactions;
|
|
extern TRN dummy_transaction_object;
|
|
|
|
int trnman_init(TrID);
|
|
void trnman_destroy(void);
|
|
TRN *trnman_new_trn(pthread_mutex_t *, pthread_cond_t *, void *);
|
|
int trnman_end_trn(TRN *trn, my_bool commit);
|
|
#define trnman_commit_trn(T) trnman_end_trn(T, TRUE)
|
|
#define trnman_abort_trn(T) trnman_end_trn(T, FALSE)
|
|
#define trnman_rollback_trn(T) trnman_end_trn(T, FALSE)
|
|
void trnman_free_trn(TRN *trn);
|
|
int trnman_can_read_from(TRN *trn, TrID trid);
|
|
void trnman_new_statement(TRN *trn);
|
|
void trnman_rollback_statement(TRN *trn);
|
|
my_bool trnman_collect_transactions(LEX_STRING *str_act, LEX_STRING *str_com,
|
|
LSN *min_rec_lsn,
|
|
LSN *min_first_undo_lsn);
|
|
|
|
uint trnman_increment_locked_tables(TRN *trn);
|
|
uint trnman_decrement_locked_tables(TRN *trn);
|
|
uint trnman_has_locked_tables(TRN *trn);
|
|
void trnman_reset_locked_tables(TRN *trn, uint locked_tables);
|
|
TRN *trnman_recreate_trn_from_recovery(uint16 shortid, TrID longid);
|
|
TRN *trnman_get_any_trn();
|
|
#define TRANSID_SIZE 6
|
|
#define transid_store(dst, id) int6store(dst,id)
|
|
#define transid_korr(P) uint6korr(P)
|
|
C_MODE_END
|
|
#endif
|