From: Bjorn Munch
Date: August 25 2010 2:35pm
Subject: bzr push into mysql-5.1-mtr branch (bjorn.munch:2924 to 2925)
List-Archive: http://lists.mysql.com/commits/116764
Message-Id: <201008251435.o7PEZP4J006578@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1820646721=="

--===============1820646721==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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';


--===============1820646721==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/merge-51/
# testament_sha1: 96124f45fb3912149ba860baeda0bbb61255e0d1
# timestamp: 2010-08-25 16:35:25 +0200
# source_branch: file:///home/bm136801/my/mysql-5.1/
# base_revision_id: bjorn.munch@stripped\
#   4j9e5a8w6a9pspsb
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYrC378AAWLfgAAQUGP/91oC
AAC////wUAMmylWA9mu4SSFU9pkwKeTTTRppqngT1TJ5Q8oMkUzAE1PKJ6CaGQANAYSSGkamNTVP
yp4ZKbU0PRHojE09TGGhpoAaAA0AAMhoElFNGT0npDQAZD1AAHqBwtM6yawscviV0aVTM1jnWQnm
K2z6rxA0HyzpjvF10euz5fDQYI5Jvt9pkmZF7q9hWRCLlPqaqyqurfEBS1qR/KFrJGLWvi0g0tgw
LRCbSkB7l1HUEENR3IdIzCi0rxVWJmgCnuBkNexwB4yFxXN6l0yY19LaT4CAPzBV8YckkOGi5uwR
942rJMhKSV1gHQdQQyOMBFeDQbJgvP3e9c5VFco7SBEVi2WmeA9m+R/QdrgMDQwxCggKAsraIW1m
NQEoFSaLHm3BpycoGDJjYdyNqyZdnPnLFc0Dq579V0NMj+mItGIvPajxLW8+xzt4LfjittDROzNZ
DmMYaqLINusz/md05MVl4xpgqlJmg0pgcRZCilrCxIb9ssYRDxExPLAXwlHCIVycfJnhOJKCabOW
BOxo5eBw306ZkW7vPx7ZiNEjJjzkPmmle4ZLWvUcC8reFhVyVyx6HfukTkzg500P4RIt2KlZY78N
hr4ezYuRWStA+cFxMhneW6iu5JthUVlPA288KMnSAuHtpWZIed0inCLe1/xdJGnptz1H4VcdJJPx
KPqSPPnDS8E2T4VNRDWndMqenIdL0UobbepPTReb3M6++bS0PLj3iUJlqsrs2a691/40NGDk6ze1
JGQiOeOclrjafV5l8RUIeqhUmDJGgO3c+5fXapdS47Y1FGvVimi4FO5PH3c1MaX5hQ9f7fZCVH5D
F1+ERdlV4kENWQVAQzg4HNCxaSGEYXYVzSk6r5d0iCv2bjA57rIu5HkI+r0lBQEQX0iY2sIgKTTZ
d66d9USZMqurvkC/Tg0TskfgLF+UjdFUrruGr1syeQ4ihzFgpLdMao/azZ+21TJLjHBEeM5VpJ2o
JZR28XHMWJ1mn43xY5bKuH3jQ5NPrRdLlcjuFGusKyXl9BElx1BGMvANAcAtDfcDCzxvQ8P9YIfF
gtAmvoT1gD2LKLyrjBpIn0hOJ8o6kjNqF/F3JFOFCQisLfvw


--===============1820646721==--