-
unknown authored
into synthia.local:/home/mydev/mysql-5.1-axmrg mysql-test/r/federated.result: Auto merged mysql-test/t/federated.test: Auto merged include/my_base.h: Manual merge sql/sql_insert.cc: Manual merge storage/federated/ha_federated.cc: Manual merge storage/federated/ha_federated.h: Manual merge
6b125058