diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-14 16:19:29 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-14 16:19:29 +0300 |
| commit | 813986a6473b23485654d50d3593f1c9aa3658d8 (patch) | |
| tree | 6d96eb570ee044c245e055713f366221775cfb39 /mysql-test/suite/maria | |
| parent | 62419b1733042c30414a4feed89c79aebb5621af (diff) | |
| parent | 42d3a7b63d9313bffa91d4c6c5977fda42005d26 (diff) | |
| download | mariadb-git-813986a6473b23485654d50d3593f1c9aa3658d8.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'mysql-test/suite/maria')
| -rw-r--r-- | mysql-test/suite/maria/encrypt-no-key.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/maria/encrypt-no-key.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/maria/maria-recover.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/maria/maria-recover.test | 1 |
4 files changed, 8 insertions, 5 deletions
diff --git a/mysql-test/suite/maria/encrypt-no-key.result b/mysql-test/suite/maria/encrypt-no-key.result index bdc8a79ff9a..5229158d525 100644 --- 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 index eebc2a102d3..1157263ca79 100644 --- 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 index 788cd7eaf5a..7bb90cc0405 100644 --- 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 index cea185e7ab5..5ddfd6d202e 100644 --- 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 |