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


mysql-test/r/read_only.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/t/read_only.test:
  Manual merge