into sinisa.nasamreza.org:/mnt/work/mysql-4.1


mysql-test/r/union.result:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_table.cc:
  Auto merged