mysql-test/t/xxx.test got changed to mysql-test/main/xxx.test Use the parts of the merge commit: https://github.com/MariaDB/server/commit/1c587481966abc7a9ad5309d0a91ca920f7... On Mon, Oct 5, 2020 at 4:01 PM Otto Kekäläinen <otto@kekalainen.net> wrote:
Hello!
After uploading MariaDB 10.5.5 to Debian I came across that the test main.mysqld--help is failing on arch x32:
****************** main.mysqld--help 'unix' w1 [ fail ] Test ended at 2020-09-28 19:24:57
CURRENT_TEST: main.mysqld--help --- /<<PKGBUILDDIR>>/mysql-test/main/mysqld--help.result 2020-08-07 12:57:35.000000000 +0000 +++ /<<PKGBUILDDIR>>/mysql-test/main/mysqld--help.reject 2020-09-28 19:24:57.628353544 +0000 @@ -1797,10 +1797,10 @@ sync-relay-log-info 10000 sysdate-is-now FALSE system-versioning-alter-history ERROR -table-cache 421 +table-cache 2000 table-definition-cache 400 -table-open-cache 421 -table-open-cache-instances 1 +table-open-cache 2000 +table-open-cache-instances 8 tc-heuristic-recover OFF tcp-keepalive-interval 0 tcp-keepalive-probes 0
main.flush_logs_not_windows w2 [ fail ] Test ended at 2020-09-28 19:25:55
CURRENT_TEST: main.flush_logs_not_windows mysqltest: At line 10: query 'flush logs' succeeded - should have failed with errno 1004... ******************
Any tips on what to do about this?
On Zulip I was tipped about https://github.com/MariaDB/server/commit/deb365581b96527c5c96b3f5ed1235e1054... but it does not apply on 10.5.