merge to mysql-5.1-bugteam

This commit is contained in:
Satya B 2009-11-26 13:12:16 +05:30
commit fab8effefe
30 changed files with 1566 additions and 594 deletions

View file

@ -4474,9 +4474,7 @@ server_version_string(MYSQL *con)
*/
if (server_version == NULL)
{
server_version= strdup(mysql_get_server_info(con));
}
server_version= my_strdup(mysql_get_server_info(con), MYF(MY_WME));
}
return server_version ? server_version : "";