From b26592c8661750719d540a7b6fc96535dfb7d428 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Wed, 27 Apr 2016 21:40:45 +0300
Subject: [PATCH] Copy server version string if it hasn't been updated yet

The server version string could be NULL if it hasn't been initialized
yet.
---
 server/core/dbusers.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/core/dbusers.c b/server/core/dbusers.c
index 004abe0da..4f20824d2 100644
--- a/server/core/dbusers.c
+++ b/server/core/dbusers.c
@@ -2673,6 +2673,12 @@ bool check_service_permissions(SERVICE* service)
         return my_errno != ER_ACCESS_DENIED_ERROR;
     }
 
+    if (server->server->server_string == NULL)
+    {
+        const char *server_string = mysql_get_server_info(mysql);
+        server_set_version_string(server->server, server_string);
+    }
+
     char query[MAX_QUERY_STR_LEN];
     const char* query_pw = strstr(server->server->server_string, "5.7.") ?
         MYSQL57_PASSWORD : MYSQL_PASSWORD;