Merging 


include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/net_serv.cc:
  #ifndef was removed