merge with 3.23.42
monty@work.mysql.com authored
447c1895