From 110aa7ddca3d3c128c5dcc716c40b6e6f7dabfa5 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Mon, 12 Sep 2016 16:05:02 +0000 Subject: [PATCH] Windows : Do not default connection protocol to SHM,only if mysql->options.shared_memory_base_name is set. Only make SHM connections if mysql->options.protocol == MYSQL_PROTOCOL_MEMORY --- libmariadb/mariadb_lib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c index ed825f69..31cd6a71 100644 --- a/libmariadb/mariadb_lib.c +++ b/libmariadb/mariadb_lib.c @@ -1223,8 +1223,7 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user, else #endif #else - if (mysql->options.protocol == MYSQL_PROTOCOL_MEMORY || - mysql->options.shared_memory_base_name) + if (mysql->options.protocol == MYSQL_PROTOCOL_MEMORY) { cinfo.host= mysql->options.shared_memory_base_name; cinfo.type= PVIO_TYPE_SHAREDMEM;