Skip to content

M
mariadb
Commit f84ce57c authored by unknown's avatar unknown
Browse files
Options

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria 

into  gbichot4.local:/home/mysql_src/mysql-maria-monty
parents edfa1629 5051a8e0
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 199 deletions
storage/maria/ma_check.c
View file @ f84ce57c
...@@ -5872,6 +5872,11 @@ static int write_log_record_for_repair(const HA_CHECK *param, MARIA_HA *info) ...@@ -5872,6 +5872,11 @@ static int write_log_record_for_repair(const HA_CHECK *param, MARIA_HA *info)
log_array[TRANSLOG_INTERNAL_PARTS + 0].length= sizeof(log_data); log_array[TRANSLOG_INTERNAL_PARTS + 0].length= sizeof(log_data);
share->now_transactional= 1; share->now_transactional= 1;
/**
@todo RECOVERY maria_chk --transaction-log may come here; to be sure
that ha_maria is not using the log too, we should do a my_lock() on the
control file when Maria starts.
*/
if (unlikely(translog_write_record(&lsn, LOGREC_REDO_REPAIR_TABLE, if (unlikely(translog_write_record(&lsn, LOGREC_REDO_REPAIR_TABLE,
&dummy_transaction_object, info, &dummy_transaction_object, info,
sizeof(log_data), sizeof(log_data),
......
storage/maria/ma_test_recovery
View file @ f84ce57c
...@@ -22,8 +22,10 @@ check_table_is_same() ...@@ -22,8 +22,10 @@ check_table_is_same()
{ {
# Computes checksum of new table and compares to checksum of old table # Computes checksum of new table and compares to checksum of old table
# Shows any difference in table's state (info from the index's header) # Shows any difference in table's state (info from the index's header)
# Data/key file length is random in ma_test2 (as it uses srand() which
# may differ between machines).
$maria_path/maria_chk -dvv $table | grep -v "Creation time:" > $tmp/maria_chk_message.txt 2>&1 $maria_path/maria_chk -dvv $table | grep -v "Creation time:" | grep -v "file length"> $tmp/maria_chk_message.txt 2>&1
$maria_path/maria_chk -s -e --read-only $table $maria_path/maria_chk -s -e --read-only $table
checksum2=`$maria_path/maria_chk -dss $table` checksum2=`$maria_path/maria_chk -dss $table`
...@@ -95,7 +97,7 @@ do ...@@ -95,7 +97,7 @@ do
$maria_path/$prog $maria_path/$prog
# derive table's name from program's name # derive table's name from program's name
table=`echo $prog | sed -e 's;.*ma_\(test[0-9]\).*;\1;' ` table=`echo $prog | sed -e 's;.*ma_\(test[0-9]\).*;\1;' `
$maria_path/maria_chk -dvv $table | grep -v "Creation time:"> $tmp/maria_chk_message.good.txt 2>&1 $maria_path/maria_chk -dvv $table | grep -v "Creation time:" | grep -v "file length"> $tmp/maria_chk_message.good.txt 2>&1
checksum=`$maria_path/maria_chk -dss $table` checksum=`$maria_path/maria_chk -dss $table`
mv $table.MAD $tmp/$table-good.MAD mv $table.MAD $tmp/$table-good.MAD
mv $table.MAI $tmp/$table-good.MAI mv $table.MAI $tmp/$table-good.MAI
...@@ -141,7 +143,7 @@ do ...@@ -141,7 +143,7 @@ do
$maria_path/$prog $commit_run_args $maria_path/$prog $commit_run_args
# derive table's name from program's name # derive table's name from program's name
table=`echo $prog | sed -e 's;.*ma_\(test[0-9]\).*;\1;' ` table=`echo $prog | sed -e 's;.*ma_\(test[0-9]\).*;\1;' `
$maria_path/maria_chk -dvv $table | grep -v "Creation time:"> $tmp/maria_chk_message.good.txt 2>&1 $maria_path/maria_chk -dvv $table | grep -v "Creation time:" | grep -v "file length"> $tmp/maria_chk_message.good.txt 2>&1
checksum=`$maria_path/maria_chk -dss $table` checksum=`$maria_path/maria_chk -dss $table`
mv $table.MAD $tmp/$table-good.MAD mv $table.MAD $tmp/$table-good.MAD
mv $table.MAI $tmp/$table-good.MAI mv $table.MAI $tmp/$table-good.MAI
...@@ -149,11 +151,13 @@ do ...@@ -149,11 +151,13 @@ do
echo "TEST WITH $prog $abort_run_args$test_undo (additional aborted work)" echo "TEST WITH $prog $abort_run_args$test_undo (additional aborted work)"
$maria_path/$prog $abort_run_args$test_undo $maria_path/$prog $abort_run_args$test_undo
cp $table.MAD $tmp/$table.MAD.before_undo cp $table.MAD $tmp/$table.MAD.before_undo
cp $table.MAI $tmp/$table.MAI.before_undo
# The lines below seem unneeded, will be removed soon
# We have to copy and restore logs, as running maria_read_log will # We have to copy and restore logs, as running maria_read_log will
# change the maria_control_file # change the maria_control_file
rm -f $tmp/maria_log.* $tmp/maria_log_control # rm -f $tmp/maria_log.* $tmp/maria_log_control
cp $maria_path/maria_log* $tmp # cp $maria_path/maria_log* $tmp
if [ "$test_undo" != "3" ] if [ "$test_undo" != "3" ]
then then
...@@ -163,6 +167,7 @@ do ...@@ -163,6 +167,7 @@ do
apply_log "dontknow" apply_log "dontknow"
fi fi
cp $table.MAD $tmp/$table.MAD.after_undo cp $table.MAD $tmp/$table.MAD.after_undo
cp $table.MAI $tmp/$table.MAI.after_undo
# It is impossible to do a "cmp" between .good and .after_undo, # It is impossible to do a "cmp" between .good and .after_undo,
# because the UNDO phase generated log # because the UNDO phase generated log
...@@ -174,12 +179,17 @@ do ...@@ -174,12 +179,17 @@ do
echo "testing idempotency" echo "testing idempotency"
apply_log "shouldnotchangelog" apply_log "shouldnotchangelog"
cmp $table.MAD $tmp/$table.MAD.after_undo cmp $table.MAD $tmp/$table.MAD.after_undo
# can't do this, creation time differs at least; enable it if you
# have a "cmp" which ignores the header.
# cmp $table.MAI $tmp/$table.MAI.after_undo
check_table_is_same check_table_is_same
echo "testing applying of CLRs to recreate table" echo "testing applying of CLRs to recreate table"
rm $table.MA? rm $table.MA?
cp $tmp/maria_log* $maria_path # cp $tmp/maria_log* $maria_path #unneeded
apply_log "dontknow" apply_log "shouldnotchangelog"
cmp $table.MAD $tmp/$table.MAD.after_undo cmp $table.MAD $tmp/$table.MAD.after_undo
# can't do this, creation time differs at least
# cmp $table.MAI $tmp/$table.MAI.after_undo
check_table_is_same check_table_is_same
shift 3 shift 3
done done
......
storage/maria/ma_test_recovery.expected
View file @ f84ce57c
...@@ -51,10 +51,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -51,10 +51,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -64,10 +60,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -64,10 +60,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -77,10 +69,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -77,10 +69,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N --testflag=2 --test-undo=2 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N --testflag=2 --test-undo=2 (additional aborted work)
...@@ -121,10 +109,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -121,10 +109,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -134,10 +118,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -134,10 +118,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -147,10 +127,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -147,10 +127,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N --testflag=2 --test-undo=3 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N --testflag=2 --test-undo=3 (additional aborted work)
...@@ -191,10 +167,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -191,10 +167,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -204,10 +176,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -204,10 +176,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -217,10 +185,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -217,10 +185,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N --testflag=2 --test-undo=4 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N --testflag=2 --test-undo=4 (additional aborted work)
...@@ -261,10 +225,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -261,10 +225,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -274,10 +234,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -274,10 +234,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -287,10 +243,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -287,10 +243,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N -b --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N -b --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N -b --testflag=2 --test-undo=1 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N -b --testflag=2 --test-undo=1 (additional aborted work)
...@@ -331,10 +283,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -331,10 +283,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -344,10 +292,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -344,10 +292,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -357,10 +301,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -357,10 +301,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N -b --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N -b --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N -b --testflag=2 --test-undo=2 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N -b --testflag=2 --test-undo=2 (additional aborted work)
...@@ -401,10 +341,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -401,10 +341,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -414,10 +350,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -414,10 +350,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -427,10 +359,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -427,10 +359,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N -b --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N -b --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N -b --testflag=2 --test-undo=3 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N -b --testflag=2 --test-undo=3 (additional aborted work)
...@@ -471,10 +399,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -471,10 +399,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 147456 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -484,10 +408,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -484,10 +408,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 147456 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -497,10 +417,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -497,10 +417,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 147456 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N -b --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N -b --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N -b --testflag=2 --test-undo=4 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N -b --testflag=2 --test-undo=4 (additional aborted work)
...@@ -541,10 +457,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -541,10 +457,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -554,10 +466,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -554,10 +466,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -567,10 +475,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -567,10 +475,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=2 --test-undo=1 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=2 --test-undo=1 (additional aborted work)
...@@ -611,10 +515,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -611,10 +515,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -624,10 +524,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -624,10 +524,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -637,10 +533,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -637,10 +533,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=2 --test-undo=2 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=2 --test-undo=2 (additional aborted work)
...@@ -681,10 +573,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -681,10 +573,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -694,10 +582,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -694,10 +582,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -707,10 +591,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -707,10 +591,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=2 --test-undo=3 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=2 --test-undo=3 (additional aborted work)
...@@ -751,10 +631,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -751,10 +631,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -764,10 +640,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -764,10 +640,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -777,10 +649,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -777,10 +649,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=2 --test-undo=4 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N -H1 --testflag=2 --test-undo=4 (additional aborted work)
...@@ -821,10 +689,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -821,10 +689,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -834,10 +698,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -834,10 +698,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -847,10 +707,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -847,10 +707,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 114688 Keyfile length: 204800
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=2 --test-undo=1 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=2 --test-undo=1 (additional aborted work)
...@@ -891,10 +747,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -891,10 +747,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -904,10 +756,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -904,10 +756,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -917,10 +765,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -917,10 +765,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=2 --test-undo=2 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=2 --test-undo=2 (additional aborted work)
...@@ -961,10 +805,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -961,10 +805,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -974,10 +814,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -974,10 +814,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -987,10 +823,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -987,10 +823,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=2 --test-undo=3 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=2 --test-undo=3 (additional aborted work)
...@@ -1031,10 +863,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -1031,10 +863,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 147456 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -1044,10 +872,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -1044,10 +872,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 147456 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -1057,10 +881,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -1057,10 +881,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 147456 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=1 (commit at end) TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=1 (commit at end)
TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=2 --test-undo=4 (additional aborted work) TEST WITH ma_test1 -s -M -T -c -N -b -H1 --testflag=2 --test-undo=4 (additional aborted work)
...@@ -1101,10 +921,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -1101,10 +921,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing idempotency testing idempotency
applying log applying log
...@@ -1114,10 +930,6 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -1114,10 +930,6 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
testing applying of CLRs to recreate table testing applying of CLRs to recreate table
applying log applying log
...@@ -1127,8 +939,4 @@ Differences in maria_chk -dvv, recovery not yet perfect ! ...@@ -1127,8 +939,4 @@ Differences in maria_chk -dvv, recovery not yet perfect !
< Status: checked,analyzed,optimized keys,sorted index pages < Status: checked,analyzed,optimized keys,sorted index pages
--- ---
> Status: changed > Status: changed
11c11
< Datafile length: 8192 Keyfile length: 8192
---
> Datafile length: 155648 Keyfile length: 212992
========DIFF END======= ========DIFF END=======
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