From: Bjorn Munch
Date: August 25 2010 8:25am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2924) Bug#52301
List-Archive: http://lists.mysql.com/commits/116716
X-Bug: 52301
Message-Id: <201008250825.o7P8Ppaj009449@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1432620055=="

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

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

 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 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-08-04 10:19:51 +0000
+++ b/client/mysqltest.cc	2010-08-25 08:23:19 +0000
@@ -5220,8 +5220,10 @@ 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)
@@ -6179,8 +6181,10 @@ get_one_option(int optid, const struct m
     print_version();
     exit(0);
   case OPT_MYSQL_PROTOCOL:
+#ifndef EMBEDDED_LIBRARY
     opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
                                     opt->name);
+#endif
     break;
   case '?':
     usage();
@@ -7932,8 +7936,10 @@ 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
 


--===============1432620055==
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/embprot-51/
# testament_sha1: fd4a62680523722f1f7826f0a891c820d7502df4
# timestamp: 2010-08-25 10:25:50 +0200
# base_revision_id: bjorn.bunch@stripped\
#   e1t12peapcte4egd
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW8otFMAAcVfgAAQWOf/93Ym
EKC////wUAQM9SXe5eXttoCCUhKfpMCMTJpk01NMyJ6jygGmmgDUmk9NJptTyTNQaNBowmjTQZDT
ICUECRp6phqn5IzVD1A9QyY0MiY1AxRBlTTT2pppPUe1T9SNGRkADE9JgJJBGERT2UzJMmp6npG0
Rp6mgGgaR0m/BSlK9uS1S61AdOlMmvGNBMakNj6nGuLzZNdpnysUKonHgBohQXT0V1/OESCupKLD
6JLwlglp6cdJV0v18ocucZkmbHCL2P0yYhaxC00115Lsbv2jKhu+IlzfmjEzYIjtE2GYYv3nqOvu
LsKSCSySHJaGsfhBIubEsHBGxYYQca9Q1Be0DkobhFEhMmkgVYNKYFrKcXhucJe+QQ47zPR7HPrJ
iendhrCi6HnTOWJXd8IK9ocrBQDEyL8zhoprteYBlepOG7CbCHMCBQJrzHbYJme/JOIlCJs5miMm
S5Qy1YGoVWas4wmBSlo8oqW0f4Q2ZUjeDFLCmd8hZP/Eq7SjkNpHY3PDUK3qLxwouRpI60eOjf1l
rgw34lYtZMCCJABkvAx8p3GFlZUA6kMGxCANKUTOCbEoDhSrwhdjY3VmiU90bAIQNmQP4hNASAL2
G0LEqU7AMgQlKOsRL53BnuwkFuctvHqVGPcSZISueRbNnQl0PHMsasQZFksCgSmub8G7bZ9tTqdX
DfvRD1TLlKKihuN5vzBG8o0SLS47i/eaTNQf8s5y412YCPyDRTtYFbZKjaI3aJg2/LJEGWnI0OBh
LKw76HgjgQtTwqhQv0mGmDi8juFIXF4pfX3dZiD96BYwwtNsjn9nsQHLckSPrDAOJFUQNYlBE1V2
zCI6/cQxGkpzT36uka5ajQrLwdNZa3LUemt8pz+edXvBNmD587IncHISg42zUDVxQhrq5ThyjNz6
00JssmcUxaWVkQVZpLlO9WDoxyOb9PbOPMop8bPDX1MdKcBPwlANLZjsqKtDMqMjibIG+R39mT11
uRmd7xi4HXIsmJYhbq7agOHph/h6JevU7WhYktc6YtHBwP7OuB/9pmbpB6/cCrZSNPaL5cEh242b
cw2+WdNZuDs0BB4PqkMX1IQx4Wa/WesKSuSKJwSzmbLKxidEn5HlKknM5IZRvmyREOKuTrGUZu8Z
QsFBky9w+XKrGnF/Dc8SrQOdhNeiRQN715gvCChZixdo3q/NmWoIHAJVy8pS4bSovAWrnSAddy0u
TklPF2EUX38XEuTUJJKtIuDbZFmXJ/pbK0VtaYOKzBpLLj9WoLiHQuFQLnOrfhq3+bOaC6BF/7Id
oO54sF4zWz23kHkwomaLK/qwlN7vWwOCIzuKEgSFYc+JzEhkZIoqvJji+kGi7UwzkRKHMZcWE+aI
hyGxn+LuSKcKEg3lFopg


--===============1432620055==--