Merge neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554

into  neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554


sql/ha_berkeley.cc:
  Merge 4.0 -> 4.1, change is already in 4.1