Merge authors: Michael Widenius (monty) ------------------------------------------------------------ revno: 2753 [merge] committer: Michael Widenius <monty@askmonty.org> branch nick: maria-5.1 timestamp: Fri 2009-10-30 22:16:08 +0200 message: Merge of FederatedX code added: storage/federated/README storage/federatedx/ storage/federatedx/AUTHORS storage/federatedx/CMakeFiles.txt storage/federatedx/ChangeLog storage/federatedx/FAQ storage/federatedx/Makefile.am storage/federatedx/README storage/federatedx/README.windows storage/federatedx/TODO storage/federatedx/federatedx_io.cc storage/federatedx/federatedx_io_mysql.cc storage/federatedx/federatedx_io_null.cc storage/federatedx/federatedx_probes.h storage/federatedx/federatedx_txn.cc storage/federatedx/ha_federatedx.cc storage/federatedx/ha_federatedx.h storage/federatedx/plug.in renamed: storage/federated/plug.in => storage/federated/plug.in.disabled modified: .bzrignore client/mysqladmin.cc extra/yassl/taocrypt/src/twofish.cpp libmysqld/Makefile.am mysql-test/mysql-test-run.pl mysql-test/suite/federated/disabled.def mysql-test/suite/federated/federated.result mysql-test/suite/federated/federated.test mysql-test/suite/federated/federated_archive.result mysql-test/suite/federated/federated_bug_13118.result mysql-test/suite/federated/federated_bug_25714.result mysql-test/suite/federated/federated_cleanup.inc mysql-test/suite/federated/federated_innodb.result mysql-test/suite/federated/federated_server.result mysql-test/suite/federated/federated_server.test mysql-test/suite/federated/federated_transactions.result mysql-test/valgrind.supp storage/pbxt/src/cache_xt.cc storage/xtradb/include/buf0buf.ic The size of the diff (6093 lines) is larger than your specified limit of 5000 lines -- 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.