mysql-test/r/isam.result:
  Fixing results to match test changes
sql/sql_union.cc:
  Better fix for VC++