into mdk10.(none):/home/reggie/bk/mysql-5.0


sql/spatial.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged