into narttu.mysql.fi:/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
sql/unireg.cc:
  Auto merged