From: Rafal Somla
Date: June 3 2011 11:44am
Subject: bzr commit into mysql-5.5 branch (rafal.somla:3426) Bug#12612143
List-Archive: http://lists.mysql.com/commits/138648
X-Bug: 12612143
Message-Id: <201106031144.p53BiYJD004620@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0918388400=="

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

#At file:///D:/source/bzr2/mysql-5.5/ based on revid:vasil.dimov@stripped

 3426 Rafal Somla	2011-06-03
      Bug#12612143 - LIBMYSQL 5.5.13 BREAKS USER APPLICATION BUILD
      
      Since the Windows authentication support has been added to libmysql, this library depends on the system Secur32 library. Consequently, clients which are linked against libmysql should be also linked with Secur32 (in addition to ws2_32).
      
      In MS VC++ it is possible to embed information about required libraries into object file using #pragma directive. This patch adds such directive when the Windows authentiaction support is compiled. This is similar to analogous #pragma for ws2_32 library in my_init.c

    modified:
      libmysql/authentication_win/plugin_client.cc
=== modified file 'libmysql/authentication_win/plugin_client.cc'
--- a/libmysql/authentication_win/plugin_client.cc	2011-04-28 19:17:29 +0000
+++ b/libmysql/authentication_win/plugin_client.cc	2011-06-03 11:44:33 +0000
@@ -20,6 +20,16 @@
 
 #include "common.h"
 
+/*
+  The following MS C++ specific pragma embeds a comment in the resulting
+  object file. A "lib" comment tells the linker to use the specified 
+  library, thus the dependency is handled automagically.
+*/
+
+#ifdef _MSC_VER
+#pragma comment(lib, "Secur32")
+#endif
+
 static int win_auth_client_plugin_init(char*, size_t, int, va_list)
 {
   return 0;


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: rafal.somla@stripped
# target_branch: file:///D:/source/bzr2/mysql-5.5/
# testament_sha1: 9cbfc54d1e6e569b9f7d24821d86104902d2f46b
# timestamp: 2011-06-03 13:44:41 +0200
# base_revision_id: vasil.dimov@stripped\
#   nqomr3g5nnpj672o
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe4+uBMAAc9fgAAQWH//934v
/6C////wUATme9e3YnnrybWncbPOGplMTIJ6EnmptKntFPUZqHqD1NNPU/SNNQ36omIMkENPSAKD
TEPUBoAABoDQAaaCak9TTBU3oo2SeoyeoGQA0AHqAAkSSaaeknoaNJiekynqZNNpAAAAA9QSSEZJ
hU/U21Sfqn6p6Q2aRlNNGDUA0AAfmijVXgsudnIW3105WTfPM+cQXhKECGBmojk/Row2U+Es90Mn
ERD98hFMshhg+iZLB223U7+xPVY7v/mvTKGDmOrQ1DfYr3NAcHdltLT/Zew7RAXjSYqyqysV6Vsh
92JrBu1NFPy6jfWxxyRa61C0oGZwqnEaG1K9rikQ/Rx33Yb8OZ/YPwcmZcm1PCc98umnE4F+VrV1
LnWsR108S1XuF5sVXxe13xx11QYihIrSO662VldN+ATeo7RoUi1qy7iQPQpD+kHqMIxgxFOqQzau
yuAVpkFxhj5xSDIC560nnwEsuazhq4D1iesGGinSFVb5S5ab82ERSou06sbnDXOzTgkhdMKeVayh
SUnDOE6dODLSHaVZTRmNwSqNps25JkEpEVQCkW4fdQZCXl3UUGTJPZqgnTHMDdeHA2hclZxPnN1j
QgkCFRF4ossluAoxNx1oWNzTGcRVHFTfLI81kDjNOO0SX6d+gvZAIxY23Fb2GSIaIVZXgTloFShB
kip1fkvW0QXKXxbrgpOiqDwSeWzSJL68zAsdxo2HXfI8ISWxDg27G0mNSh6MhcUVRIE0LJwF+HNo
yC8F6OnDtftCiV+B6q6iCT8XEcIyJ/B8ODVqSIxn4xnniQ+/TFSpaKwuuMSDvKkQqOckNIOIM2A3
6X6j3SAbu1Q+TNYCQKuhiwB67dwa7LJCB1pQ2O2gCF7g8DB7OCCqycmwdHDdpheihFG9WkGNHRWm
IwpGXQN9wXNURmOYYg7zQNYBZuAd1ylvCxxs8zvTImLSqGkdXo4Fs0hrM6jC0Ymr2K3dHtNZZhWt
YVEldhmrt1PMUReZVQU0cGVOU9m4yO172F+ig3tsF2C1uJaU6Nnv9ue8SnOsDhUkXjiM4+yLsprn
r0KUmgumWoXXFauaE1egsfAw8Yg3tfyKCLnktA24oSAlDBqOEmOZU8pFZUilOfby4mBjq35GKCrU
QHB+vEczcjBzuZlly7FWlIGG+Yru8jYFZJe9hj5Qhyh4IsTRqezMoZKe6jZTP6elNGSKI58zGkiK
xa6kZyIRU/4xeHx2geotU1r8+dGC6NUJpgJgHDSwXoIbQCg5dzQ11qNhl0JtCmGZx/ZwxrTwH8oW
BY4LkFM2tYsSGL2q6sppUoZW4522QLhmdMON9FIiAm8oNsCBLJNuKLRAipxCRAcDqCX5h5+dKsFC
qqAmyWAV4BkQRRCOphxV6kqKMAJsTYNdeddDUzNsV1OpIp66gJI2qam0aPZjJ8kisIDYoT3Zuq/Z
es9JCWTobTgzmknLUt9ipFYquleEh13qlYljNo+ZipNanpEuBcM7dALg0i0eNMi8jscWbaKgwfoe
IN60Ygktyd8PaKEOUMa6yNgRc7KZ4c5F+E3Is3ARVLrvWAJGwJ7UvywVrwKMQpu5xvk344uAypRu
UPbFsHWMFcGEwIQQMIME8RM8RggkmKIIKA0AQQyWO2+1QGUYPAiaHYUhnEXAsNZoFJquA6TASogy
ihNV5IGz0i0rnDL2LJYYxV9y/4u5IpwoSHcfXAmA


--===============0918388400==--