Skip to content

M
MariaDB
Commit 6b89901c authored by unknown's avatar unknown
Browse files
Options

Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria 

into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-testfail


mysql-test/t/maria-recovery.test:
  Auto merged
storage/maria/ma_loghandler.c:
  Auto merged
parents 01ea6c1e 77e08a74
Expand all Show whitespace changes
Inline Side-by-side
Showing with 283 additions and 209 deletions
mysql-test/r/maria-big.result
View file @ 6b89901c
set storage_engine=maria; set storage_engine=maria;
affected rows: 0 affected rows: 0
set global maria_log_file_size=4294967296;
affected rows: 0
drop table if exists t1, t2; drop table if exists t1, t2;
affected rows: 0 affected rows: 0
create table t1(a char(3)); create table t1(a char(3));
......
mysql-test/r/maria-connect.result
View file @ 6b89901c
set global storage_engine=maria; set global storage_engine=maria;
set session storage_engine=maria; set session storage_engine=maria;
set global maria_log_file_size=4294967296;
drop table if exists t1; drop table if exists t1;
SET SQL_WARNINGS=1; SET SQL_WARNINGS=1;
RESET MASTER; RESET MASTER;
......
mysql-test/r/maria-purge.result
View file @ 6b89901c
set global storage_engine=maria; set global storage_engine=maria;
set session storage_engine=maria; set session storage_engine=maria;
set global maria_log_file_size=4294967296;
drop table if exists t1,t2; drop table if exists t1,t2;
SET SQL_WARNINGS=1; SET SQL_WARNINGS=1;
CREATE TABLE t1 ( CREATE TABLE t1 (
...@@ -32,51 +33,60 @@ insert into t2 select * from t1; ...@@ -32,51 +33,60 @@ insert into t2 select * from t1;
insert into t1 select * from t2; insert into t1 select * from t2;
insert into t2 select * from t1; insert into t2 select * from t1;
insert into t1 select * from t2; insert into t1 select * from t2;
set global maria_log_file_size=16777216;
set global maria_checkpoint_interval=30;
SHOW ENGINE maria logs;
Type Name Status
maria master-data/maria_log.00000002 in use
insert into t2 select * from t1; insert into t2 select * from t1;
insert into t1 select * from t2; insert into t1 select * from t2;
set global maria_checkpoint_interval=2; set global maria_checkpoint_interval=30;
SHOW ENGINE maria logs; SHOW ENGINE maria logs;
Type Name Status Type Name Status
maria master-data/maria_log.00000001 in use maria master-data/maria_log.00000004 in use
set global maria_log_file_size=16777216; set global maria_log_file_size=16777216;
select @@global.maria_log_file_size; select @@global.maria_log_file_size;
@@global.maria_log_file_size @@global.maria_log_file_size
16777216 16777216
set global maria_checkpoint_interval=30;
SHOW ENGINE maria logs; SHOW ENGINE maria logs;
Type Name Status Type Name Status
maria master-data/maria_log.00000002 in use maria master-data/maria_log.00000004 in use
set global maria_log_file_size=8388608; set global maria_log_file_size=8388608;
select @@global.maria_log_file_size; select @@global.maria_log_file_size;
@@global.maria_log_file_size @@global.maria_log_file_size
8388608 8388608
set global maria_log_purge_type=at_flush; set global maria_log_purge_type=at_flush;
insert into t1 select * from t2; insert into t1 select * from t2;
set global maria_checkpoint_interval=30;
SHOW ENGINE maria logs; SHOW ENGINE maria logs;
Type Name Status Type Name Status
maria master-data/maria_log.00000002 free
maria master-data/maria_log.00000003 free
maria master-data/maria_log.00000004 free maria master-data/maria_log.00000004 free
maria master-data/maria_log.00000005 in use maria master-data/maria_log.00000005 free
maria master-data/maria_log.00000006 free
maria master-data/maria_log.00000007 free
maria master-data/maria_log.00000008 in use
flush logs; flush logs;
SHOW ENGINE maria logs; SHOW ENGINE maria logs;
Type Name Status Type Name Status
maria master-data/maria_log.00000005 in use maria master-data/maria_log.00000008 in use
set global maria_log_file_size=16777216; set global maria_log_file_size=16777216;
set global maria_log_purge_type=external; set global maria_log_purge_type=external;
insert into t1 select * from t2; insert into t1 select * from t2;
set global maria_checkpoint_interval=30;
SHOW ENGINE maria logs; SHOW ENGINE maria logs;
Type Name Status Type Name Status
maria master-data/maria_log.00000005 free maria master-data/maria_log.00000008 free
maria master-data/maria_log.00000006 in use maria master-data/maria_log.00000009 in use
flush logs; flush logs;
SHOW ENGINE maria logs; SHOW ENGINE maria logs;
Type Name Status Type Name Status
maria master-data/maria_log.00000005 free maria master-data/maria_log.00000008 free
maria master-data/maria_log.00000006 in use maria master-data/maria_log.00000009 in use
set global maria_log_purge_type=immediate; set global maria_log_purge_type=immediate;
insert into t1 select * from t2; insert into t1 select * from t2;
set global maria_checkpoint_interval=30;
SHOW ENGINE maria logs; SHOW ENGINE maria logs;
Type Name Status Type Name Status
maria master-data/maria_log.00000007 in use maria master-data/maria_log.00000011 in use
maria master-data/maria_log.00000008 in use
drop table t1, t2; drop table t1, t2;
mysql-test/r/maria.result
View file @ 6b89901c
set global storage_engine=maria; set global storage_engine=maria;
set session storage_engine=maria; set session storage_engine=maria;
set global maria_log_file_size=4294967296;
drop table if exists t1,t2; drop table if exists t1,t2;
SET SQL_WARNINGS=1; SET SQL_WARNINGS=1;
CREATE TABLE t1 ( CREATE TABLE t1 (
...@@ -2048,7 +2049,7 @@ show variables like 'maria%'; ...@@ -2048,7 +2049,7 @@ show variables like 'maria%';
Variable_name Value Variable_name Value
maria_block_size 8192 maria_block_size 8192
maria_checkpoint_interval 30 maria_checkpoint_interval 30
maria_log_file_size 1073741824 maria_log_file_size 4294959104
maria_log_purge_type immediate maria_log_purge_type immediate
maria_max_sort_file_size 9223372036853727232 maria_max_sort_file_size 9223372036853727232
maria_pagecache_age_threshold 300 maria_pagecache_age_threshold 300
......
mysql-test/r/ps_maria.result
View file @ 6b89901c
set global maria_log_file_size=4294967296;
use test; use test;
drop table if exists t1, t9 ; drop table if exists t1, t9 ;
create table t1 create table t1
......
mysql-test/t/maria-big.test
View file @ 6b89901c
# Test of scenarios potentially too big for --valgrind or --mem # Test of scenarios potentially too big for --valgrind or --mem
-- source include/have_maria.inc
enable_info; enable_info;
set storage_engine=maria; set storage_engine=maria;
set global maria_log_file_size=4294967296;
disable_warnings; disable_warnings;
drop table if exists t1, t2; drop table if exists t1, t2;
enable_warnings; enable_warnings;
......
mysql-test/t/maria-connect.test
View file @ 6b89901c
...@@ -9,6 +9,8 @@ let $default=`select @@global.storage_engine`; ...@@ -9,6 +9,8 @@ let $default=`select @@global.storage_engine`;
set global storage_engine=maria; set global storage_engine=maria;
set session storage_engine=maria; set session storage_engine=maria;
set global maria_log_file_size=4294967296;
# Initialise # Initialise
--disable_warnings --disable_warnings
drop table if exists t1; drop table if exists t1;
......
mysql-test/t/maria-purge.test
View file @ 6b89901c
...@@ -6,6 +6,7 @@ set session storage_engine=maria; ...@@ -6,6 +6,7 @@ set session storage_engine=maria;
let $def_logsize=`select @@global.maria_log_file_size`; let $def_logsize=`select @@global.maria_log_file_size`;
let $def_checkinterval=`select @@global.maria_checkpoint_interval`; let $def_checkinterval=`select @@global.maria_checkpoint_interval`;
set global maria_log_file_size=4294967296;
# Initialise # Initialise
--disable_warnings --disable_warnings
drop table if exists t1,t2; drop table if exists t1,t2;
...@@ -19,6 +20,7 @@ CREATE TABLE t2 ( ...@@ -19,6 +20,7 @@ CREATE TABLE t2 (
STRING_DATA char(255) default NULL STRING_DATA char(255) default NULL
); );
INSERT INTO t1 VALUES ('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'); INSERT INTO t1 VALUES ('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');
INSERT INTO t1 VALUES ('DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD'); INSERT INTO t1 VALUES ('DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD');
insert into t2 select * from t1; insert into t2 select * from t1;
...@@ -43,16 +45,23 @@ insert into t2 select * from t1; ...@@ -43,16 +45,23 @@ insert into t2 select * from t1;
insert into t1 select * from t2; insert into t1 select * from t2;
insert into t2 select * from t1; insert into t2 select * from t1;
insert into t1 select * from t2; insert into t1 select * from t2;
set global maria_log_file_size=16777216;
eval set global maria_checkpoint_interval=$def_checkinterval;
--replace_regex /Size +[0-9]+ ; .+master-data/master-data/
SHOW ENGINE maria logs;
insert into t2 select * from t1; insert into t2 select * from t1;
insert into t1 select * from t2; insert into t1 select * from t2;
set global maria_checkpoint_interval=2;
eval set global maria_checkpoint_interval=$def_checkinterval;
--replace_regex /Size +[0-9]+ ; .+master-data/master-data/ --replace_regex /Size +[0-9]+ ; .+master-data/master-data/
SHOW ENGINE maria logs; SHOW ENGINE maria logs;
set global maria_log_file_size=16777216; set global maria_log_file_size=16777216;
select @@global.maria_log_file_size; select @@global.maria_log_file_size;
sleep 7; eval set global maria_checkpoint_interval=$def_checkinterval;
--replace_regex /Size +[0-9]+ ; .+master-data/master-data/ --replace_regex /Size +[0-9]+ ; .+master-data/master-data/
SHOW ENGINE maria logs; SHOW ENGINE maria logs;
set global maria_log_file_size=8388608; set global maria_log_file_size=8388608;
...@@ -60,7 +69,7 @@ select @@global.maria_log_file_size; ...@@ -60,7 +69,7 @@ select @@global.maria_log_file_size;
set global maria_log_purge_type=at_flush; set global maria_log_purge_type=at_flush;
insert into t1 select * from t2; insert into t1 select * from t2;
sleep 7; eval set global maria_checkpoint_interval=$def_checkinterval;
--replace_regex /Size +[0-9]+ ; .+master-data/master-data/ --replace_regex /Size +[0-9]+ ; .+master-data/master-data/
SHOW ENGINE maria logs; SHOW ENGINE maria logs;
flush logs; flush logs;
...@@ -70,7 +79,7 @@ SHOW ENGINE maria logs; ...@@ -70,7 +79,7 @@ SHOW ENGINE maria logs;
set global maria_log_file_size=16777216; set global maria_log_file_size=16777216;
set global maria_log_purge_type=external; set global maria_log_purge_type=external;
insert into t1 select * from t2; insert into t1 select * from t2;
sleep 7; eval set global maria_checkpoint_interval=$def_checkinterval;
--replace_regex /Size +[0-9]+ ; .+master-data/master-data/ --replace_regex /Size +[0-9]+ ; .+master-data/master-data/
SHOW ENGINE maria logs; SHOW ENGINE maria logs;
flush logs; flush logs;
...@@ -79,7 +88,7 @@ SHOW ENGINE maria logs; ...@@ -79,7 +88,7 @@ SHOW ENGINE maria logs;
set global maria_log_purge_type=immediate; set global maria_log_purge_type=immediate;
insert into t1 select * from t2; insert into t1 select * from t2;
sleep 7; eval set global maria_checkpoint_interval=$def_checkinterval;
--replace_regex /Size +[0-9]+ ; .+master-data/master-data/ --replace_regex /Size +[0-9]+ ; .+master-data/master-data/
SHOW ENGINE maria logs; SHOW ENGINE maria logs;
......
mysql-test/t/maria-recovery.test
View file @ 6b89901c
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_maria.inc --source include/have_maria.inc
set global maria_log_file_size=4294967296;
--disable_warnings --disable_warnings
drop database if exists mysqltest; drop database if exists mysqltest;
--enable_warnings --enable_warnings
......
mysql-test/t/maria.test
View file @ 6b89901c
...@@ -9,6 +9,8 @@ let $default=`select @@global.storage_engine`; ...@@ -9,6 +9,8 @@ let $default=`select @@global.storage_engine`;
set global storage_engine=maria; set global storage_engine=maria;
set session storage_engine=maria; set session storage_engine=maria;
set global maria_log_file_size=4294967296;
# Initialise # Initialise
--disable_warnings --disable_warnings
drop table if exists t1,t2; drop table if exists t1,t2;
......
mysql-test/t/ps_maria.test
View file @ 6b89901c
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
# NOTE: PLEASE SEE ps_1general.test (bottom) # NOTE: PLEASE SEE ps_1general.test (bottom)
# BEFORE ADDING NEW TEST CASES HERE !!! # BEFORE ADDING NEW TEST CASES HERE !!!
set global maria_log_file_size=4294967296;
use test; use test;
-- source include/have_maria.inc -- source include/have_maria.inc
......
storage/maria/ma_loghandler.c
View file @ 6b89901c
This diff is collapsed.
storage/maria/ma_loghandler.h
View file @ 6b89901c
...@@ -25,7 +25,12 @@ ...@@ -25,7 +25,12 @@
/* transaction log default flags (TODO: make it global variable) */ /* transaction log default flags (TODO: make it global variable) */
#define TRANSLOG_DEFAULT_FLAGS 0 #define TRANSLOG_DEFAULT_FLAGS 0
/* Transaction log flags */ /*
Transaction log flags.
We allow all kind protections to be switched on together for people who
really unsure in their hardware/OS.
*/
#define TRANSLOG_PAGE_CRC 1 #define TRANSLOG_PAGE_CRC 1
#define TRANSLOG_SECTOR_PROTECTION (1<<1) #define TRANSLOG_SECTOR_PROTECTION (1<<1)
#define TRANSLOG_RECORD_CRC (1<<2) #define TRANSLOG_RECORD_CRC (1<<2)
...@@ -81,7 +86,7 @@ struct st_maria_handler; ...@@ -81,7 +86,7 @@ struct st_maria_handler;
#define dirpos_korr(P) (*(uchar *) (P)) #define dirpos_korr(P) (*(uchar *) (P))
#define pagerange_korr(P) uint2korr(P) #define pagerange_korr(P) uint2korr(P)
#define clr_type_korr(P) (*(uchar *) (P)) #define clr_type_korr(P) (*(uchar *) (P))
#define key_nr_korr(P) ((P)[0]) #define key_nr_korr(P) (*(uchar *) (P))
#define ha_checksum_korr(P) uint4korr(P) #define ha_checksum_korr(P) uint4korr(P)
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7