Commit 99309a36 authored by Tatiana A. Nurnberg's avatar Tatiana A. Nurnberg

auto-merge

parents c2c33491 3c2fce6d
...@@ -4474,9 +4474,7 @@ server_version_string(MYSQL *con) ...@@ -4474,9 +4474,7 @@ server_version_string(MYSQL *con)
*/ */
if (server_version == NULL) if (server_version == NULL)
{ server_version= my_strdup(mysql_get_server_info(con), MYF(MY_WME));
server_version= strdup(mysql_get_server_info(con));
}
} }
return server_version ? server_version : ""; return server_version ? server_version : "";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment