diff options
| author | Monty <monty@mariadb.org> | 2022-10-18 19:44:07 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2022-10-19 12:23:42 +0300 |
| commit | 81ad6787cc0a6df59e1115e307a2429daa11e079 (patch) | |
| tree | 6d3c5ef7c35910bc997bc22e9c02bf31dc48e9cf /mysql-test | |
| parent | 55227234ccbc6a05e8a196c7f37879d0f6c9aeaa (diff) | |
| download | mariadb-git-81ad6787cc0a6df59e1115e307a2429daa11e079.tar.gz | |
MDEV-29508 perfschema.short_option_1 fails with MSAN - Error in accept
This was caused by the short_option_1-master.opt file that had the
option -T12, which means (among other things) to use blocking for
sockets. This was supported up to MariaDB 10.4, but not in 10.5 where
we removed the code that changes blocking sockets to non blocking in
case of errors.
Fixed by ignoring the TEST_BLOCKING flag and also by not using the -T12
argument in short_option_1.
Other things:
- Added back support for valgrind (the original issue had nothing to
do with valgrind).
- While debugging I noticed that the retry loop in
handle_connections_sockets() was doing a lot of work during shutdown.
Fixed by not doing retrys during shutdown.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/perfschema/t/short_option_1-master.opt | 2 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/t/short_option_1.test | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/suite/perfschema/t/short_option_1-master.opt b/mysql-test/suite/perfschema/t/short_option_1-master.opt index a9cda7a08ed..3b57e0826c0 100644 --- a/mysql-test/suite/perfschema/t/short_option_1-master.opt +++ b/mysql-test/suite/perfschema/t/short_option_1-master.opt @@ -1 +1 @@ --a -Cutf8 --collation-server=utf8_bin -T12 -W2 +-a -Cutf8 --collation-server=utf8_bin -W2 diff --git a/mysql-test/suite/perfschema/t/short_option_1.test b/mysql-test/suite/perfschema/t/short_option_1.test index fbfbdda1bbc..29ddaf43263 100644 --- a/mysql-test/suite/perfschema/t/short_option_1.test +++ b/mysql-test/suite/perfschema/t/short_option_1.test @@ -1,5 +1,4 @@ # Work around MDEV-29508 ---source include/not_valgrind.inc # Tests for PERFORMANCE_SCHEMA # Check server start for short server start options |