Added socket option
Merge branch 'mysql_rep_socket'