merge MysqlClient.h/cpp -> x.hpp