Disable dbug by default (to enable it specify cmake option -DWITH_DBU…

…G=ON)

minor fixes for 10.2 integration (windows)

CMakeLists.txt

@@ -116,6 +116,11 @@ IF(NOT CMAKE_BUILD_TYPE)
   SET(CMAKE_BUILD_TYPE "Relwithdebinfo")
 ENDIF()
 
+OPTION(WITH_DBUG "enables use of DBUG library" OFF)
+IF(NOT WITH_DBUG)
+  ADD_DEFINITIONS(-DDBUG_OFF=1)
+ENDIF()
+
 # various defines for generating include/mysql_version.h
 
 SET(PROTOCOL_VERSION 10) # we adapted new password option from PHP's mysqlnd !

libmariadb/CMakeLists.txt

@@ -268,7 +268,6 @@ hash.c
 net.c
 charset.c
 ma_time.c
-dbug.c
 default.c
 errmsg.c
 errors.c
@@ -322,6 +321,9 @@ ${CMAKE_BINARY_DIR}/libmariadb/client_plugin.c
 ma_io.c
 ${SSL_SOURCES}
 )
+IF(WITH_DBUG)
+  SET(LIBMARIADB_SOURCES ${LIBMARIADB_SOURCES} dbug.c)
+ENDIF()
 
 
 IF(WIN32)

libmariadb/libmariadb.c

@@ -1412,11 +1412,8 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user,
 #endif
 #else
    /* named pipe */
-  if ((unix_socket ||
-      (!host && is_NT()) ||
-      (host && strcmp(host,LOCAL_HOST_NAMEDPIPE) == 0) ||
-      mysql->options.named_pipe) &&
-      mysql->options.protocol != MYSQL_PROTOCOL_TCP)
+  if (mysql->options.protocol == MYSQL_PROTOCOL_PIPE ||
+	  (host && strcmp(host,LOCAL_HOST_NAMEDPIPE) == 0))
   {
     cinfo.type= PVIO_TYPE_NAMEDPIPE;
     sprintf(host_info=buff,ER(CR_NAMEDPIPE_CONNECTION),cinfo.host);

libmariadb/secure/schannel.c

@@ -133,14 +133,14 @@ int ma_ssl_start(char *errmsg, size_t errmsg_len)
 */
 void ma_ssl_end()
 {
-  pthread_mutex_lock(&LOCK_schannel_config);
   if (ma_ssl_initialized)
   {
-
+	pthread_mutex_lock(&LOCK_schannel_config);
     ma_ssl_initialized= FALSE;
+	pthread_mutex_unlock(&LOCK_schannel_config);
+	pthread_mutex_destroy(&LOCK_schannel_config);
   }
-  pthread_mutex_unlock(&LOCK_schannel_config);
-  pthread_mutex_destroy(&LOCK_schannel_config);
+
   return;
 }