From: Rafal Somla
Date: November 17 2011 11:52am
Subject: bzr push into mysql-5.5 branch (rafal.somla:3614 to 3615) Bug#13101974
List-Archive: http://lists.mysql.com/commits/142012
X-Bug: 13101974
Message-Id: <201111171152.pAHBqjml001389@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3615 Rafal Somla	2011-11-17
      Bug#13101974 SLAVE CAN'T CONNECT AS REPLICATION USER USING WINDOWS AUTH PLUGIN
      
      Problem was that built-in client-side support for Windows Native Authentication (WNA) was included only in the client library, but not into the server code (which also uses some of the sources from the client library).
      
      This is fixed by modyfying sql/CMakeLists.txt to include the client-side WNA plugin library and enable WNA related code by defining AUTHENTICATION_WIN macro.
      
      Also, the logic of libmysql/CMakeLists.txt is simplified a bit.

    modified:
      libmysql/CMakeLists.txt
      sql/CMakeLists.txt
 3614 hery.ramilison@stripped	2011-11-17
      fix for bug 11748060/34981

    modified:
      scripts/mysqld_safe.sh
=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt	2011-07-03 23:48:19 +0000
+++ b/libmysql/CMakeLists.txt	2011-11-17 11:34:52 +0000
@@ -134,12 +134,6 @@ CACHE INTERNAL "Functions exported by cl
 
 )
 
-IF(WIN32)
-  ADD_SUBDIRECTORY(authentication_win)
-  SET(WITH_AUTHENTICATION_WIN 1)
-  ADD_DEFINITIONS(-DAUTHENTICATION_WIN)
-ENDIF(WIN32)
-
 SET(CLIENT_SOURCES
   get_password.c 
   libmysql.c
@@ -157,9 +151,15 @@ ADD_DEPENDENCIES(clientlib GenError)
 
 SET(LIBS clientlib dbug strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL})
 
-IF(WITH_AUTHENTICATION_WIN)
+#
+# On Windows platform client library includes the client-side 
+# Windows Native Authentication plugin.
+#
+IF(WIN32)
+  ADD_DEFINITIONS(-DAUTHENTICATION_WIN)
+  ADD_SUBDIRECTORY(authentication_win)
   LIST(APPEND LIBS auth_win_client)
-ENDIF(WITH_AUTHENTICATION_WIN)
+ENDIF()
 
 # Merge several convenience libraries into one big mysqlclient
 # and link them together into shared library.

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2011-10-12 12:07:15 +0000
+++ b/sql/CMakeLists.txt	2011-11-17 11:34:52 +0000
@@ -90,7 +90,14 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
   ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
   ${SSL_LIBRARIES})
 
- 
+#
+# On Windows platform we compile in the clinet-side Windows Native Authentication
+# plugin which is used by the client connection code included in the server.
+#
+IF(WIN32)
+  ADD_DEFINITIONS(-DAUTHENTICATION_WIN)
+  TARGET_LINK_LIBRARIES(sql auth_win_client)
+ENDIF() 
 
 IF(WIN32)
   SET(MYSQLD_SOURCE main.cc nt_servc.cc nt_servc.h message.rc)

No bundle (reason: useless for push emails).