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


sql/table.cc:
  Merge BUG#15020  from 5.0 -> 5.1