into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime


sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged