bzr push into mysql-5.5 branch (rafal.somla:3425 to 3426) Bug#12612143

[Rafal Somla]

 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
 3425 Vasil Dimov	2011-06-03
      Increment InnoDB version from 1.1.7 to 1.1.8
      InnoDB 1.1.7 was released with MySQL 5.5.13

    modified:
      storage/innobase/include/univ.i
=== 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;

No bundle (reason: useless for push emails).