mysql2 improvements