From: Bjorn Munch
Date: August 26 2010 1:14pm
Subject: bzr commit into mysql-5.1-bugteam branch (bjorn.munch:3491)
List-Archive: http://lists.mysql.com/commits/116881
Message-Id: <201008261314.o7QDEwxw007071@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1187018467=="

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

#At file:///home/bm136801/my/mysql-5.1-bugteam/ based on revid:alexey.kopytov@stripped

 3491 Bjorn Munch	2010-08-26
      Reduced #ifndef for 52301, caused compile warning

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-08-25 20:49:52 +0000
+++ b/client/mysqltest.cc	2010-08-26 13:14:50 +0000
@@ -5220,10 +5220,8 @@ void do_connect(struct st_command *comma
   }
 #endif
 
-#ifndef EMBEDDED_LIBRARY
   if (opt_protocol)
     mysql_options(&con_slot->mysql, MYSQL_OPT_PROTOCOL, (char*) &opt_protocol);
-#endif
 
 #ifdef HAVE_SMEM
   if (con_shm)
@@ -7936,10 +7934,8 @@ int main(int argc, char **argv)
     mysql_options(&con->mysql, MYSQL_SET_CHARSET_DIR,
                   opt_charsets_dir);
 
-#ifndef EMBEDDED_LIBRARY
   if (opt_protocol)
     mysql_options(&con->mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
-#endif
 
 #ifdef HAVE_OPENSSL
 


--===============1187018467==
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/mysql-5.1-bugteam/
# testament_sha1: 178c2dfda5d6f415df10719b743ab3c485f0d5bc
# timestamp: 2010-08-26 15:14:58 +0200
# source_branch: file:///home/bm136801/my/merge-51/
# base_revision_id: alexey.kopytov@stripped\
#   ni0pcvcdfyv7m56u
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWklaT0AAZBfgAAQWGf/91IC
EAC////wUANsWaLFOvd1tCUSCngNTJtTTJlTzTKnmUYjQRhKElPaTyU/KaZpNqmhoAAANAkiNCmm
0mQnqnoTNJtQNA0AwSUKbSNNNGmmgGmmgDQAAJREj1NpGmRtQAZAAaACew7TmbdylM8UaPAoK5jn
mOyiblOoqh20PL8IreGN+2M2k35rSQ/0x7M/LX7f+fHFkU0rxrcfoOwvaca6UPMRr5xuwFvjtMja
uO7ssVWmxMlCcDNnlGpCC7lhSc0ILlAUuTjiJj8pJMUmJQdaotNsSpLcmMc6FUXO1giZ2FEisqpS
SFT0ktphE7JoNE+JncHx5vnjKe+40JQ445MaVhcsxy1qa1EPcR3EKhwGa5GzrV25kD8E4D5LYKZq
FClPrCegkiFrFCkRHrZyxpVXezd9iNi9jEdw4vQqXXPdnLlXFDOcN9C5KpPLASxy0E3yIqMGDx/Y
m1vESTpsS2Eb5GIqA4yyttSeomZ0OmIj8bkhYQTNnAuvotyw02hHValL3fyEm2Iq4iEzFdxKL1W9
jC4m4zvgq2BevKsYnEMqb28W3HhwyFeMyXVJGLzndou402TUaZUKVabU6XdHSvMMvGOgF6QyKKq+
XPTsmnfQ/8bwoNNlJdXr1AkMeUz4UJzb6NgvE5yoY2Jnzby2wxVPcabzAVnldP4iUcsxY93F/LLJ
NRw/eIYOVQGxohsleEuT1KEo038+kF4yVarKVCpVOZk4stp3+lrfX5pHv1po+XI+HSSn+qyWMKOs
PCqxcCQYflsmVSti32v07Vm8sLdDFFSSyvb2wi2QItpGCo8ndLoPFC2HhNa63d4uJKQHr1431mvT
R6lqhKE4Wksoa20kUA/bEPWUlzjuH1M0PkPVU9TCA2vhPL97qX6gzDXK+ogq+PYDG43G/eHdMvfD
AOVAStBpIAo8pRqwpjS1WIVotpHGN5hsRRDJgGYDpW1MU4DrnLYwEB7oeYmsFdBSZMvIr8RRwQoA
5ONaf8A2g1fkG9yusU+VTTsYq1YHshnrfAsL0wCevUnBeMkW7sing1iwKucYUgJ0llh1sW1BXFS5
fC5g8kiEYY0V83MuoxnYavi5rSArqNEhGESuplhij0imJU8yU2l+pAbJSQrCXlGpE4KirBK1Js40
3uEoqViK8uE4UptIJvJyD7YkJRvAdYP4u5IpwoSDSStJ6A==


--===============1187018467==--