increased compatibility
postmerge changing


sql/sql_class.h:
  increased compatibility
sql/sql_show.cc:
  postmerge changing
vio/viosocket.c:
  increased compatibility