auto-merge

This commit is contained in:
Tatiana A. Nurnberg 2009-11-24 08:08:47 -08:00
commit 0abb82b9e5

View File

@ -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 : "";