into  neptunus.(none):/home/msvensson/mysql/bug15302/my51-bug15302


client/mysqltest.c:
  Auto merged
sql/sql_db.cc:
  Auto merged