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


client/mysqltest.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged