-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG33946/mysql-5.1-engines mysql-test/r/federated.result: Manual merge. mysql-test/t/federated.test: Manual merge. storage/federated/ha_federated.cc: Manual merge.
8ecceaf2
into mysql.com:/home/svoj/devel/mysql/BUG33946/mysql-5.1-engines mysql-test/r/federated.result: Manual merge. mysql-test/t/federated.test: Manual merge. storage/federated/ha_federated.cc: Manual merge.