diff options
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | server-tools/instance-manager/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 5 | ||||
| -rw-r--r-- | server-tools/instance-manager/user_map.cc | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/server-tools/CMakeLists.txt b/server-tools/CMakeLists.txt index 3f02ba88f1d..9cfeb4e80f9 100644 --- a/server-tools/CMakeLists.txt +++ b/server-tools/CMakeLists.txt @@ -27,7 +27,7 @@ ADD_EXECUTABLE(mysqlmanager buffer.cc command.cc commands.cc guardian.cc instanc user_management_commands.cc ../../sql/net_serv.cc ../../sql-common/pack.c ../../sql/password.c ../../sql/sql_state.c ../../sql-common/client.c ../../libmysql/get_password.c - ../../libmysql/errmsg.c) + ../../libmysql/errmsg.c ../../sql-common/client_plugin.c) ADD_DEPENDENCIES(mysqlmanager GenError) TARGET_LINK_LIBRARIES(mysqlmanager dbug mysys strings taocrypt vio yassl zlib wsock32) diff --git a/server-tools/instance-manager/CMakeLists.txt b/server-tools/instance-manager/CMakeLists.txt index c988a03912e..2d04e522a6d 100755 --- a/server-tools/instance-manager/CMakeLists.txt +++ b/server-tools/instance-manager/CMakeLists.txt @@ -20,8 +20,6 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") ADD_DEFINITIONS(-DMYSQL_SERVER -DMYSQL_INSTANCE_MANAGER) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/sql ${PROJECT_SOURCE_DIR}/extra/yassl/include) - -SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS") ADD_EXECUTABLE(mysqlmanager buffer.cc command.cc commands.cc guardian.cc instance.cc instance_map.cc instance_options.cc listener.cc log.cc manager.cc messages.cc mysql_connection.cc @@ -30,7 +28,7 @@ ADD_EXECUTABLE(mysqlmanager buffer.cc command.cc commands.cc guardian.cc instanc user_management_commands.cc ../../mysys/my_rnd.c ../../sql/net_serv.cc ../../sql-common/pack.c ../../sql/password.c ../../sql/sql_state.c ../../sql-common/client.c ../../libmysql/get_password.c - ../../libmysql/errmsg.c) + ../../libmysql/errmsg.c ../../sql-common/client_plugin.c) ADD_DEPENDENCIES(mysqlmanager GenError) TARGET_LINK_LIBRARIES(mysqlmanager debug dbug mysys strings taocrypt vio yassl zlib wsock32) diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index d480dacf5aa..dce7c77232d 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -46,7 +46,8 @@ libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \ $(top_builddir)/sql/pack.$(OBJEXT) \ $(top_builddir)/sql/sql_state.$(OBJEXT) \ $(top_builddir)/sql/mini_client_errors.$(OBJEXT)\ - $(top_builddir)/sql/client.$(OBJEXT) + $(top_builddir)/sql/client.$(OBJEXT) \ + $(top_builddir)/sql/client_plugin.$(OBJEXT) CLEANFILES= net_serv.cc client_settings.h @@ -91,7 +92,7 @@ mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a \ $(top_builddir)/dbug/libdbug.a \ - @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ + @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ @LIBDL@ EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \ IMService.h CMakeLists.txt diff --git a/server-tools/instance-manager/user_map.cc b/server-tools/instance-manager/user_map.cc index 85e3f4a2cac..b7a32f1d047 100644 --- a/server-tools/instance-manager/user_map.cc +++ b/server-tools/instance-manager/user_map.cc @@ -368,7 +368,7 @@ int User_map::authenticate(const LEX_STRING *user_name, const char *scramble) const { const User *user= find_user(user_name); - return user ? check_scramble(scrambled_password, scramble, user->salt) : 2; + return user ? check_scramble((uchar*)scrambled_password, scramble, user->salt) : 2; } |