diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-11-24 08:08:47 -0800 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-11-24 08:08:47 -0800 |
| commit | 22d03452720df7afbc9668e7906a561b31568398 (patch) | |
| tree | a1e3913a2d740260a81506cb6dff7f88288719d8 /client | |
| parent | a21cd97c3506a70297afc3dd3f64cdfd2dc0a4e6 (diff) | |
| parent | 1b0be8c5b8b419419867b29014d36503404c66b3 (diff) | |
| download | mariadb-git-22d03452720df7afbc9668e7906a561b31568398.tar.gz | |
auto-merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index b76a3d624ab..4f9aef411ca 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 : ""; |