after merge fix


sql/item_subselect.cc:
  revision of fix_fields calls in subqueries transformation
sql/sql_prepare.cc:
  after merge fix