Fix ./mtr --embedded

This fixes up commit 3d241eb
MariaDB · Jun 10, 2022 · 51ca5d5 · 51ca5d5
1 parent e11b82f
commit 51ca5d5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/mysql-test/suite/maria/encrypt-no-key.result b/mysql-test/suite/maria/encrypt-no-key.result
@@ -6,12 +6,12 @@ create table t1 (pk int primary key, a int, key(a)) engine=aria transactional=1;
 alter table t1 disable keys;
 insert into t1 values  (1,1);
 alter table t1 enable keys;
-ERROR HY000: Unknown key id 1 for ./test/t1. Can't continue!
+ERROR HY000: Unknown key id 1 for test/t1. Can't continue!
 repair table t1 use_frm;
 Table	Op	Msg_type	Msg_text
 test.t1	repair	warning	Number of rows changed from 0 to 1
-test.t1	repair	Error	Unknown key id 1 for ./test/t1. Can't continue!
-test.t1	repair	Error	Unknown key id 1 for ./test/t1. Can't continue!
+test.t1	repair	Error	Unknown key id 1 for test/t1. Can't continue!
+test.t1	repair	Error	Unknown key id 1 for test/t1. Can't continue!
 test.t1	repair	status	OK
 drop table t1;
 set global aria_encrypt_tables= default;
diff --git a/mysql-test/suite/maria/encrypt-no-key.test b/mysql-test/suite/maria/encrypt-no-key.test
@@ -10,9 +10,11 @@ create table t1 (pk int primary key, a int, key(a)) engine=aria transactional=1;
 alter table t1 disable keys;
 insert into t1 values  (1,1);
 --replace_result \\ /
+--replace_regex /for .*test/for test/
 --error 192
 alter table t1 enable keys;
 --replace_result \\ /
+--replace_regex /for .*test/for test/
 repair table t1 use_frm;
 drop table t1;
 set global aria_encrypt_tables= default;
diff --git a/mysql-test/suite/maria/maria-recover.result b/mysql-test/suite/maria/maria-recover.result
@@ -26,9 +26,9 @@ a
 ThursdayMorningsMarket
 ThursdayMorningsMarketb
 Warnings:
-Error	145	Got error '145 "Table was marked as crashed and should be repaired"' for './mysqltest/t_corrupted2'
+Error	145	Got error '145 "Table was marked as crashed and should be repaired"' for 't_corrupted2'
 Warning	1034	1 client is using or hasn't closed the table properly
-Error	176	Got error '176 "Read page with wrong checksum"' for './mysqltest/t_corrupted2.MAI'
+Error	176	Got error '176 "Read page with wrong checksum"' for 't_corrupted2.MAI'
 Error	1034	Can't read indexpage from page: 1, error: 176
 select * from t_corrupted2;
 a

diff --git a/mysql-test/suite/maria/maria-recover.test b/mysql-test/suite/maria/maria-recover.test
@@ -79,6 +79,7 @@ perl;
     close FILE;
 EOF
 --replace_result \\ /
+--replace_regex /for '.*t_corrupted2/for 't_corrupted2/
 --enable_prepare_warnings
 select * from t_corrupted2; # should show corruption and repair messages
 --disable_prepare_warnings