List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:August 25 2010 2:35pm
Subject:bzr push into mysql-5.1-mtr branch (bjorn.munch:2924 to 2925)
View as plain text  
 2925 Bjorn Munch	2010-08-25
      Cherry pick 55501

    modified:
      mysql-test/include/have_innodb_plugin.inc
 2924 Bjorn Munch	2010-08-25
      Bug #52301 Add --protocol to mysqltest
      Added code resulted in strange linking problem for embedded on Windows
      Avoided by not doing this for embedded mode
      It's irrelevant for embedded server anyway, --protocol will be ignored

    modified:
      client/mysqltest.cc
=== 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/bjorn.munch@oracle.com-20100825143431-vu3vpgpkbzsuuyj8.bundle
Thread
bzr push into mysql-5.1-mtr branch (bjorn.munch:2924 to 2925) Bjorn Munch25 Aug