diff options
| author | Michael Widenius <monty@mariadb.org> | 2021-08-25 22:12:15 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2021-08-26 07:07:46 +0300 |
| commit | c9851d35adb1675ce204b2c77ac57da9023792ac (patch) | |
| tree | 17162be9639af6194c18b12ee07f5a10ab4d8797 | |
| parent | 9f8871db2f0bcf27b05e6be34c262173b8026c80 (diff) | |
| download | mariadb-git-c9851d35adb1675ce204b2c77ac57da9023792ac.tar.gz | |
Fixed failing maria.repair test
Backported patch from MariaDB 10.6
The issue was that the using session_mem_used to break a test does not
guarantee where the test breaks, which gives different results
depending on the environment or how MariaDB is compield.
| -rw-r--r-- | mysql-test/suite/maria/repair.result | 7 | ||||
| -rw-r--r-- | mysql-test/suite/maria/repair.test | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/mysql-test/suite/maria/repair.result b/mysql-test/suite/maria/repair.result index 296f251aa36..722d9f28712 100644 --- a/mysql-test/suite/maria/repair.result +++ b/mysql-test/suite/maria/repair.result @@ -29,12 +29,5 @@ CREATE TABLE t1 (i INT) ENGINE=Aria; INSERT INTO t1 VALUES (1); SET max_session_mem_used=50000; REPAIR LOCAL TABLE t1 USE_FRM; -Table Op Msg_type Msg_text -t1 repair error Failed to open partially repaired table -Warnings: -Error 1290 The MariaDB server is running with the --max-thread-mem-used=50000 option so it cannot execute this statement REPAIR LOCAL TABLE t1; -Table Op Msg_type Msg_text -test.t1 repair Error The MariaDB server is running with the --max-thread-mem-used=50000 option so it cannot execute this statement -test.t1 repair error Corrupt DROP TABLE t1; diff --git a/mysql-test/suite/maria/repair.test b/mysql-test/suite/maria/repair.test index 13165269b76..571f861c512 100644 --- a/mysql-test/suite/maria/repair.test +++ b/mysql-test/suite/maria/repair.test @@ -36,6 +36,8 @@ DROP TABLE t1; CREATE TABLE t1 (i INT) ENGINE=Aria; INSERT INTO t1 VALUES (1); SET max_session_mem_used=50000; +--disable_result_log REPAIR LOCAL TABLE t1 USE_FRM; REPAIR LOCAL TABLE t1; +--enable_result_log DROP TABLE t1; |