3440 magnus.blaudd@stripped 2011-11-21
cherry pick fix for problem with federated_plugin and --embedded
modified:
mysql-test/suite/federated/federated_plugin.test
3439 magnus.blaudd@stripped 2011-11-18
cherrypick fix for bug 12320827 into trunk-cluster-base
modified:
mysql-test/suite/innodb/r/innodb_monitor.result
mysql-test/suite/innodb/t/innodb_monitor.test
=== modified file 'mysql-test/suite/federated/federated_plugin.test'
--- a/mysql-test/suite/federated/federated_plugin.test 2011-09-15 11:09:24 +0000
+++ b/mysql-test/suite/federated/federated_plugin.test 2011-11-21 09:04:37 +0000
@@ -1,3 +1,4 @@
+--source include/not_embedded.inc
--source include/have_federated_plugin.inc
# Uninstall will not uninstall if ps has been used
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (magnus.blaudd:3439 to 3440) | magnus.blaudd | 21 Nov |