[Maria-developers] Rev 24: Merge. in file:///Users/hakan/work/monty_program/mariadb-tools/