into  shellback.(none):/home/msvensson/mysql/work/my51-work


sql/mysqld.cc:
  Auto merged
vio/viosocket.c:
  Auto merged