sql/sql_view.cc:
  name of variable changed to make merge easy
  removed charset field
sql/table.h:
  removed charset field
  layout fixed