Merge remote-tracking branch 'origin/3.3' into 3.4-tls

Author: 9EOR9

CMakeLists.txt

@@ -310,8 +310,8 @@ IF(NOT WITH_SSL STREQUAL "OFF")
       SET(SSL_SOURCES "${CC_SOURCE_DIR}/libmariadb/secure/openssl.c"
                       "${CC_SOURCE_DIR}/libmariadb/secure/openssl_crypt.c")
       SET(SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
-      IF(WIN32)
-        CHECK_INCLUDE_FILES (${OPENSSL_INCLUDE_DIR}/openssl/applink.c HAVE_OPENSSL_APPLINK_C)
+      IF(WIN32 AND EXISTS ${OPENSSL_INCLUDE_DIR}/openssl/applink.c)
+       SET(HAVE_OPENSSL_APPLINK_C 1)
       ENDIF()
       INCLUDE_DIRECTORIES(BEFORE ${OPENSSL_INCLUDE_DIR})
 

libmariadb/mariadb_lib.c

@@ -821,7 +821,10 @@ my_bool _mariadb_set_conf_option(MYSQL *mysql, const char *config_option, const
           option_val= &val_sizet;
           break;
         case MARIADB_OPTION_STR:
-          option_val= (void*)config_value;
+          if (config_value && !config_value[0])
+            option_val= NULL;
+          else
+            option_val= (void*)config_value;
           break;
         case MARIADB_OPTION_NONE:
           break;
@@ -917,7 +920,7 @@ static int parse_connection_string(MYSQL *mysql, const char *unused __attribute_
         if (!key)
           goto error;
         *pos++= 0;
-        if (pos < end)
+        if (pos <= end)
           val= pos;
         continue;
         break;