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


mysql-test/r/derived.result:
  Auto merged