Merge magare.gmz:/home/kgeorge/mysql/work/B30193-5.0-opt

into  magare.gmz:/home/kgeorge/mysql/work/B30193-5.1-opt


sql/sql_table.cc:
  null merge of a 5.1 fix backport