Mark, Chris: Can you try this change with MariaDB 10.1.40 and see if it
works for you?