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
commit8e53e7e4151918a4f7b89b3099b8bffa8d5d6b42 (patch)
treefad9d4b71a63199a58e5f99e9e9945ef4e799982 /client
parentdacd32f9553b3426944fb95a25bbe0f8d4829374 (diff)
parent40767bf54ab880e701841c84ce523f478f48ab51 (diff)
downloadmariadb-git-8e53e7e4151918a4f7b89b3099b8bffa8d5d6b42.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 : "";