Merge pilot.(none):/data/msvensson/mysql/bug30593/my50-bug30593

into  pilot.(none):/data/msvensson/mysql/bug30593/my51-bug30593


sql/sql_show.cc:
  Use local, code moved in 5.1 and is already