Merge authors:
Antony T Curtis (atcurtis)
hery.ramilison@sun.com
Igor Babaev (igorb-seattle)
Michael Widenius (monty)
Michael Widenius (monty)
Related merge proposals:
https://code.launchpad.net/~atcurtis/maria/maria-5.1-federatedx/+merge/14409
proposed by: Antony T Curtis (atcurtis)
review: Needs Fixing - Michael Widenius (monty)
------------------------------------------------------------
revno: 2775 [merge]
committer: Michael Widenius
branch nick: maria-5.1
timestamp: Thu 2009-12-03 13:34:11 +0200
message:
Merge
modified:
client/mysql.cc
client/mysqlcheck.c
client/mysqlslap.c
client/mysqltest.cc
mysql-test/lib/mtr_report.pm
mysql-test/mysql-test-run.pl
mysql-test/suite/federated/disabled.def
mysql-test/suite/federated/federated_server.result
mysql-test/suite/federated/federated_server.test
storage/federatedx/ha_federatedx.cc
unittest/mysys/Makefile.am
--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1
Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.
