Fix valgrind warning + post-merge fixes.
konstantin@mysql.com authored
9e10645c