into  neptunus.(none):/home/msvensson/mysql/bug20589/my50-bug20589


scripts/mysql_fix_privilege_tables.sql:
  Auto merged