summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Elkin <andrei.elkin@mariadb.com>2020-08-20 15:32:35 +0300
committerOleksandr Byelkin <sanja@mariadb.com>2020-09-04 07:53:00 +0200
commit596526fb6543942d3744c5b09717f664013a3160 (patch)
treecc6b1a45f06a8481d48369b747ccec93d0df7e2d
parentacd143b6787bbc39d7482fbd57699d9fe0a5d13a (diff)
downloadmariadb-git-596526fb6543942d3744c5b09717f664013a3160.tar.gz
MDEV-23511 shutdown_server 10 times out, causing server kill at shutdown
Shutdown of mtr tests may be too impatient, esp on CI environment where 10 seconds of `arg` of `shutdown_server arg` may not be enough for the clean shutdown to complete. This is fixed to remove explicit non-zero timeout argument to `shutdown_server` from all mtr tests. mysqltest computes 60 seconds default value for the timeout for the argless `shutdown_server` command. This policy is additionally ensured with a compile time assert.
m---------libmariadb0
m---------wsrep-lib0
2 files changed, 0 insertions, 0 deletions
diff --git a/libmariadb b/libmariadb
-Subproject a746c3af449a8754e78ad7971e59e79af7957cd
+Subproject ce74fd0c4009ed9f4bcbdb4a01e96c823e961dc
diff --git a/wsrep-lib b/wsrep-lib
-Subproject ae4e58ba031587039c8830f2f8ca51fa9fb7d6e
+Subproject d0255569b0154e23c5461ed13928f9b0a18008e