summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorSatya B <satya.bn@sun.com>2009-11-26 13:12:16 +0530
committerSatya B <satya.bn@sun.com>2009-11-26 13:12:16 +0530
commitfab8effefeec650c112bf7f319423a81ddc72e32 (patch)
treefad9d4b71a63199a58e5f99e9e9945ef4e799982 /client
parent82b115ec1619b7cf6dc1f308d875e154530b16a3 (diff)
parent8022ff5cf5835d91278307cc1f92a48238084fbd (diff)
downloadmariadb-git-fab8effefeec650c112bf7f319423a81ddc72e32.tar.gz
merge to mysql-5.1-bugteam
Diffstat (limited to 'client')
-rw-r--r--client/mysql.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 44bd362fc56..9d078153a33 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -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 : "";