diff options
| author | Monty <monty@mariadb.org> | 2021-06-02 18:29:30 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2021-06-07 12:11:35 +0300 |
| commit | f456e716feac2fe9a2b1eb5247128c271e1a4e83 (patch) | |
| tree | 5aece60d301cf5a62db4ab42ed598ebcd13e07eb | |
| parent | d4a6e3a6988e47e826e4c7cf770c38a94cb58d43 (diff) | |
| download | mariadb-git-f456e716feac2fe9a2b1eb5247128c271e1a4e83.tar.gz | |
Make maria.repair more resiliant for different failures
This is because on different compilation and server configurations the
memory usage is different and the query can get killed in different places
with different error messages as a result.
Reviewer: None (trival change)
| -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; |