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


client/mysqltest.c:
  Auto merged
sql/sql_error.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged