From: Rafal Somla Date: June 3 2011 1:19pm Subject: bzr commit into mysql-trunk branch (rafal.somla:3154) List-Archive: http://lists.mysql.com/commits/138654 Message-Id: <201106031318.p53DIxHr011627@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///D:/source/bzr2/mysql-trunk/ based on revid:vasil.dimov@stripped 3154 Rafal Somla 2011-06-03 [merge] Upmerge of 12612143 modified: libmysql/authentication_win/plugin_client.cc === modified file 'libmysql/authentication_win/plugin_client.cc' --- a/libmysql/authentication_win/plugin_client.cc 2011-04-29 21:53:46 +0000 +++ b/libmysql/authentication_win/plugin_client.cc 2011-06-03 13:17:35 +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; No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).