vio/viosocket.c:
  Auto merged
mysql-test/t/group_by.test:
  Use local file
sql/sql_parse.cc:
  Merge with 4.0 to get bug fix for reconnect problem