bzr commit into mysql-5.1-mtr branch (bjorn.munch:2925)

[Bjorn Munch]

#At file:///home/bm136801/my/merge-51/ based on revid:bjorn.munch@stripped

 2925 Bjorn Munch	2010-08-25
      Cherry pick 55501

    modified:
      mysql-test/include/have_innodb_plugin.inc
=== modified file 'mysql-test/include/have_innodb_plugin.inc'
--- a/mysql-test/include/have_innodb_plugin.inc	2010-04-09 12:56:51 +0000
+++ b/mysql-test/include/have_innodb_plugin.inc	2010-08-25 14:34:31 +0000
@@ -1,3 +1,4 @@
+--source include/not_embedded.inc
 disable_query_log;
 --require r/true.require
 SELECT (plugin_library LIKE 'ha_innodb_plugin%') AS `TRUE` FROM information_schema.plugins WHERE LOWER(plugin_name) = 'innodb' AND LOWER(plugin_status) = 'active';


Attachment: [text/bzr-bundle] bzr/[e-mail]