BitKeeper/etc/logging_ok:
  auto-union
mysql-test/t/insert_select.test:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/r/insert_select.result:
  SCCS merged
sql/sql_insert.cc:
  merge changes
sql/sql_table.cc:
  e
  merge changes