Skip to content

Commit 51ca5d5

Browse files
committed
Fix ./mtr --embedded
This fixes up commit 3d241eb
1 parent e11b82f commit 51ca5d5

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

mysql-test/suite/maria/encrypt-no-key.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ create table t1 (pk int primary key, a int, key(a)) engine=aria transactional=1;
66
alter table t1 disable keys;
77
insert into t1 values (1,1);
88
alter table t1 enable keys;
9-
ERROR HY000: Unknown key id 1 for ./test/t1. Can't continue!
9+
ERROR HY000: Unknown key id 1 for test/t1. Can't continue!
1010
repair table t1 use_frm;
1111
Table Op Msg_type Msg_text
1212
test.t1 repair warning Number of rows changed from 0 to 1
13-
test.t1 repair Error Unknown key id 1 for ./test/t1. Can't continue!
14-
test.t1 repair Error Unknown key id 1 for ./test/t1. Can't continue!
13+
test.t1 repair Error Unknown key id 1 for test/t1. Can't continue!
14+
test.t1 repair Error Unknown key id 1 for test/t1. Can't continue!
1515
test.t1 repair status OK
1616
drop table t1;
1717
set global aria_encrypt_tables= default;

mysql-test/suite/maria/encrypt-no-key.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ create table t1 (pk int primary key, a int, key(a)) engine=aria transactional=1;
1010
alter table t1 disable keys;
1111
insert into t1 values (1,1);
1212
--replace_result \\ /
13+
--replace_regex /for .*test/for test/
1314
--error 192
1415
alter table t1 enable keys;
1516
--replace_result \\ /
17+
--replace_regex /for .*test/for test/
1618
repair table t1 use_frm;
1719
drop table t1;
1820
set global aria_encrypt_tables= default;

mysql-test/suite/maria/maria-recover.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ a
2626
ThursdayMorningsMarket
2727
ThursdayMorningsMarketb
2828
Warnings:
29-
Error 145 Got error '145 "Table was marked as crashed and should be repaired"' for './mysqltest/t_corrupted2'
29+
Error 145 Got error '145 "Table was marked as crashed and should be repaired"' for 't_corrupted2'
3030
Warning 1034 1 client is using or hasn't closed the table properly
31-
Error 176 Got error '176 "Read page with wrong checksum"' for './mysqltest/t_corrupted2.MAI'
31+
Error 176 Got error '176 "Read page with wrong checksum"' for 't_corrupted2.MAI'
3232
Error 1034 Can't read indexpage from page: 1, error: 176
3333
select * from t_corrupted2;
3434
a

mysql-test/suite/maria/maria-recover.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ perl;
7979
close FILE;
8080
EOF
8181
--replace_result \\ /
82+
--replace_regex /for '.*t_corrupted2/for 't_corrupted2/
8283
--enable_prepare_warnings
8384
select * from t_corrupted2; # should show corruption and repair messages
8485
--disable_prepare_warnings

0 commit comments

Comments
 (0)