List:Commits« Previous MessageNext Message »
From:Rafal Somla Date:June 3 2011 1:25pm
Subject:bzr push into mysql-trunk branch (rafal.somla:3153 to 3154)
View as plain text  
 3154 Rafal Somla	2011-06-03 [merge]
      Upmerge of 12612143

    modified:
      libmysql/authentication_win/plugin_client.cc
 3153 Vasil Dimov	2011-06-03 [merge]
      Merge mysql-5.5 -> mysql-trunk
      (null merge an irrelevant change)

=== 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: useless for push emails).
Thread
bzr push into mysql-trunk branch (rafal.somla:3153 to 3154) Rafal Somla4 Jun