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


sql/sql_derived.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged