diff options
| author | Rafal Somla <rafal.somla@oracle.com> | 2011-11-17 12:34:52 +0100 |
|---|---|---|
| committer | Rafal Somla <rafal.somla@oracle.com> | 2011-11-17 12:34:52 +0100 |
| commit | aa21a7105907bba171a515b80705dffbe857baeb (patch) | |
| tree | ab85dad85e5b89827c6f4311eb4de16bf2087ca2 /libmysql | |
| parent | c06225f700c7cf52592a4750f3514f8302e54dc9 (diff) | |
| download | mariadb-git-aa21a7105907bba171a515b80705dffbe857baeb.tar.gz | |
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.
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index d0e383c6640..42125cffb7b 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -134,12 +134,6 @@ CACHE INTERNAL "Functions exported by client API" ) -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. |