-
unknown authored
into adventure.(none):/home/thek/Development/cpp/bug27440/my51-bug27440 mysql-test/r/read_only.result: Manual merge mysql-test/t/read_only.test: Manual merge sql/sql_parse.cc: Manual merge
c84a2850
into adventure.(none):/home/thek/Development/cpp/bug27440/my51-bug27440 mysql-test/r/read_only.result: Manual merge mysql-test/t/read_only.test: Manual merge sql/sql_parse.cc: Manual merge